summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/Outliner.hxx12
-rw-r--r--sd/inc/stlsheet.hxx2
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/core/stlpool.cxx12
-rw-r--r--sd/source/filter/eppt/eppt.cxx4
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx19
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx2
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx23
-rw-r--r--sd/source/ui/dlg/dlgass.cxx2
-rw-r--r--sd/source/ui/dlg/prltempl.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx6
-rw-r--r--sd/source/ui/dlg/tpoption.cxx2
-rw-r--r--sd/source/ui/docshell/docshell.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx2
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.hxx2
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx2
-rw-r--r--sd/source/ui/func/fuediglu.cxx4
-rw-r--r--sd/source/ui/func/fupoor.cxx4
-rw-r--r--sd/source/ui/func/fusel.cxx4
-rw-r--r--sd/source/ui/func/smarttag.cxx6
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx4
-rw-r--r--sd/source/ui/inc/AccessibleViewForwarder.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/inc/OutlinerIteratorImpl.hxx4
-rw-r--r--sd/source/ui/inc/PreviewRenderer.hxx4
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx4
-rw-r--r--sd/source/ui/inc/SlideViewShell.hxx2
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx2
-rw-r--r--sd/source/ui/inc/ViewShell.hxx4
-rw-r--r--sd/source/ui/inc/ViewShellHint.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx2
-rw-r--r--sd/source/ui/inc/Window.hxx4
-rw-r--r--sd/source/ui/inc/fuediglu.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx4
-rw-r--r--sd/source/ui/inc/fusel.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ControlContainer.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/SubToolPanel.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/TitledControl.hxx2
-rw-r--r--sd/source/ui/inc/tools/IconCache.hxx4
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx6
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsFocusManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx2
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlsButtonBar.cxx2
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx20
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/FormShellManager.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx22
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx2
-rw-r--r--sd/source/ui/view/drtxtob.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx3
-rw-r--r--sd/source/ui/view/frmview.cxx4
-rw-r--r--sd/source/ui/view/sdview.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx4
85 files changed, 186 insertions, 161 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 47669c867e83..7263065745a4 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -131,7 +131,7 @@ public:
void PrepareSpelling (void);
/** Initialize a spell check but do not start it yet. This method
- is a better candiate for the name PrepareSpelling.
+ is a better candidate for the name PrepareSpelling.
*/
void StartSpelling (void);
@@ -240,7 +240,7 @@ private:
*/
bool mbFoundObject;
- /** When set to <true/> this flag indicates that an error has occured
+ /** When set to <TRUE/> this flag indicates that an error has occurred
that should terminate the iteration over the objects to search/spell
check.
*/
@@ -277,7 +277,7 @@ private:
SdrObject* mpObj;
/** this stores the first object that is used for text conversion.
- Conversion automaticly wraps around the document and stops when it
+ Conversion automatically wraps around the document and stops when it
finds this object again.
*/
SdrObject* mpFirstObj;
@@ -417,7 +417,7 @@ private:
*/
void ShowEndOfSearchDialog (void);
- /** Show a dialog that asks the user whether to wrap arround to the
+ /** Show a dialog that asks the user whether to wrap around to the
beginning/end of the document and continue with the search/spell
check.
*/
@@ -496,7 +496,7 @@ private:
i.e. there is no match in the whole presentation, or when no further
match exists.
@return
- The returned value indicates whether another (wrapped arround)
+ The returned value indicates whether another (wrapped around)
search shall take place. If that is so, then it is the caller's
responsibility to set the cursor position accordingly.
*/
@@ -528,7 +528,7 @@ private:
/** Initiate the spell check of the next relevant text object.
When the outline view is active then this method is called
- after a wrap arround to continue at the beginning of the document.
+ after a wrap around to continue at the beginning of the document.
@return
Returns <true/> to indicate that another call to this method is
required. When all text objects have been processed then
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 3c47274212b5..3085ab3812c7 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -139,7 +139,7 @@ protected:
rtl::OUString msApiName;
rtl::Reference< SfxStyleSheetBasePool > mxPool;
- /** boradcast helper for events */
+ /** broadcast helper for events */
::cppu::OBroadcastHelper mrBHelper;
boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 25655a510ba0..5e882fc88ccb 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2861,7 +2861,7 @@ void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettin
// #119056# 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/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c70bcecca107..28607c6ef738 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -265,14 +265,14 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
sal_uLong nFontSize = 20;
short nFirstIndent = -600;
// sal_uInt16 nIndent = nLevel * 1200;
- sal_uInt16 nLower = 100;
+ sal_uInt16 nUpper = 100;
switch (nLevel)
{
case 1:
{
nFontSize = 32;
- nLower = 500;
+ nUpper = 500;
nFirstIndent = -900;
}
break;
@@ -280,7 +280,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
case 2:
{
nFontSize = 28;
- nLower = 400;
+ nUpper = 400;
nFirstIndent = -800;
}
break;
@@ -288,13 +288,13 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
case 3:
{
nFontSize = 24;
- nLower = 300;
+ nUpper = 300;
}
break;
case 4:
{
- nLower = 200;
+ nUpper = 200;
}
break;
}
@@ -315,7 +315,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
pSheet->GetItemSet().Put(aSvxLRSpaceItem);
*/
// Zeilendurchschuss (Abstand nach unten)
- aSvxULSpaceItem.SetLower(nLower);
+ aSvxULSpaceItem.SetUpper(nUpper);
pSheet->GetItemSet().Put(aSvxULSpaceItem);
/* i35937
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 960ba82d8ba2..a1e0287c3e03 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -621,7 +621,7 @@ bool PPTWriter::ImplCreateDocument()
<< (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
<< (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
<< (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
- << (sal_uInt32)0; // reserved, usualy 0
+ << (sal_uInt32)0; // reserved, usually 0
if ( !ImplGetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
return false;
@@ -678,7 +678,7 @@ bool PPTWriter::ImplCreateDocument()
// Bit 3 Use named show
// Bit 4 Browse mode on
// Bit 5 Kiosk mode on
- // Bit 7 loop continously
+ // Bit 7 loop continuously
// Bit ? show scrollbar
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ) ) )
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 1a8a7f978605..62c7727ee47a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -616,7 +616,7 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
<< (sal_uInt32)0 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
<< (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
<< (sal_Int32)( 0x80000000 | i ) // slideId - Unique slide identifier, used for OLE link monikers for example
- << (sal_uInt32)0; // reserved, usualy 0
+ << (sal_uInt32)0; // reserved, usually 0
}
}
return nSize;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 7ea0910063f0..c36cc3e48a54 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -383,7 +383,7 @@ sal_Int32 ReadThroughComponent(
if (!bContainsStream )
{
// stream name not found! Then try the compatibility name.
- // if no stream can be opened, return immediatly with OK signal
+ // if no stream can be opened, return immediately with OK signal
// do we even have an alternative name?
if ( NULL == pCompatibilityStreamName )
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 8433e747281f..09a96ab8d1dc 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -773,7 +773,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void)
void AccessibleDocumentViewBase::Activated (void)
{
- // Empty. Overwrite to do something usefull.
+ // Empty. Overwrite to do something useful.
}
@@ -781,7 +781,7 @@ void AccessibleDocumentViewBase::Activated (void)
void AccessibleDocumentViewBase::Deactivated (void)
{
- // Empty. Overwrite to do something usefull.
+ // Empty. Overwrite to do something useful.
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index fd8f18a290d7..900f8434f255 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -558,7 +558,7 @@ uno::Sequence< sal_Int32 > SAL_CALL
uno::Reference< drawing::XShape > xShape = mpChildrenManager->GetChildShape(i);
if ( xShape.is() )
{
- //if the object is visable in the page, we add it into the group list.
+ //if the object is visible in the page, we add it into the group list.
SdrObject* pObj = GetSdrObjectFromXShape(xShape);
if(pObj && pSdView && pSdView->IsObjMarkable(*pObj))
{
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index c9c9086518ab..c936c14e2bcc 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -833,7 +833,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void)
void AccessibleSlideSorterView::Implementation::UpdateChildren (void)
{
- //By default, all children should be accessable. So here workaround is to make all children visible.
+ //By default, all children should be accessible. So here workaround is to make all children visible.
// MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?!
// In the IA2 CWS, also setting mnFirst/LastVisibleChild was commented out!
mnLastVisibleChild = maPageObjects.size();
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 7f2224ffffcb..e9cebb952dde 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -35,7 +35,7 @@ namespace accessibility {
/** For the time beeing, the implementation of this class will not use the
member mrDevice. Instead the device is retrieved from the view
- everytime it is used. This is necessary because the device has to stay
+ every time it is used. This is necessary because the device has to stay
up-to-date with the current view and the class has to stay compatible.
May change in the future.
*/
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 7b1d65bfcde3..57405e3837a1 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -881,7 +881,7 @@ EffectSequence CustomAnimationList::getSelection() const
aSelection.push_back( pEffect );
// if the selected effect is not expanded and has children
- // we say that the children are automaticly selected
+ // we say that the children are automatically selected
if( !IsExpanded( pEntry ) )
{
CustomAnimationListEntry* pChild = dynamic_cast< CustomAnimationListEntry* >( FirstChild( pEntry ) );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 1a26fced630f..1fb910188ff8 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1697,7 +1697,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
{
// we need to do a second pass for text grouping options
// since changing them can cause effects to be removed
- // or replaced, we do this after we aplied all other options
+ // or replaced, we do this after we applied all other options
// above
sal_Int32 nTextGrouping = 0;
@@ -1788,7 +1788,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasAnimateForm )
{
- if( pTextGroup->getAnimateForm() != bAnimateForm )
+ if( pTextGroup.get() && pTextGroup->getAnimateForm() != bAnimateForm )
{
if( (pTextGroup->getTextGrouping() >= 0) && (nTextGrouping == -1 ) )
{
@@ -1806,22 +1806,25 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasTextGrouping )
{
- if( (pTextGroup->getTextGrouping() != nTextGrouping) )
+ if( pTextGroup.get() && pTextGroup->getTextGrouping() != nTextGrouping )
{
pEffectSequence->setTextGrouping( pTextGroup, nTextGrouping );
bChanged = true;
}
}
- if (!bDoSetAnimateFormFirst&&bNeedDoSetAnimateForm)
+ if (!bDoSetAnimateFormFirst && bNeedDoSetAnimateForm)
{
- pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
- bChanged = true;
+ if( pTextGroup.get() )
+ {
+ pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
+ bChanged = true;
+ }
}
if( bHasTextGroupingAuto )
{
- if( pTextGroup->getTextGroupingAuto() != fTextGroupingAuto )
+ if( pTextGroup.get() && pTextGroup->getTextGroupingAuto() != fTextGroupingAuto )
{
pEffectSequence->setTextGroupingAuto( pTextGroup, fTextGroupingAuto );
bChanged = true;
@@ -1830,7 +1833,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
if( bHasTextReverse )
{
- if( pTextGroup->getTextReverse() != bTextReverse )
+ if( pTextGroup.get() && pTextGroup->getTextReverse() != bTextReverse )
{
pEffectSequence->setTextReverse( pTextGroup, bTextReverse );
bChanged = true;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 2312fbe419e3..f00615eccf90 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -737,7 +737,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
else
nStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
- // Pop up question box that asks the user whether to wrap arround.
+ // Pop up question box that asks the user whether to wrap around.
// The dialog is made modal with respect to the whole application.
QueryBox aQuestionBox (
NULL,
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 20e2b57775c3..88d6d69a8181 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -957,7 +957,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer (
&nReadByteCount));
// Check the error code and stop copying the stream data when an
- // error has occured.
+ // error has occurred.
switch (nErrorCode)
{
case ERRCODE_NONE:
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 5c0cc34d9da3..005fe7738b89 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -250,19 +250,28 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
if( pSdrTextObj )
{
- const OutlinerParaObject* pPara;
+ const OutlinerParaObject* pPara = pSdrTextObj->GetOutlinerParaObject();
- if( (pPara = pSdrTextObj->GetOutlinerParaObject()) != 0 )
+ if(pPara)
{
- const SvxFieldItem* pField;
+ const SvxFieldItem* pField = pPara->GetTextObject().GetField();
- if( (pField = pPara->GetTextObject().GetField()) != 0 )
+ if(pField)
{
const SvxURLField* pURL = dynamic_cast< const SvxURLField* >(pField->GetField());
- if( pURL )
+ if(pURL)
{
- mpBookmark = new INetBookmark( pURL->GetURL(), pURL->GetRepresentation() );
+ // #63399# This special code identifies TextFrames which have just an URL
+ // as content and directly add this to the clipboard, probably to avoid adding
+ // an unnecessary DrawObject to the target where paste may take place. This is
+ // wanted only for SdrObjects with no fill and no line, else it is necessary to
+ // use the whole SdrObect. Test here for Line/FillStyle and take shortcut only
+ // when both are unused
+ if(!pObj->HasFillStyle() && !pObj->HasLineStyle())
+ {
+ mpBookmark = new INetBookmark( pURL->GetURL(), pURL->GetRepresentation() );
+ }
}
}
}
@@ -341,7 +350,7 @@ void SdTransferable::CreateData()
pNewStylePool->CopyLayoutSheets( aOldLayoutName, *pOldStylePool, aCreatedSheets );
}
- // set VisArea and adjust objects if neccessary
+ // set VisArea and adjust objects if necessary
if( maVisArea.IsEmpty() &&
mpSdDrawDocumentIntern && mpSdViewIntern &&
mpSdDrawDocumentIntern->GetPageCount() )
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 5abdef6643ea..b478e62cf792 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -121,7 +121,7 @@ DECLARE_LIST( PasswordEntryList, PasswordEntry * )
// ====================================================================
/** A simple wrapper that looks like a PushButton and is used to force the
- broadcasting of focus events primarly for accessibility tools.
+ broadcasting of focus events primarily for accessibility tools.
Forcing focus events is achieved by using two identical PushButtons
which, when the focus event is requested, are exchanged and play focus
ping-pong by moving the focus from one to the other.
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 3aafb898f181..b922a246bacf 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -178,7 +178,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
}
// #112490# the tabpages Alignment, Tabs and Asian Typography are very
- // usefull, except for the background style
+ // useful, except for the background style
if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND )
{
SvtCJKOptions aCJKOptions;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 7ca0a1284428..3644d9a55d61 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1144,7 +1144,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
if (pMed)
{
- // it looks that it is undefined if a Medium was set by Fill() allready
+ // it looks that it is undefined if a Medium was set by Fill() already
DBG_ASSERT( !mpMedium, "SfxMedium confusion!" );
delete mpMedium;
mpMedium = NULL;
@@ -1167,7 +1167,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
else if ( mpMedium )
// in this mode the document is owned and controlled by the SdDrawDocument
// it can be released by calling the corresponding CloseBookmarkDoc method
- // successfull creation of a document makes this the owner of the medium
+ // successful creation of a document makes this the owner of the medium
mpBookmarkDoc = ((SdDrawDocument*) mpDoc)->OpenBookmarkDoc(*mpMedium);
if ( !mpBookmarkDoc )
@@ -1209,7 +1209,7 @@ void SdPageObjsTLB::CloseBookmarkDoc()
}
else
{
- // perhaps mpOwnMedium provided, but no successfull creation of BookmarkDoc
+ // perhaps mpOwnMedium provided, but no successful creation of BookmarkDoc
delete mpOwnMedium;
mpOwnMedium = NULL;
}
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index bea151f14136..7ab77c828208 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -683,7 +683,7 @@ void SdTpOptionsMisc::SetDrawMode()
lcl_MoveWin( aTxtTabstop, -nDiff );
lcl_MoveWin( aMtrFldTabstop, -nDiff );
- // Move the scale controls so that they are visually centered betwen the
+ // Move the scale controls so that they are visually centered between the
// group controls above and below.
lcl_MoveWin (aFtScale, -17);
lcl_MoveWin (aCbScale, -17);
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 0fb5b03ef3ad..69b6fe8e24a6 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -230,7 +230,7 @@ DrawDocShell::~DrawDocShell()
// Tell all listeners that the doc shell is about to be
// destroyed. This has been introduced for the PreviewRenderer to
// free its view (that uses the item poll of the doc shell) but
- // may be usefull in other places as well.
+ // may be useful in other places as well.
Broadcast(SfxSimpleHint(SFX_HINT_DYING));
mbInDestruction = true;
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index c765c0dfce07..2c748140f94b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -195,7 +195,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
ConfigurationTracer::TraceConfiguration(
mxCurrentConfiguration, "current configuration");
#endif
- // Notify the begining of the update.
+ // Notify the beginning of the update.
ConfigurationChangeEvent aEvent;
aEvent.Type = FrameworkHelper::msConfigurationUpdateStartEvent;
aEvent.Configuration = mxRequestedConfiguration;
@@ -284,7 +284,7 @@ void ConfigurationUpdater::CheckUpdateSuccess (void)
}
else
{
- // Update was successfull. Reset the failed update count.
+ // Update was successful. Reset the failed update count.
mnFailedUpdateCount = 0;
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index cf6f82672104..68e7ef8726aa 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -44,7 +44,7 @@ class ConfigurationUpdaterLock;
configuration. An update is made by activating or deactivating drawing
framework resources.
- When an update is not successfull, i.e. after the update the current
+ When an update is not successful, i.e. after the update the current
configuration is not equivalent to the requested configuration, then a
timer is started to repeat the update after a short time.
*/
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index b0fa7ec5e9ee..a5b8e819abbb 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -56,7 +56,7 @@ class ViewTabBarModule
public ViewTabBarModuleInterfaceBase
{
public:
- /** Create a new module that controlls the view tab bar above the view
+ /** Create a new module that controls the view tab bar above the view
in the specified pane.
@param rxController
This is the access point to the drawing framework.
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 5c738bb7ae63..f4e49ce279ce 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -124,7 +124,7 @@ typedef ::cppu::WeakComponentImplHelper1 <
::com::sun::star::lang::XEventListener
> LifetimeControllerInterfaceBase;
-/** This class helps controling the lifetime of the
+/** This class helps controlling the lifetime of the
FrameworkHelper. Register at a ViewShellBase object and an XController
object and call Dispose() at the associated FrameworkHelper object when
one of them and Release() when both of them are destroyed.
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 1dce0874a236..fcb90c2bf86b 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -320,7 +320,7 @@ bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
mpView->SetActualOutDev( mpWindow );
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
- //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ //and SHIFT+ENTER key to decide the position and draw the new insert point
bool bReturn = FuDraw::KeyInput(rKEvt);
@@ -407,7 +407,7 @@ bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
}
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
- //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ //and SHIFT+ENTER key to decide the position and draw the new insert point
void FuEditGluePoints::ForcePointer(const MouseEvent* pMEvt)
{
if(mbBeginInsertPoint && pMEvt)
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 1295485a0285..4951f537eda0 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -232,7 +232,7 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG )
Point aPnt(mpWindow->GetPointerPosPixel());
// #95491# use remembered MouseButton state to create correct
- // MouseEvents for this artifical MouseMove.
+ // MouseEvents for this artificial MouseMove.
MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode()));
return 0;
@@ -1026,7 +1026,7 @@ IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG )
Point aPnt(mpWindow->GetPointerPosPixel());
// #95491# use remembered MouseButton state to create correct
- // MouseEvents for this artifical MouseMove.
+ // MouseEvents for this artificial MouseMove.
MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode()));
return 0;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index c68010b884e0..651c014adfbf 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -106,7 +106,7 @@ FuSelection::FuSelection (
nEditMode(SID_BEZIER_MOVE),
pWaterCanCandidate(NULL),
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
- //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ //and SHIFT+ENTER key to decide the position and draw the new insert point
maOldPoint(0, 0),
mbBeginInsertPoint(false),
mbMovedToCenterPoint(false)
@@ -819,7 +819,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
else if (pWaterCanCandidate != NULL)
{
- // Is the candiate object still under the mouse?
+ // Is the candidate object still under the mouse?
if (pickObject (aLogicPos) == pWaterCanCandidate)
{
SdStyleSheetPool* pPool = static_cast<SdStyleSheetPool*>(
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index 704e6183c163..ca2788ff989a 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -253,7 +253,7 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt )
return false;
}
- // if a smart tag handle is hit, foreward event to its smart tag
+ // if a smart tag handle is hit, foreword event to its smart tag
SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( pHdl );
if(pSmartHdl && pSmartHdl->getTag().is() )
{
@@ -296,7 +296,7 @@ bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt )
if( pHdl )
{
- // if a smart tag handle is hit, foreward event to its smart tag
+ // if a smart tag handle is hit, foreword event to its smart tag
SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( pHdl );
if(pSmartHdl && pSmartHdl->getTag().is() )
{
@@ -321,7 +321,7 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt )
if( pHdl )
{
- // if a smart tag handle is hit, foreward event to its smart tag
+ // if a smart tag handle is hit, foreword event to its smart tag
SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( pHdl );
if(pSmartHdl && pSmartHdl->getTag().is() )
{
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 921fa1e12abf..b445fac25661 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -82,7 +82,7 @@ namespace accessibility {
<li>As window listener it waits for changes of the window geometry and
forwards those as view forwarder changes.</li>
<li>As focus listener it keeps track of the focus to give this class and
- derived classes the oportunity to set and remove the focus to/from
+ derived classes the opportunity to set and remove the focus to/from
shapes.</li>
</ol>
</p>
@@ -137,7 +137,7 @@ public:
//===== IAccessibleViewForwarderListener ================================
/** A view forwarder change is signalled for instance when any of the
- window events is recieved. Thus, instead of overloading the four
+ window events is received. Thus, instead of overloading the four
windowResized... methods it will be sufficient in most cases just to
overload this method.
*/
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 2d6e9b4ae047..b7e4f715423f 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -41,7 +41,7 @@ namespace accessibility {
@attention
Note, that modifications of the underlying view that lead to
different transformations between internal and screen coordinates or
- change the validity of the forwarder have to be signaled seperately.
+ change the validity of the forwarder have to be signaled separately.
*/
class AccessibleViewForwarder
: public IAccessibleViewForwarder
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 56fdcbb3a511..4ca0f55409c7 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -470,7 +470,7 @@ private:
a) it is running in its own frame, i.e. is a full screen show and
b) the given flag bCloseFrame is true.
@param bCloseFrame
- Be carefull with this flag when stopping a full screen show.
+ Be careful with this flag when stopping a full screen show.
When called from the destructor the flag has to be <false/> or
otherwise we run into a loop of calls to destructors of the view
and the frame.
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 3bcd3f2239e5..2c6269e872d4 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -150,7 +150,7 @@ public:
/** After this method has been called with <true/> following changes of
the current page are ignored in that the corresponding text is not
selected.
- This is used to supress unwanted side effects between selection and
+ This is used to suppress unwanted side effects between selection and
cursor position.
*/
void IgnoreCurrentPageChanges (bool bIgnore);
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 11e2c586be40..f030938b1baf 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -98,7 +98,7 @@ public:
When both iterators ar equal <true/> is returned, <false/> otherwise.
*/
virtual bool operator== (const IteratorImplBase& rIterator) const;
- /** This method is used by the equality operator. Additionaly to the
+ /** This method is used by the equality operator. Additionally to the
iterator it takes a type information which is taken into account on
comparison. It is part of a "multimethod" pattern.
@param rIterator
@@ -220,7 +220,7 @@ protected:
void SetPage (sal_Int32 nPageIndex);
private:
- /// Indicates whether a page changed occured on switching to current page.
+ /// Indicates whether a page changed occurred on switching to current page.
bool mbPageChangeOccured;
/// Pointer to the page associated with the current page index. May be NULL.
SdPage* mpPage;
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 2e147054e8b2..6c9f8612c8ca 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -45,7 +45,7 @@ class PreviewRenderer
: public SfxListener
{
public:
- /** Create a new preview renderer that takes some of its inital values
+ /** Create a new preview renderer that takes some of its initial values
from the given output device.
@param pTemplate
May be NULL.
@@ -139,7 +139,7 @@ private:
const Color maFrameColor;
const bool mbHasFrame;
static const int snSubstitutionTextSize;
- // Width of the frame that is painted arround the preview.
+ // Width of the frame that is painted around the preview.
static const int snFrameWidth;
bool Initialize (
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 83a52afcea9c..170f76ea6a86 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -187,12 +187,12 @@ public:
*/
void SetCurrentFunction (const FunctionReference& rpFunction);
- /** Return a collection of properties that are used througout the slide
+ /** Return a collection of properties that are used throughout the slide
sorter.
*/
::boost::shared_ptr<controller::Properties> GetProperties (void) const;
- /** Return the active theme wich gives access to colors and fonts.
+ /** Return the active theme which gives access to colors and fonts.
*/
::boost::shared_ptr<view::Theme> GetTheme (void) const;
diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx
index 4799312d67e2..abc46eb72fee 100644
--- a/sd/source/ui/inc/SlideViewShell.hxx
+++ b/sd/source/ui/inc/SlideViewShell.hxx
@@ -117,7 +117,7 @@ public:
virtual bool HasSelection( bool bText = true ) const;
- /** Draw the rectangle arround the specified slide that indicates whether
+ /** Draw the rectangle around the specified slide that indicates whether
the slide is selected or not. When not selected the rectangle is
painted in the background color (WindowColor from the style settings)
and is therefore not visible. A selected slide is painted with the
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index a5277a0b902f..65d3995bd359 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -52,7 +52,7 @@ class ViewShellManager;
Tool bars are managed in groups. Each group can be set, reset, or
modified independently of the others. This allows for instance to
replace the toolbars associated with the current function independently
- from those assoicated with the main view.
+ from those associated with the main view.
The ToolBarManager has two high level methods which contain the
knowledge about which tool bars to show in a specific context.
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index d16c71a51ea2..86e989325991 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -318,7 +318,7 @@ public:
*/
::sd::WindowUpdater* GetWindowUpdater (void) const;
- /** Return the border that is drawn arround the actual document view.
+ /** Return the border that is drawn around the actual document view.
The border contains typically rulers and scroll bars.
@param bOuterResize
When this flag is <true/> then the border is used for an
@@ -420,7 +420,7 @@ public:
/** Set the given window as new parent window. This is not possible for
all views, so the return value tells the caller if the relocation
- was successfull.
+ was successful.
*/
virtual bool RelocateToParentWindow (::Window* pParentWindow);
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index a70362b37f62..a89a3e3a0aa4 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -29,7 +29,7 @@
namespace sd {
/** Local derivation of the SfxHint class that defines some hint ids that
- are used by the ViewShell class and its decendants.
+ are used by the ViewShell class and its descendants.
*/
class ViewShellHint
: public SfxHint
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index ceceae4479d7..1a0ab0543c14 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -61,7 +61,7 @@ public:
/** This update lock for the ToolBarManager exists in order to avoid
problems with tool bars being displayed while the mouse button is
- pressed. Whith docked tool bars this can lead to a size change of
+ pressed. With docked tool bars this can lead to a size change of
the view. This would change the relative mouse coordinates and thus
interpret every mouse click as move command.
*/
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 8c9b71a14058..07b8f28caaa9 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -63,7 +63,7 @@ public:
void SetViewShell (ViewShell* pViewSh);
/** Set the zoom factor to the specified value and center the display
- area arround the zoom center.
+ area around the zoom center.
@param nZoom
The zoom factor is given as integral percent value.
*/
@@ -128,7 +128,7 @@ public:
void SetViewSize(const basegfx::B2DVector& rSize);
void SetCenterAllowed (bool bIsAllowed);
- /** Calculate origin of the map mode accoring to the size of the view
+ /** Calculate origin of the map mode according to the size of the view
and window (its size in model coordinates; that takes the zoom
factor into account), and the bCenterAllowed flag. When it is not
set then nothing is changed. When in any direction the window is
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 9e3194a53c78..1870b6ec0e80 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -54,7 +54,7 @@ public:
virtual void Deactivate(); // Function deaktivieren
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
- //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ //and SHIFT+ENTER key to decide the position and draw the new insert point
virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
private:
Point maOldPoint;
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 44519c43339d..a944f37c803e 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -116,7 +116,7 @@ public:
// #i33136#
/** Decide if the object to be created should be created
orthogonal. Default implementation uses nSlotID
- to decide. May be overloaded to use other criterias
+ to decide. May be overloaded to use other criteria
for this decision
@returns true if the to be created object should be orthogonal.
@@ -144,7 +144,7 @@ protected:
control at the lower left of the document window positive values
move to the right and negative values move to the left.
- <p>Switching the layer is independant of the view's layer mode. The
+ <p>Switching the layer is independent of the view's layer mode. The
layers are switched even when the layer mode is turned off and the
layer control is not visible.</p>
@param nOffset
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 2ab80fc348af..90b0912b8440 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -101,7 +101,7 @@ private:
*/
SdrObject* pickObject (const basegfx::B2DPoint& rTestPoint);
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
- //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ //and SHIFT+ENTER key to decide the position and draw the new insert point
Point maOldPoint;
/// bitfield
diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx
index be5344c2c2a9..f6c3a4df68ac 100644
--- a/sd/source/ui/inc/taskpane/ControlContainer.hxx
+++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx
@@ -125,7 +125,7 @@ public:
is <false/> the hidden controls are skipped.
@param bCycle
When this flag is <true/> then the search for the previous
- control wraps arround when reaching the first control.
+ control wraps around when reaching the first control.
@return
Returns the index to the previous control or (sal_uInt32)-1 when
there is no previous control. This would be the case when there
@@ -147,7 +147,7 @@ public:
<false/> the hidden controls are skipped.
@param bCycle
When this flag is <true/> then the search for the next control
- wraps arround when reaching the last control.
+ wraps around when reaching the last control.
@return
Returns the index to the next control or (sal_uInt32)-1 when
there is no next control. This would be the case when there is
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index c6cf3c36c090..14d33c8a3ec8 100644
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -141,7 +141,7 @@ private:
const int mnHorizontalBorder;
/** List of horizontal stripes that is created from the gaps between
children when they are layouted. The stripes are painted in Paint()
- to fill the space arround the children.
+ to fill the space around the children.
*/
typedef ::std::vector< ::std::pair<int,int> > StripeList;
StripeList maStripeList;
diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
index 6bf5e78b3392..9e81e36972c4 100644
--- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx
+++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
@@ -50,7 +50,7 @@ namespace sd { namespace toolpanel {
is made transparent and painting it is done by this class. While
layouting its children it remembers the gaps between children and stores
them in maStripeList. In Paint() those gaps as well as the border
- arround all children are painted in the background color.</p>
+ around all children are painted in the background color.</p>
*/
class SubToolPanel
: public Control,
@@ -101,7 +101,7 @@ private:
const int mnHorizontalBorder;
/** List of horizontal stripes that is created from the gaps between
children when they are layouted. The stripes are painted in Paint()
- to fill the space arround the children.
+ to fill the space around the children.
*/
typedef ::std::vector< ::std::pair<int,int> > StripeList;
StripeList maStripeList;
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index c4a0f4f21ba7..5b2528a9bfd5 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -101,7 +101,7 @@ public:
const String& GetTitle (void) const;
/** Expand the control without informing its container. This
- method ususally is called by the container as a result of a
+ method usually is called by the container as a result of a
higher level expand command. You may want to use
ExpandViaContainer() instead.
@param bExpanded
diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx
index 1b4ce1d9e66d..07a3e50bbb1d 100644
--- a/sd/source/ui/inc/tools/IconCache.hxx
+++ b/sd/source/ui/inc/tools/IconCache.hxx
@@ -33,7 +33,7 @@ namespace sd {
use the icons do not have to store them in every one of their
instances.
- Icons are adressed over their resource id and are loaded on demand.
+ Icons are addressed over their resource id and are loaded on demand.
This cache acts like a singleton with a lifetime equal to that of the sd
module.
@@ -50,7 +50,7 @@ public:
/** Return the icon with the given resource id.
@return
The returned Image may be empty when there is no icon for the
- given id or an error occured. Should not happen under normal
+ given id or an error occurred. Should not happen under normal
circumstances.
*/
Image GetIcon (sal_uInt16 nResourceId);
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 368f056197fc..c33bad06b15b 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -97,7 +97,7 @@ public:
rxSharedCanvas argument.
@param rxWindow
The window that is represented by the new PresenterCanvas
- object. It is expected to be a direct decendent of
+ object. It is expected to be a direct descendant of
rxSharedWindow. Its position inside rxSharedWindow defines the
offset of the canvas implemented by the new PresenterCanvas
object and rxSharedCanvas.
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 25975d0a80f2..e84cbcb627de 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -145,7 +145,7 @@ private:
bool mbFirstPageObjectSeen;
// The widths for the previews contain two pixels for the border that is
- // painted arround the preview.
+ // painted around the preview.
static const int SMALL_PREVIEW_WIDTH = 72 + 2;
static const int LARGE_PREVIEW_WIDTH = 2*72 + 2;
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index e1502082b743..ab95815c4014 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -51,7 +51,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.
@@ -60,7 +60,7 @@ class MasterPageDescriptor;
name, and, if available, the page object.
Entries are accessed via a Token, which is mostly a numerical index but
- whose values do not neccessarily have to be consecutive.
+ whose values do not necessarily have to be consecutive.
*/
class MasterPageContainer
{
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 5a08a5a16392..21277415eb41 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -97,7 +97,7 @@ public:
virtual sal_Int32 GetMinimumWidth (void);
/** Update the selection of previews according to whatever
- influences them appart from mouse and keyboard. If, for
+ influences them apart from mouse and keyboard. If, for
example, the current page of the main pane changes, then call
this method at the CurrentMasterPagesSelector to select the
previews of the master pages that are assigned to the new
@@ -195,14 +195,14 @@ protected:
ItemList maLockedMasterPages;
/** Lock master pages in the given list and release locks that where
- previously aquired.
+ previously acquired.
*/
void UpdateLocks (const ItemList& rItemList);
void Fill (void);
virtual void Fill (ItemList& rItemList) = 0;
- /** Give derived classes the oportunity to provide their own context
+ /** Give derived classes the opportunity to provide their own context
menu. If they do then they probably have to provide their own
Execute() and GetState() methods as well.
*/
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 5a0c55c18d10..8aceaec128fe 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -28,7 +28,7 @@
namespace sd { namespace sidebar {
-/** Adapt the svtools valueset to the needs of the master page controlls.
+/** Adapt the svtools valueset to the needs of the master page controls.
*/
class PreviewValueSet
: public ValueSet
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 60c2c5601e59..a5098d20e642 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -37,7 +37,7 @@ namespace sd {
leads to a crash.
During a restart a possibly installed presenter extension is given the
- oportunity to show or hide depending on the number of available displays.
+ opportunity to show or hide depending on the number of available displays.
*/
class SlideShowRestarter
: public boost::enable_shared_from_this<SlideShowRestarter>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index db32e511462f..a1f6fcea7964 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1033,7 +1033,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
getViewFrame()->SetChildWindow( SID_NAVIGATOR, maPresSettings.mbStartWithNavigator );
}
- // these Slots are forbiden in other views for this document
+ // these Slots are forbidden in other views for this document
if( mpDocSh )
{
mpDocSh->SetSlotFilter( true, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed );
@@ -1893,7 +1893,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( SlideshowImpl, ReadyForNextInputHdl, Timer*, EMPTYARG )
{
mbInputFreeze = false;
@@ -2818,7 +2818,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
if( pDispatcher )
{
- // filter all forbiden slots
+ // filter all forbidden slots
pDispatcher->SetSlotFilter( true, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
}
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 297b24ea23ac..e90b8021fcf6 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -160,11 +160,11 @@ public:
@param bIncludePrecious
When this flag is <true/> entries with the precious flag set are
included in the index. When the flag is <false/> these entries
- are ommited.
+ are omitted.
@param bIncludeNoPreview
When this flag is <true/> entries with that have no preview
bitmaps are included in the index. When the flag is <false/> these entries
- are ommited.
+ are omitted.
*/
::std::auto_ptr<CacheIndex> GetCacheIndex (
bool bIncludePrecious,
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 98304df48956..fa6aaf39ffb2 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -104,7 +104,7 @@ public:
void SetBitmapCache (const ::boost::shared_ptr<BitmapCache>& rpCache);
private:
- /** This mutex is used to guard the queue processor. Be carefull not to
+ /** This mutex is used to guard the queue processor. Be careful not to
mix its use with that of the solar mutex.
*/
::osl::Mutex maMutex;
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx
index 31a5bbe40c0b..50a76b32bac1 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx
@@ -76,7 +76,7 @@ public:
void SAL_CALL Terminate (void);
protected:
- /** This virutal method is called (among others?) from the
+ /** This virtual method is called (among others?) from the
inherited create method and acts as the main function of this
thread.
*/
@@ -95,7 +95,7 @@ private:
volatile bool mbCanBeJoined;
- /** This mutex is used to guard the queue processor. Be carefull not to
+ /** This mutex is used to guard the queue processor. Be careful not to
mix its use with that of the solar mutex.
*/
::osl::Mutex maMutex;
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index 65df2748ceb5..7ebd8112a9e7 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -97,7 +97,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection)
{
if (mbIsVerticalWrapActive)
{
- // Wrap arround to the bottom row or the one above
+ // Wrap around to the bottom row or the one above
// and go to the correct column.
const sal_Int32 nLastIndex (nPageCount-1);
const sal_Int32 nLastColumn (nLastIndex % nColumnCount);
@@ -131,7 +131,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection)
{
if (mbIsVerticalWrapActive)
{
- // Wrap arround to the correct column.
+ // Wrap around to the correct column.
mnPageIndex = mnPageIndex % nColumnCount;
}
else
diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx
index 4683385ca682..e7c39797884d 100644
--- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx
@@ -134,7 +134,7 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState (
switch (eState)
{
case UNDEFINED:
- // Use the first selected page to set the inital value.
+ // Use the first selected page to set the initial value.
eState = bState ? EXCLUDED : INCLUDED;
break;
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 75589ca0d70d..f89c608ef8b2 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -82,7 +82,7 @@ public:
/** Connect to the current controller of the view shell as listener.
This method is called once during initialization and every time a
FrameActionEvent signals the current controller being exchanged.
- When the connection is successfull then the flag
+ When the connection is successful then the flag
mbListeningToController is set to <true/>.
*/
void ConnectToController (void);
@@ -154,7 +154,7 @@ private:
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame> mxFrameWeak;
/** This object is used to lock the model between some
- events. It is refernce counted in order to cope with events that
+ events. It is references counted in order to cope with events that
are expected but never sent.
*/
::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock;
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
index 1fa2fdd29008..76deb3bc58f4 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
@@ -52,7 +52,7 @@ class SelectionCommand
: public Command
{
public:
- /** Create a new command object that will on its exection use the given
+ /** Create a new command object that will on its execution use the given
PageSelector to select a set of pages.
*/
SelectionCommand (
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 54152488c5c0..fa15caeb2e73 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -799,7 +799,7 @@ void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent)
void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor)
{
// The call to ProcessEvent may switch to another mode handler.
- // Prevent the untimely destruction of the called handler by aquiring a
+ // Prevent the untimely destruction of the called handler by acquiring a
// temporary reference here.
::boost::shared_ptr<ModeHandler> pModeHandler (mpModeHandler);
pModeHandler->ProcessEvent(rDescriptor);
@@ -1882,7 +1882,7 @@ bool DragAndDropModeHandler::ProcessButtonUpEvent (
{
if (Match(rDescriptor.mnEventCode, BUTTON_UP | LEFT_BUTTON))
{
- // The following Process() call may lead to the desctruction
+ // The following Process() call may lead to the destruction
// of rDescriptor.mpHitDescriptor so release our reference to it.
rDescriptor.mpHitDescriptor.reset();
mrSelectionFunction.SwitchToNormalMode();
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index fa623cb44126..a53f585ace40 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1307,7 +1307,7 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet)
switch (eState)
{
case UNDEFINED:
- // Use the first selected page to set the inital value.
+ // Use the first selected page to set the initial value.
eState = bState ? EXCLUDED : INCLUDED;
break;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index 9d011e192ac2..c93b04cd1023 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -39,7 +39,7 @@ class SlideSorterView;
namespace sd { namespace slidesorter { namespace controller {
-/** A collection of functions that are usefull when creating animations.
+/** A collection of functions that are useful when creating animations.
They are collected here until a better place is found.
*/
class AnimationFunction
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index 5f00e0f2e41d..ba829d6f4416 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -66,11 +66,11 @@ public:
/** Move the focus from the currently focused page to one that is
displayed adjacent to it, either vertically or horizontally.
@param eDirection
- Direction in which to move the focus. Wrap arround is done
+ Direction in which to move the focus. Wrap around is done
differently when moving vertically or horizontally. Vertical
- wrap arround takes place in the same column, i.e. when you are
+ wrap around takes place in the same column, i.e. when you are
in the top row and move up you come out in the bottom row in the
- same column. Horizontal wrap arround moves to the next
+ same column. Horizontal wrap around moves to the next
(FMD_RIGHT) or previous (FMD_LEFT) page. Moving to the right
from the last page goes to the first page and vice versa.
When FMD_NONE is given, the current page index is checked for
@@ -218,7 +218,7 @@ private:
const bool bScrollToFocus);
/** Call all currently registered listeners that a focus change has
- happended. The focus may be hidden or shown or moved from one page
+ happened. The focus may be hidden or shown or moved from one page
object to another.
*/
void NotifyFocusChangeListeners (void) const;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index c2a1a3b192e3..4d439d894025 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -152,7 +152,7 @@ public:
When <TRUE/> (the default value) then after setting the
selection update the current page to the first page of the
selection.
- When called from withing UpdateCurrentPage() then this flag is
+ When called from within UpdateCurrentPage() then this flag is
used to prevent a recursion loop.
*/
void SetPageSelection (
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index e129fbbcecaa..09a711e0c685 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -65,7 +65,7 @@ public:
@param pPage
The page pointer can in some situations not be detected from
rxPage, e.g. after undo of page deletion. Therefore supply it
- seperately.
+ separately.
@param nIndex
This index is displayed in the view as page number. It is not
necessaryily the page index (not even when you add or subtract 1
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 74d42709ea94..7786e1129305 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -50,7 +50,7 @@ class InsertPosition;
2.) Desired and minimal and maximal widths of page objects.
3.) Minimal and maximal number of columns.
4.) Vertical and horizontal gaps between objects in adjacent columns.
- 5.) Borders arround every page object.
+ 5.) Borders around every page object.
6.) Vertical and horizontal borders between enclosing page and outer
page objects.
From these it calculates various output values:
@@ -99,7 +99,7 @@ public:
sal_Int32 nTopBorder, sal_Int32 nBottomBorder);
/** Set the interval of valid column counts. When nMinimalColumnCount
- <= nMaximalColumnCount is not fullfilled then the call is ignored.
+ <= nMaximalColumnCount is not fulfilled then the call is ignored.
@param nMinimalColumnCount
The default value is 1. The question whether higher values make
any sense is left to the caller.
@@ -113,7 +113,7 @@ public:
calculates the output values. Both given sizes must not be 0 in any
dimension or the call is ignored.
@param eOrientation
- This defines the generaly layout and specifies whether there may
+ This defines the generally layout and specifies whether there may
be more than one row or more than one column.
@param rWindowSize
The size of the window in pixels that the slide sorter is
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
index 1f710120df3f..ff74651fd6a7 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
@@ -99,7 +99,7 @@ public:
model::SharedPageDescriptor GetPageDescriptor (void) const;
/** Return the border widths in the screen coordinate system of the
- border arround the page object. The border contains frames for
+ border around the page object. The border contains frames for
selection, focus, the page name and number, and the indicator for
the page transition.
@param pDevice
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 67e0dfc8d9b9..c52df38768c2 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -54,14 +54,14 @@ private:
/** This constructor sets the internal page index to the given value.
It does not call AdvanceToNextValidElement() to skip elements that
- do not fullfill Predicate.
+ do not fulfill Predicate.
*/
inline PageEnumerationImpl (
const SlideSorterModel& rModel,
const PageEnumeration::PagePredicate& rPredicate,
int nIndex);
- /** Skip all elements that do not fullfill Predicate starting with the
+ /** Skip all elements that do not fulfill Predicate starting with the
one pointed to by mnIndex.
*/
inline void AdvanceToNextValidElement (void);
@@ -262,7 +262,7 @@ void PageEnumerationImpl::AdvanceToNextValidElement (void)
{
SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex));
- // Test for the predicate being fullfilled.
+ // Test for the predicate being fulfilled.
if (pDescriptor.get()!=NULL && maPredicate(pDescriptor))
{
// This predicate is valid.
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 9d9ad735b194..042af73be1ab 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -141,7 +141,7 @@ namespace {
};
/** The source mask is essentially multiplied with the given alpha value.
- The result is writen to the result mask.
+ The result is written to the result mask.
*/
void AdaptTransparency (AlphaMask& rMask, const AlphaMask& rSourceMask, const double nAlpha)
{
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 907cab12bacc..175e1407f91d 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -395,7 +395,7 @@ void PreviewRenderer::PaintFrame (void)
{
if (mbHasFrame)
{
- // Paint a frame arround the preview.
+ // Paint a frame around the preview.
Rectangle aPaintRectangle (
Point(0,0),
mpPreviewDevice->GetOutputSizePixel());
@@ -510,7 +510,7 @@ Image PreviewRenderer::ScaleBitmap (
mpPreviewDevice->SetMapMode (aMapMode);
mpPreviewDevice->SetOutputSize (aFrameSize);
- // Paint a frame arround the preview.
+ // Paint a frame around the preview.
mpPreviewDevice->SetLineColor (maFrameColor);
mpPreviewDevice->SetFillColor ();
mpPreviewDevice->DrawRect (Rectangle(Point(0,0), aFrameSize));
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 203e22fb31f2..8dcaf10e1d46 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -67,11 +67,7 @@
#include <svx/svdview.hxx>
#include "misc.hxx"
#include "View.hxx"
-#ifndef SVX_LIGHT
-#ifndef SD_DRAW_DOC_SHELL_HXX
#include "DrawDocShell.hxx"
-#endif
-#endif
#include "ViewShell.hxx"
#include "DrawViewShell.hxx"
#include "unoobj.hxx"
@@ -81,6 +77,7 @@
#include "unohelp.hxx"
#include <svx/globaldrawitempool.hxx>
#include <vcl/dibtools.hxx>
+#include <svx/svdograf.hxx>
using ::com::sun::star::animations::XAnimationNode;
using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -432,7 +429,20 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) )
{
SdDrawDocument& rDoc = static_cast< SdDrawDocument& >(GetPage()->getSdrModelFromSdrPage());
- pObj->SetStyleSheet( rDoc.GetDefaultStyleSheet(), sal_True );
+ // #119287# similar to the code in the SdrObject methods the graphic and ole
+ // SdrObjects need another default style than the rest, see task. Adding here, too.
+ // TTTT: Same as for #119287#: Can be removed in branch aw080 again
+ const bool bIsSdrGrafObj(0 != dynamic_cast< SdrGrafObj* >(pObj));
+ const bool bIsSdrOle2Obj(0 != dynamic_cast< SdrOle2Obj* >(pObj));
+
+ if(bIsSdrGrafObj || bIsSdrOle2Obj)
+ {
+ pObj->SetStyleSheet(rDoc.GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), sal_True);
+ }
+ else
+ {
+ pObj->SetStyleSheet(rDoc.GetDefaultStyleSheet(), sal_True);
+ }
}
return pObj;
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 4139cc95ab40..13320571f062 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -115,7 +115,7 @@ namespace {
bool IsHandoutHorizontal (void) const
{
- return GetBoolValue("SlidesPerPageOrder", sal_Int32(0), true);
+ return GetBoolValue("SlidesPerPageOrder", NULL, true);
}
sal_Int32 GetHandoutPageCount (void) const
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index aa4bea53e09f..3fb73c91cdd1 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -224,7 +224,7 @@ void FormShellManager::UnregisterAtCenterPane (void)
IMPL_LINK(FormShellManager, FormControlActivated, FmFormShell*, EMPTYARG)
{
- // The form shell has been actived. To give it priority in reacting to
+ // The form shell has been activated. To give it priority in reacting to
// slot calls the form shell is moved to the top of the object bar shell
// stack.
ViewShell* pShell = mrBase.GetMainViewShell().get();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 04a1bc1f1037..b85ab6f0c893 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -454,7 +454,7 @@ sal_Bool Outliner::SpellNextDocument (void)
// found the loop is left through a break.
// It is the responsibility of the sd outliner object to correctly
// iterate over all text shapes, i.e. switch between views, wrap
- // arround at the end of the document, stop when all text shapes
+ // around at the end of the document, stop when all text shapes
// have been examined exactly once.
bool bFoundNextSentence = false;
while ( ! bFoundNextSentence)
@@ -614,7 +614,7 @@ void Outliner::Initialize (bool bDirectionIsForward)
}
else if (bOldDirectionIsForward != mbDirectionIsForward)
{
- // Requested iteration direction has changed. Turn arround the iterator.
+ // Requested iteration direction has changed. Turn around the iterator.
maObjectIterator.Reverse();
if (bIsAtEnd)
{
@@ -760,7 +760,7 @@ bool Outliner::SearchAndReplaceOnce (void)
{
mpDrawDocument->GetDocSh()->SetWaitCursor (false);
// The following loop is executed more then once only when a
- // wrap arround search is done.
+ // wrap around search is done.
while (true)
{
int nResult = pOutlinerView->StartSearchAndReplace(*mpSearchItem);
@@ -1104,7 +1104,7 @@ void Outliner::EndOfSearch (void)
ShowEndOfSearchDialog ();
mbEndOfSearch = true;
}
- // Ask the user whether to wrap arround and continue the search or
+ // Ask the user whether to wrap around and continue the search or
// to terminate.
else if (meMode==TEXT_CONVERSION || ShowWrapArroundDialog ())
{
@@ -1123,7 +1123,7 @@ void Outliner::EndOfSearch (void)
}
else
{
- // No wrap arround.
+ // No wrap around.
mbEndOfSearch = true;
}
}
@@ -1190,7 +1190,7 @@ bool Outliner::ShowWrapArroundDialog (void)
? STR_SAR_WRAP_BACKWARD
: STR_SAR_WRAP_BACKWARD_DRAW;
- // Pop up question box that asks the user whether to wrap arround.
+ // Pop up question box that asks the user whether to wrap around.
// The dialog is made modal with respect to the whole application.
QueryBox aQuestionBox (
NULL,
@@ -1287,7 +1287,7 @@ void Outliner::PrepareSearchAndReplace (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.
OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
if (pOutlinerView != NULL)
@@ -1491,7 +1491,7 @@ bool Outliner::HandleFailedSearch (void)
if (pOutlinerView != NULL && mpSearchItem != NULL)
{
// Detect whether there is/may be a prior match. If there is then
- // ask the user whether to wrap arround. Otherwise tell the user
+ // ask the user whether to wrap around. Otherwise tell the user
// that there is no match.
if (HasNoPreviousMatch ())
{
@@ -1504,7 +1504,7 @@ bool Outliner::HandleFailedSearch (void)
else
{
// No further matches found. Ask the user whether to wrap
- // arround and start again.
+ // around and start again.
bContinueSearch = ShowWrapArroundDialog ();
}
}
@@ -1627,7 +1627,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.
// mpOutlineView->SetSelection (GetSearchStartPosition ());
}
@@ -1702,7 +1702,7 @@ sal_Bool Outliner::ConvertNextDocument()
mpDrawDocument->GetDocSh()->SetWaitCursor( false );
ClearModifyFlag();
- // for text conversion we automaticly wrap around one
+ // for text conversion we automatically wrap around one
// time and stop at the start shape
if( mpFirstObj )
{
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 8dddbfc3c0e6..0719a6960f4c 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -125,7 +125,7 @@ private:
list the current list and clears the current list.
Each shell belongs to one group. Different groups can be modified
- seperately.
+ separately.
*/
class ToolBarShellList
{
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 58c602b58537..3624d4435025 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -421,7 +421,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
{
rSet.DisableItem( SID_THES );
}
- //! avoid puting the same item as SfxBoolItem at the end of this function
+ //! avoid putting the same item as SfxBoolItem at the end of this function
nSlotId = 0;
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0a63c00c494f..4a5d2f660f2f 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -686,6 +686,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
mpDrawView->DeleteMarkedObj();
}
+ // #124816# copy layer from lowest object which gets replaced
+ pGraphicObj->SetLayer(pReplacementCandidate->GetLayer());
+
// now replace lowest object with new one
mpDrawView->ReplaceObjectAtView(*pReplacementCandidate, *pGraphicObj);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index ac5e44fd1d3a..c4b9739444d1 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -561,7 +561,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
// pValue++;nIndex++;
aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) );
-/* #107128# Product managment decided to not make this persistent
+/* #107128# Product management decided to not make this persistent
aUserData.addValue( sUNO_View_DrawMode, makeAny( (sal_Int32)GetDrawMode() ) );
aUserData.addValue( sUNO_View_PreviewDrawMode, makeAny( (sal_Int32)GetPreviewDrawMode() ) );
*/
@@ -803,7 +803,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
SetSlidesPerRow( (sal_uInt16)nInt16 );
}
}
-/* #107128# Product managment decided to not make this persistent
+/* #107128# Product management decided to not make this persistent
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_DrawMode ) ) )
{
if( pValue->Value >>= nInt32 )
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 883a3cf4cd71..6ebca15c9483 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -859,7 +859,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally )
// --------------------------------------------------------------------
/** restores the default text if the given text object is currently in edit mode and
- no text has been entered already. Is only usefull just before text edit ends. */
+ no text has been entered already. Is only useful just before text edit ends. */
bool View::RestoreDefaultText( SdrTextObj* pTextObj )
{
bool bRestored = false;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index efcb5d8c1a4b..ac118cfad934 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1094,7 +1094,7 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab )
/** Tell the FmFormShell that the view shell is closing. Give it the
- oportunity to prevent that.
+ opportunity to prevent that.
*/
sal_uInt16 ViewShell::PrepareClose (bool bUI, bool bForBrowsing)
{
@@ -1114,7 +1114,7 @@ void ViewShell::UpdatePreview (SdPage*, bool )
{
// Do nothing. After the actual preview has been removed,
// OutlineViewShell::UpdatePreview() is the place where something
- // usefull is still done.
+ // useful is still done.
}
::svl::IUndoManager* ViewShell::ImpGetUndoManager (void) const