summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-12-20 11:25:37 +0100
committerAndras Timar <andras.timar@collabora.com>2013-12-20 15:55:00 +0100
commitb55259eeb549482477c57d854f3de72aff345edb (patch)
tree35e474b8458ae776a8455f4f78e73ae28c611180 /svx/source
parent377ec698afc98a9a098b456f4ae3c694498df6a2 (diff)
typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/accessibility/svxpixelctlaccessiblecontext.cxx2
-rw-r--r--svx/source/core/extedit.cxx2
-rw-r--r--svx/source/core/graphichelper.cxx6
-rw-r--r--svx/source/dialog/graphctl.cxx6
-rw-r--r--svx/source/dialog/svxruler.cxx2
-rw-r--r--svx/source/engine3d/cube3d.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx10
-rw-r--r--svx/source/inc/docrecovery.hxx2
-rw-r--r--svx/source/svdraw/svdview.cxx6
9 files changed, 19 insertions, 19 deletions
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 38ee6c63b487..926affdf8949 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -1020,7 +1020,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt
Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException )
{
- // no guard neccessary, because no one changes mpBoundingBox after creating it
+ // no guard necessary, because no one changes mpBoundingBox after creating it
ThrowExceptionIfNotAlive();
return *mpBoundingBox;
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index f7721cd1a0ce..9dd2e7e2505c 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -85,7 +85,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject )
//get the Preferred File Extension for this graphic
OUString fExtension;
- GraphicHelper::GetPreferedExtension(fExtension, aGraphic);
+ GraphicHelper::GetPreferredExtension(fExtension, aGraphic);
//Create the temp File
OUString aTempFileBase;
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index df3015eaa071..217989f891fd 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -58,7 +58,7 @@ using namespace sfx2;
namespace drawing = com::sun::star::drawing;
-void GraphicHelper::GetPreferedExtension( OUString& rExtension, const Graphic& rGraphic )
+void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic )
{
OUString aExtension = "png";
switch( const_cast<Graphic&>( rGraphic ).GetLink().GetType() )
@@ -113,7 +113,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
OUString aExtension( aURL.GetExtension() );
if( aExtension.isEmpty() )
{
- GetPreferedExtension( aExtension, rGraphic );
+ GetPreferredExtension( aExtension, rGraphic );
}
aExtension = aExtension.toAsciiLowerCase();
@@ -133,7 +133,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
if ( USHRT_MAX == nDefaultFilter )
{
// "wrong" extension?
- GetPreferedExtension( aExtension, rGraphic );
+ GetPreferredExtension( aExtension, rGraphic );
for ( sal_uInt16 i = 0; i < nCount; ++i )
if ( aExtension == rGraphicFilter.GetExportFormatShortName( i ).toAsciiLowerCase() )
{
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 4fc18b71cbeb..5e87d51cc376 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -650,7 +650,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
if ( pCreateObj && !pCreateObj->GetUserCall() )
pCreateObj->SetUserCall( pUserCall );
- SetPointer( pView->GetPreferedPointer( aLogPt, this ) );
+ SetPointer( pView->GetPreferredPointer( aLogPt, this ) );
}
else
Control::MouseButtonDown( rMEvt );
@@ -671,7 +671,7 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt)
SetPointer( POINTER_CROSS );
}
else
- SetPointer( pView->GetPreferedPointer( aLogPos, this ) );
+ SetPointer( pView->GetPreferredPointer( aLogPos, this ) );
}
else
Control::MouseButtonUp( rMEvt );
@@ -697,7 +697,7 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt)
pView->MouseButtonUp( rMEvt, this );
ReleaseMouse();
- SetPointer( pView->GetPreferedPointer( PixelToLogic( rMEvt.GetPosPixel() ), this ) );
+ SetPointer( pView->GetPreferredPointer( PixelToLogic( rMEvt.GetPosPixel() ), this ) );
}
else
Control::MouseButtonUp( rMEvt );
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index a41d0e07d5e2..4d027bbb66cb 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1003,7 +1003,7 @@ void SvxRuler::SetDefTabDist(long inDefTabDist) // New distance for DefaultTabs
sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
{
- /* Internal convertion routine between SV-Tab.-Enum and Svx */
+ /* Internal conversion routine between SV-Tab.-Enum and Svx */
switch(eAdj) {
case SVX_TAB_ADJUST_LEFT: return RULER_TAB_LEFT;
case SVX_TAB_ADJUST_RIGHT: return RULER_TAB_RIGHT;
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 7a0426c364fa..bfa7c08f421e 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -42,7 +42,7 @@ E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, c
// Set Defaults
SetDefaultAttributes(rDefault);
- aCubePos = aPos; // position centre or left, bottom, back (dependant on bPosIsCenter)
+ aCubePos = aPos; // position centre or left, bottom, back (dependent on bPosIsCenter)
aCubeSize = r3DSize;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ff30e5928a50..ac04ace27d1b 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -482,7 +482,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
sal_Bool bDateNTimeCol = sal_False;
if (!aPossibleTypes.empty())
{
- sal_Int32 nPreferedType = aPossibleTypes[0];
+ sal_Int32 nPreferredType = aPossibleTypes[0];
if ((m_pImpl->nDropAction == DND_ACTION_LINK) && (aPossibleTypes.size() > 1))
{
ImageList aImageList( SVX_RES(RID_SVXIMGLIST_FMEXPL) );
@@ -492,18 +492,18 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
PopupMenu* pMenu = aInsertMenu.GetPopupMenu(SID_FM_INSERTCOL);
for (std::vector<sal_uInt16>::const_iterator iter = aPossibleTypes.begin(); iter != aPossibleTypes.end(); ++iter)
SetMenuItem(aImageList, *iter, pMenu, aTypeMenu, sal_True, 0);
- nPreferedType = aTypeMenu.Execute(this, m_pImpl->aDropPosPixel);
+ nPreferredType = aTypeMenu.Execute(this, m_pImpl->aDropPosPixel);
}
- bDateNTimeCol = nPreferedType == SID_FM_TWOFIELDS_DATE_N_TIME;
+ bDateNTimeCol = nPreferredType == SID_FM_TWOFIELDS_DATE_N_TIME;
sal_uInt16 nColCount = bDateNTimeCol ? 2 : 1;
OUString sFieldService;
while (nColCount--)
{
if (bDateNTimeCol)
- nPreferedType = nColCount ? SID_FM_DATEFIELD : SID_FM_TIMEFIELD;
+ nPreferredType = nColCount ? SID_FM_DATEFIELD : SID_FM_TIMEFIELD;
- sFieldService = FieldServiceFromId(nPreferedType);
+ sFieldService = FieldServiceFromId(nPreferredType);
Reference< XPropertySet > xThisRoundCol;
if ( !sFieldService.isEmpty() )
xThisRoundCol = xFactory->createColumn(sFieldService);
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 02219e3e2878..6395e6fe5a68 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -101,7 +101,7 @@ enum EDocStates
/// the Auto/Emergency saved document isnt useable any longer
E_DAMAGED = 64,
- /// the Auto/Emergency saved document isnt realy up-to-date (some changes can be missing)
+ /// the Auto/Emergency saved document isnt really up-to-date (some changes can be missing)
E_INCOMPLETE = 128,
/// the Auto/Emergency saved document was processed successfully
E_SUCCEDED = 512
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c2b303230909..e8ef1ce00c46 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -209,7 +209,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
}
} // switch
if (bRet && pWin!=NULL) {
- pWin->SetPointer(GetPreferedPointer(
+ pWin->SetPointer(GetPreferredPointer(
pWin->PixelToLogic(pWin->ScreenToOutputPixel( pWin->GetPointerPosPixel() ) ),
pWin,
rKEvt.GetKeyCode().GetModifier()));
@@ -933,7 +933,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
// left mouse button pressed or held?
sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
- pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin,
+ pWin->SetPointer(GetPreferredPointer(rVEvt.aLogicPos,pWin,
rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1));
sal_Bool bAction=IsAction();
if (bLeftDown && bAction) pWin->CaptureMouse();
@@ -943,7 +943,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
#include <editeng/outlobj.hxx>
-Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
+Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
{
// Actions
if (IsCreateObj())