You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2024/07/18 08:08:08 UTC
(openoffice) branch trunk updated: Fixed various typos, general cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 30b5884576 Fixed various typos, general cleanup
30b5884576 is described below
commit 30b588457612edabf32b6255080af21100f58f0b
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Jul 18 10:07:49 2024 +0200
Fixed various typos, general cleanup
---
main/chart2/source/view/main/PropertyMapper.cxx | 2 +-
.../offapi/com/sun/star/awt/XDisplayConnection.idl | 4 +-
main/sal/systools/win32/uwinapi/sntprintf.c | 10 ++--
main/sw/source/ui/docvw/PostItMgr.cxx | 48 ++++++++---------
main/sw/source/ui/docvw/SidebarWin.cxx | 28 +++++-----
main/sw/source/ui/docvw/edtdd.cxx | 63 ++++++++++------------
main/vcl/qa/complex/memCheck/CheckMemoryUsage.java | 31 ++++++-----
main/xmloff/source/chart/XMLChartStyleContext.cxx | 2 +-
8 files changed, 90 insertions(+), 98 deletions(-)
diff --git a/main/chart2/source/view/main/PropertyMapper.cxx b/main/chart2/source/view/main/PropertyMapper.cxx
index 9db17e4b4b..b21f6aae76 100644
--- a/main/chart2/source/view/main/PropertyMapper.cxx
+++ b/main/chart2/source/view/main/PropertyMapper.cxx
@@ -418,7 +418,7 @@ void PropertyMapper::setMultiProperties(
}
catch( uno::Exception& e )
{
- ASSERT_EXCEPTION( e ); //if this occurs more often think of removing the XMultiPropertySet completly for better performance
+ ASSERT_EXCEPTION( e ); //if this occurs more often think of removing the XMultiPropertySet completely for better performance
}
if(!bSuccess)
diff --git a/main/offapi/com/sun/star/awt/XDisplayConnection.idl b/main/offapi/com/sun/star/awt/XDisplayConnection.idl
index a49c5cc6fb..7c050cf60f 100644
--- a/main/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/main/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -63,7 +63,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
@param window
the platform specific window id the handler should be deregistered for.
- If empty, the handler should be deregistered completly.
+ If empty, the handler should be deregistered completely.
@param eventHandler
the handler to remove.
@@ -92,7 +92,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
/** returns a identifier.
- @returns a unique platform dependend identifier for a display connection.
+ @returns a unique platform dependent identifier for a display connection.
*/
any getIdentifier();
diff --git a/main/sal/systools/win32/uwinapi/sntprintf.c b/main/sal/systools/win32/uwinapi/sntprintf.c
index c88cdf2874..259451cd55 100644
--- a/main/sal/systools/win32/uwinapi/sntprintf.c
+++ b/main/sal/systools/win32/uwinapi/sntprintf.c
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#define _SNPRINTF_DLLIMPORT __declspec( dllexport )
@@ -58,7 +58,7 @@ static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
/* This function retrieves the pointer to the last character of a buffer.
That is the pointer to the last character of the buffer that fits
- completly into that buffer or the position of the terminating zero.
+ completely into that buffer or the position of the terminating zero.
buffer Pointer to a _TXCHAR buffer to be examined
count size of the buffer to be examined
diff --git a/main/sw/source/ui/docvw/PostItMgr.cxx b/main/sw/source/ui/docvw/PostItMgr.cxx
index d5cc9ec701..51220d873f 100644
--- a/main/sw/source/ui/docvw/PostItMgr.cxx
+++ b/main/sw/source/ui/docvw/PostItMgr.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -123,7 +121,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView)
SwNoteProps aProps;
mbIsShowAnchor = aProps.IsShowAnchor();
- //make sure we get the colour yellow always, even if not the first one of comments or redlining
+ //make sure we get the color yellow always, even if not the first one of comments or redlining
SW_MOD()->GetRedlineAuthor();
// collect all PostIts and redline comments that exist after loading the document
@@ -502,7 +500,7 @@ bool SwPostItMgr::CalcRects()
}
// show notes in right order in navigator
- //prevent Anchors during layout to overlap, e.g. when moving a frame
+ // prevent Anchors during layout to overlap, e.g. when moving a frame
Sort(SORT_POS);
// sort the items into the right page vector, so layout can be done by page
@@ -718,7 +716,7 @@ void SwPostItMgr::LayoutPostIts()
}
else
{
- //when we changed our zoom level, the offset value can be to big, so lets check for the largest possible zoom value
+ // when we changed our zoom level, the offset value can be to big, so lets check for the largest possible zoom value
long aAvailableHeight = mpEditWin->LogicToPixel(Size(0,mPages[n]->mPageRect.Height())).Height() - 2 * GetSidebarScrollerHeight();
long lOffset = -1 * GetScrollSize() * (aVisiblePostItList.size() - aAvailableHeight / GetScrollSize());
if (mPages[n]->lOffset < lOffset)
@@ -730,7 +728,7 @@ void SwPostItMgr::LayoutPostIts()
TODO
- enlarge all notes till GetNextBorder(), as we resized to average value before
*/
- //lets hide the ones which overlap the page
+ // let's hide the ones which overlap the page
for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
{
if (mPages[n]->lOffset != 0)
@@ -928,7 +926,7 @@ void SwPostItMgr::MakeVisible(const SwSidebarWin* pPostIt,long aPage )
{
if (aPage == -1)
{
- // we dont know the page yet, lets find it ourselves
+ // we don't know the page yet, let's find it ourselves
for (unsigned long n=0;n<mPages.size();n++)
{
if (mPages[n]->mList->size()>0)
@@ -1025,7 +1023,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
}
}
- //start the real layout so nothing overlaps anymore
+ // start the real layout so nothing overlaps anymore
if (aVisiblePostItList.size()>1)
{
// if no window is moved anymore we are finished
@@ -1411,7 +1409,7 @@ SwSidebarWin* SwPostItMgr::GetNextPostIt( sal_uInt16 aDirection,
return NULL;
}
}
- // lets quit, we are back at the beginng
+ // let's quit, we are back at the beginning
if ( (*iNextPostIt)->pPostIt==aPostIt)
return NULL;
return (*iNextPostIt)->pPostIt;
@@ -1512,7 +1510,7 @@ void SwPostItMgr::PrepareView(bool bIgnoreCount)
if (!HasNotes() || bIgnoreCount)
{
mpWrtShell->StartAllAction();
- //mpEditWin->Invalidate(); // really not needed anymore??
+ //mpEditWin->Invalidate(); // really not needed anymore?
SwRootFrm* pLayout = mpWrtShell->GetLayout();
if ( pLayout )
SwPostItHelper::setSidebarChanged( pLayout,
@@ -1547,7 +1545,7 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel)
if (aRect.IsInside(aPoint))
{
// we hit the note's sidebar
- // lets now test for the arrow area
+ // let's now test for the arrow area
if (mPages[nPageNum-1]->bScrollbar)
return ScrollbarHit(nPageNum,aPoint);
else
@@ -1634,13 +1632,13 @@ void SwPostItMgr::CorrectPositions()
// yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
// --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
- const long aAnchorX = pFirstPostIt->Anchor()
+ const long aAnchorX = pFirstPostIt->Anchor()
? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X()
: 0;
- const long aAnchorY = pFirstPostIt->Anchor()
+ const long aAnchorY = pFirstPostIt->Anchor()
? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1
: 0;
- // <--
+ // <--
if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
{
long aAnchorPosX = 0;
@@ -1730,12 +1728,12 @@ Color SwPostItMgr::GetColorAnchor(sal_uInt16 aAuthorIndex)
{
if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
- static const Color aArrayAnchor[] = {
+ static const Color aArrayAnchor[] = {
COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK,
COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK,
COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK };
- return Color( aArrayAnchor[ aAuthorIndex % (sizeof( aArrayAnchor ) / sizeof( aArrayAnchor[0] ))]);
+ return Color( aArrayAnchor[ aAuthorIndex % (sizeof( aArrayAnchor ) / sizeof( aArrayAnchor[0] ))]);
}
else
return Color(COL_WHITE);
@@ -1748,7 +1746,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p)
// we need the temp variable so we can set mpActivePostIt before we call DeactivatePostIt
// therefore we get a new layout in DOCCHANGED when switching from postit to document,
// otherwise, GetActivePostIt() would still hold our old postit
- SwSidebarWin* pActive = mpActivePostIt;
+ SwSidebarWin* pActive = mpActivePostIt;
mpActivePostIt = p;
if (pActive)
{
@@ -1785,7 +1783,7 @@ IMPL_LINK( SwPostItMgr, CalcHdl, void*, /* pVoid*/ )
void SwPostItMgr::Rescale()
{
- for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+ for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
if ( (*i)->pPostIt )
(*i)->pPostIt->Rescale();
}
@@ -1793,7 +1791,7 @@ void SwPostItMgr::Rescale()
sal_Int32 SwPostItMgr::GetInitialAnchorDistance() const
{
const Fraction& f( mpEditWin->GetMapMode().GetScaleY() );
- return POSTIT_INITIAL_ANCHOR_DISTANCE * f.GetNumerator() / f.GetDenominator();
+ return POSTIT_INITIAL_ANCHOR_DISTANCE * f.GetNumerator() / f.GetDenominator();
}
sal_Int32 SwPostItMgr::GetSpaceBetween() const
@@ -1822,14 +1820,14 @@ sal_Int32 SwPostItMgr::GetSidebarScrollerHeight() const
void SwPostItMgr::SetSpellChecking()
{
- for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+ for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
if ( (*i)->pPostIt )
(*i)->pPostIt->SetSpellChecking();
}
void SwPostItMgr::SetReadOnlyState()
{
- for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
+ for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
if ( (*i)->pPostIt )
(*i)->pPostIt->SetReadonly( mbReadOnly );
}
diff --git a/main/sw/source/ui/docvw/SidebarWin.cxx b/main/sw/source/ui/docvw/SidebarWin.cxx
index 2b2cdd87e9..0801c2fb29 100644
--- a/main/sw/source/ui/docvw/SidebarWin.cxx
+++ b/main/sw/source/ui/docvw/SidebarWin.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#include "precompiled_sw.hxx"
#include <SidebarWin.hxx>
@@ -572,7 +570,7 @@ void SwSidebarWin::SetPosAndSize()
}
SwSidebarWin* pWin = GetTopReplyNote();
if ( pWin && pWin->Anchor() )
- {
+ {
pWin->Anchor()->SetAnchorState(AS_END);
}
}
@@ -834,7 +832,7 @@ void SwSidebarWin::SetColor(Color aColorDark,Color aColorLight, Color aColorAnch
AllSettings aSettings2 = mpVScrollbar->GetSettings();
StyleSettings aStyleSettings2 = aSettings2.GetStyleSettings();
aStyleSettings2.SetButtonTextColor(Color(0,0,0));
- aStyleSettings2.SetCheckedColor(mColorLight); //hintergund
+ aStyleSettings2.SetCheckedColor(mColorLight); // background
aStyleSettings2.SetShadowColor(mColorAnchor);
aStyleSettings2.SetFaceColor(mColorDark);
aSettings2.SetStyleSettings(aStyleSettings2);
@@ -978,11 +976,11 @@ void SwSidebarWin::ToggleInsMode()
{
if (!mrView.GetWrtShell().IsRedlineOn())
{
- //change outliner
+ // change outliner
mpOutlinerView->GetEditView().SetInsertMode(!mpOutlinerView->GetEditView().IsInsertMode());
- //change documnet
+ // change document
mrView.GetWrtShell().ToggleInsMode();
- //update statusbar
+ // update statusbar
SfxBindings &rBnd = mrView.GetViewFrame()->GetBindings();
rBnd.Invalidate(SID_ATTR_INSERT);
rBnd.Update(SID_ATTR_INSERT);
@@ -1214,8 +1212,8 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
SwSidebarWin* pWin = GetTopReplyNote();
// --> OD 2010-06-03 #i111964#
if ( pWin && pWin->Anchor() )
- // <--
- {
+ // <--
+ {
pWin->Anchor()->SetAnchorState(AS_END);
}
mpAnchor->setLineSolid(true);
@@ -1276,7 +1274,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
}
}
if ( mpShadow )
- {
+ {
mpShadow->SetShadowState(SS_NORMAL);
}
break;
@@ -1483,3 +1481,5 @@ bool SwRedComment::IsProtected()
return SwSidebarWin::IsProtected() || pRedline->Start()->nNode.GetNode().GetTxtNode()->IsInProtectSect();
}
*/
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/docvw/edtdd.cxx b/main/sw/source/ui/docvw/edtdd.cxx
index ed3f17275c..6767dcca3f 100644
--- a/main/sw/source/ui/docvw/edtdd.cxx
+++ b/main/sw/source/ui/docvw/edtdd.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,27 +7,23 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
-
#include <svx/svdview.hxx>
#include <editeng/outliner.hxx>
//#ifndef _SVDVMARK_HXX //autogen
@@ -117,7 +113,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
OBJCNT_NONE != rSh.GetObjCntType( aDocPos, pObj ))
{
rSh.LockPaint();
- if( rSh.SelectObj( aDocPos, 0, pObj ))
+ if( rSh.SelectObj( aDocPos, 0, pObj ))
bStart = bDelSelect = sal_True;
else
rSh.UnlockPaint();
@@ -157,8 +153,8 @@ void SwEditWin::StartExecuteDrag()
bIsInDrag = sal_True;
SwTransferable* pTransfer = new SwTransferable( rView.GetWrtShell() );
- uno::Reference<
- datatransfer::XTransferable > xRef( pTransfer );
+ uno::Reference<
+ datatransfer::XTransferable > xRef( pTransfer );
pTransfer->StartDrag( this, aMovePos );
}
@@ -173,7 +169,7 @@ void SwEditWin::DragFinished()
void SwEditWin::DropCleanup()
{
- SwWrtShell &rSh = rView.GetWrtShell();
+ SwWrtShell &rSh = rView.GetWrtShell();
// Stati zuruecksetzen
bNoInterrupt = sal_False;
@@ -245,12 +241,12 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
sal_uInt16 nEventAction;
sal_Int8 nUserOpt = rEvt.mbDefault ? EXCHG_IN_ACTION_DEFAULT
: rEvt.mnAction;
- m_nDropAction = SotExchange::GetExchangeAction(
+ m_nDropAction = SotExchange::GetExchangeAction(
GetDataFlavorExVector(),
- m_nDropDestination,
+ m_nDropDestination,
rEvt.mnAction,
//!! rEvt.GetSourceOptions(),
- nUserOpt, m_nDropFormat, nEventAction, 0,
+ nUserOpt, m_nDropFormat, nEventAction, 0,
&rEvt.maDropEvent.Transferable );
@@ -261,7 +257,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
//!! nRet = SFX_APP()->ExecuteDrop( rEvt );
nRet = DND_ACTION_NONE;
else if ( SW_MOD()->pDragDrop )
- //Bei internem D&D nicht mehr aufraeumen!
+ //Bei internem D&D nicht mehr aufräumen!
SW_MOD()->pDragDrop->SetCleanUp( sal_False );
return nRet;
@@ -270,15 +266,15 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj )
{
- SwWrtShell &rSh = rView.GetWrtShell();
- const Point aDocPt( PixelToLogic( rPixPnt ) );
- if( rSh.ChgCurrPam( aDocPt )
- || rSh.IsOverReadOnlyPos( aDocPt )
- || rSh.DocPtInsideInputFld( aDocPt ) )
- return 0;
+ SwWrtShell &rSh = rView.GetWrtShell();
+ const Point aDocPt( PixelToLogic( rPixPnt ) );
+ if( rSh.ChgCurrPam( aDocPt )
+ || rSh.IsOverReadOnlyPos( aDocPt )
+ || rSh.DocPtInsideInputFld( aDocPt ) )
+ return 0;
- SdrObject *pObj = NULL;
- const ObjCntType eType = rSh.GetObjCntType( aDocPt, pObj );
+ SdrObject *pObj = NULL;
+ const ObjCntType eType = rSh.GetObjCntType( aDocPt, pObj );
//Drop auf OutlinerView (TextEdit im Drawing) soll diese selbst entscheiden!
if( pObj )
@@ -396,22 +392,22 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
}
SdrObject *pObj = NULL;
- m_nDropDestination = GetDropDestination( aPixPt, &pObj );
- if( !m_nDropDestination )
+ m_nDropDestination = GetDropDestination( aPixPt, &pObj );
+ if( !m_nDropDestination )
return DND_ACTION_NONE;
sal_uInt16 nEventAction;
sal_Int8 nUserOpt = rEvt.mbDefault ? EXCHG_IN_ACTION_DEFAULT
: rEvt.mnAction;
- m_nDropAction = SotExchange::GetExchangeAction(
+ m_nDropAction = SotExchange::GetExchangeAction(
GetDataFlavorExVector(),
- m_nDropDestination,
+ m_nDropDestination,
rEvt.mnAction,
//!! rEvt.GetSourceOptions(),
- nUserOpt, m_nDropFormat, nEventAction );
+ nUserOpt, m_nDropFormat, nEventAction );
- if( EXCHG_INOUT_ACTION_NONE != m_nDropAction )
+ if( EXCHG_INOUT_ACTION_NONE != m_nDropAction )
{
const Point aDocPt( PixelToLogic( aPixPt ) );
@@ -438,7 +434,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
else if( rEvt.mbDefault )
{
// JP 13.08.98: internes Drag&Drop: bei gleichem Doc ein Move
- // ansonten ein Copy - Task 54974
+ // ansonsten ein Copy - Task 54974
nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
? DND_ACTION_MOVE
: DND_ACTION_COPY;
@@ -459,7 +455,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
if( (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == m_nDropFormat &&
EXCHG_IN_ACTION_LINK == m_nDropAction) ||
- SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == m_nDropFormat )
+ SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == m_nDropFormat )
{
SdrMarkView* pMView = PTR_CAST( SdrMarkView, rSh.GetDrawView() );
if( pMView && !pMView->IsDesignMode() )
@@ -521,5 +517,4 @@ IMPL_LINK( SwEditWin, DDHandler, Timer *, EMPTYARG )
return 0;
}
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 17467c459e..b58dd29795 100644
--- a/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/main/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
package complex.memCheck;
import com.sun.star.beans.PropertyValue;
@@ -55,12 +54,12 @@ import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
/**
- * Documents are opened and exported with StarOffice. The memory usage of
- * StarOffice is monitored and if the usage exceeds the allowed kilobytes,
- * the test is failed. Used for monitoring the StarOffice process is the
+ * Documents are opened and exported with OpenOffice. The memory usage of
+ * OpenOffice is monitored and if the usage exceeds the allowed kilobytes,
+ * the test is failed. Used for monitoring the OpenOffice process is the
* command line tool 'pmap', available on Solaris or Linux. This test will not
- * run on Windows.<br>Test procedure: every given document type is searched in
- * the source directory
+ * run on Windows.<br>Test procedure: every given document type is searched in
+ * the source directory
* Needed parameters:
* <ul>
* <li>"AllowMemoryIncrease" (optional) - the allowed memory increase measured in kByte per exported document. The default is 10 kByte.</li>
@@ -113,7 +112,7 @@ public class CheckMemoryUsage
private int iExportDocCount = 25;
/**
- * Collect all documnets to load and all filters used for export.
+ * Collect all documents to load and all filters used for export.
*/
@Before
public void before() throws Exception
@@ -166,7 +165,7 @@ public class CheckMemoryUsage
v.add(sCalcDoc);
v.add(sImpressDoc);
}
- // store a file extension
+ // store a file extension
sDocTypeExportFilter = new String[v.size()][2];
for (int i = 0; i < v.size(); i++)
{
@@ -229,7 +228,7 @@ public class CheckMemoryUsage
int nRunThrough = 0;
// At first:
- // we load the document, there will be some post work in office like late initialisations
+ // we load the document, there will be some post work in office like late initialization
// we store exact one time the document
// so the memory footprint should be right
@@ -292,9 +291,9 @@ public class CheckMemoryUsage
}
/**
- * Checks how much memory should consum
+ * Checks how much memory should consume
* @param storageBefore
- * @return 1 if consum is ok, else 0
+ * @return 1 if consume is ok, else 0
*/
private int checkMemory(int nConsumMore)
{
@@ -410,7 +409,7 @@ public class CheckMemoryUsage
{
// short wait for the office to 'calm down' and free some memory
shortWait(20000);
- // wait util memory is not freed anymore.
+ // wait until memory is not freed anymore.
int storageAfter = getOfficeMemoryUsage(createModeName("stop", 0));
int mem = 0;
int count = 0;
diff --git a/main/xmloff/source/chart/XMLChartStyleContext.cxx b/main/xmloff/source/chart/XMLChartStyleContext.cxx
index 5f3884744b..8f8d0bf89e 100644
--- a/main/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/main/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -113,7 +113,7 @@ void XMLChartStyleContext::FillPropertySet(
}
catch( beans::UnknownPropertyException& )
{
- DBG_ASSERT( false, "unknown property exception -> shape style not completly imported for chart style" );
+ DBG_ASSERT( false, "unknown property exception -> shape style not completely imported for chart style" );
}
lcl_NumberFormatStyleToProperty( msDataStyleName, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )), mrStyles, rPropSet );