This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new ef70b30ca8 Fixed typo (catched -> caught)
ef70b30ca8 is described below
commit ef70b30ca8f851dc6c7239b96a8067b6bfe12389
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Sep 25 17:28:45 2024 +0200
Fixed typo (catched -> caught)
(cherry picked from commit 2f91ea97af75301cf8512bc21584747f649f1e1c)
---
main/desktop/source/inc/exithelper.hxx | 20 +-
.../source/filter/xml/xmlCondPrtExpr.cxx | 31 ++-
main/sal/osl/os2/pipe.cxx | 116 ++++++------
main/sd/source/ui/unoidl/unocpres.cxx | 16 +-
main/sw/source/core/doc/docdesc.cxx | 114 +++++------
main/sw/source/core/doc/docedt.cxx | 208 ++++++++++-----------
.../star/beans/TolerantPropertySetResultType.idl | 53 +++---
main/unotools/inc/unotools/loghelper.hxx | 12 +-
8 files changed, 283 insertions(+), 287 deletions(-)
diff --git a/main/desktop/source/inc/exithelper.hxx
b/main/desktop/source/inc/exithelper.hxx
index b284282b31..30d7c74b0f 100644
--- a/main/desktop/source/inc/exithelper.hxx
+++ b/main/desktop/source/inc/exithelper.hxx
@@ -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,26 +7,24 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef _DESKTOP_EXITHELPER_HXX_
#define _DESKTOP_EXITHELPER_HXX_
namespace desktop
{
-
+
//=============================================================================
/** @short provide helper functions to handle a abnormal exit
and contain a list of all "well known" exit codes.
@@ -36,10 +34,10 @@ class ExitHelper
//-------------------------------------------------------------------------
// const
public:
-
+
//---------------------------------------------------------------------
/** @short list of all well known exit codes.
-
+
@descr Its not allowed to use exit codes hard coded
inside office. All places must use these list to
be synchron.
@@ -50,7 +48,7 @@ class ExitHelper
E_NO_ERROR = 0,
/// pipe was detected - second office must terminate itself
E_SECOND_OFFICE = 1,
- /// an uno exception was catched during startup
+ /// an uno exception was caught during startup
E_FATAL_ERROR = 333, // Only the low 8 bits are significant 333
% 256 = 77
/// user force automatic restart after crash
E_CRASH_WITH_RESTART = 79,
@@ -58,7 +56,7 @@ class ExitHelper
E_NORMAL_RESTART = 81
};
};
-
+
} // namespace desktop
#endif // #ifndef _DESKTOP_EXITHELPER_HXX_
diff --git a/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
b/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index dc84dda418..5fdb912dc1 100644
--- a/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/main/reportdesign/source/filter/xml/xmlCondPrtExpr.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,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.
- *
+ *
*************************************************************/
-
#include "precompiled_rptxml.hxx"
#include "xmlCondPrtExpr.hxx"
#include "xmlfilter.hxx"
@@ -50,13 +49,13 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
SvXMLImportContext( _rImport, nPrfx, rLName )
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLCondPrtExpr,NULL);
+ DBG_CTOR( rpt_OXMLCondPrtExpr,NULL);
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
- const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap();
+ const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = _rImport.GetFunctionElemTokenMap();
- const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
- try
+ const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() :
0;
+ try
{
for(sal_Int16 i = 0; i < nLength; ++i)
{
@@ -67,18 +66,18 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
- case XML_TOK_FUNCTION_FORMULA:
+ case XML_TOK_FUNCTION_FORMULA:
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(sValue)));
break;
default:
break;
- }
-
- }
- }
+ }
+
+ }
+ }
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched while putting Function props!");
+ OSL_ENSURE(0,"Exception caught while putting Function props!");
}
}
//
-----------------------------------------------------------------------------
@@ -86,7 +85,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
OXMLCondPrtExpr::~OXMLCondPrtExpr()
{
- DBG_DTOR( rpt_OXMLCondPrtExpr,NULL);
+ DBG_DTOR( rpt_OXMLCondPrtExpr,NULL);
}
//
-----------------------------------------------------------------------------
//
-----------------------------------------------------------------------------
diff --git a/main/sal/osl/os2/pipe.cxx b/main/sal/osl/os2/pipe.cxx
index 293defaf5d..76b9bf7f96 100644
--- a/main/sal/osl/os2/pipe.cxx
+++ b/main/sal/osl/os2/pipe.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.
- *
+ *
*************************************************************/
-
-
//#define INCL_DOSERRORS
#include "system.h"
@@ -46,7 +44,7 @@ typedef enum {
struct oslPipeImpl {
oslInterlockedCount m_Reference;
- HPIPE hPipe;
+ HPIPE hPipe;
HMTX m_NamedObject;
APIRET nLastError;
//oslSecurity m_Security;
@@ -100,37 +98,37 @@ void __osl_destroyPipeImpl(oslPipe pPipe)
/*****************************************************************************/
/* osl_createPipe */
/*****************************************************************************/
-oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions
Options,
+oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions
Options,
oslSecurity Security)
{
- oslPipe pPipe;
-
- ULONG ulAction;
- CHAR strPipeNameBuffer [CCHMAXPATHCOMP];
+ oslPipe pPipe;
+
+ ULONG ulAction;
+ CHAR strPipeNameBuffer [CCHMAXPATHCOMP];
rtl_String* strPipeName=0;
sal_Char* pszPipeName=0;
- /* check parameters */
- OSL_ASSERT( ustrPipeName );
- //YD 17/04/06 OSL_ASSERT( Security == 0 );
+ /* check parameters */
+ OSL_ASSERT( ustrPipeName );
+ //YD 17/04/06 OSL_ASSERT( Security == 0 );
- /* allocate impl-structure */
- pPipe = __osl_createPipeImpl();
- if (!pPipe)
- {
- OSL_TRACE( "osl_createPipe failed allocating memory.\n" );
- return NULL;
- }
+ /* allocate impl-structure */
+ pPipe = __osl_createPipeImpl();
+ if (!pPipe)
+ {
+ OSL_TRACE( "osl_createPipe failed allocating memory.\n" );
+ return NULL;
+ }
- /* create pipe name */
- OString sPipe = OUStringToOString(ustrPipeName, RTL_TEXTENCODING_ASCII_US);
+ /* create pipe name */
+ OString sPipe = OUStringToOString(ustrPipeName,
RTL_TEXTENCODING_ASCII_US);
#if OSL_DEBUG_LEVEL>0
- debug_printf("osl_createPipe options 0x%x\n", Options);
+ debug_printf("osl_createPipe options 0x%x\n", Options);
#endif
- switch( Options )
- {
- case osl_Pipe_OPEN:
+ switch( Options )
+ {
+ case osl_Pipe_OPEN:
{
APIRET fPipeAvailable;
@@ -156,15 +154,15 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString
*ustrPipeName, oslPipeOptions Option
ngLastError = NO_ERROR;
break;
}
- // Pipe instance maybe catched by
another client -> try again
+ // Pipe instance maybe caught by
another client -> try again
printf("osl_createPipe wait for Pipe
available\n");
} while ( fPipeAvailable );
}
- break;
- case osl_Pipe_CREATE:
+ break;
+ case osl_Pipe_CREATE:
{
sprintf (strPipeNameBuffer, "\\SEM32\\OSL_SEM_%s",
sPipe.getStr());
- // check if semaphore exists (pipe create must fail for
existig pipes)
+ // check if semaphore exists (pipe create must fail for
existing pipes)
ngLastError = DosCreateMutexSem(
(PCSZ)strPipeNameBuffer, &(pPipe->m_NamedObject), 0, TRUE );
if (ngLastError)
break;
@@ -213,7 +211,7 @@ oslPipe SAL_CALL osl_copyPipe(oslPipe pPipe)
//oslPipe* pPipe = (oslPipe*) Pipe;
oslPipe pNewPipe;
-
+
/* check parameter */
OSL_ASSERT (pPipe);
@@ -234,7 +232,7 @@ oslPipe SAL_CALL osl_copyPipe(oslPipe pPipe)
return NULL;
}
- pNewPipe->nLastError = NO_ERROR;
+ pNewPipe->nLastError = NO_ERROR;
return (oslPipe)pNewPipe;
}
@@ -246,15 +244,15 @@ void SAL_CALL osl_acquirePipe( oslPipe pPipe )
void SAL_CALL osl_releasePipe( oslPipe pPipe )
{
// OSL_ASSERT( pPipe );
-
+
if( 0 == pPipe )
return;
-
+
if( 0 == osl_decrementInterlockedCount( &(pPipe->m_Reference) ) )
{
if( ! pPipe->m_bClosed )
osl_closePipe( pPipe );
-
+
__osl_destroyPipeImpl( pPipe );
}
}
@@ -264,9 +262,9 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe )
/*************close****************************************************************/
void SAL_CALL osl_closePipe(oslPipe pPipe)
{
- //oslPipe* pPipe = (oslPipe*) Pipe;
- /* check parameter */
- OSL_ASSERT (pPipe);
+ //oslPipe* pPipe = (oslPipe*) Pipe;
+ /* check parameter */
+ OSL_ASSERT (pPipe);
if( pPipe && ! pPipe->m_bClosed )
{
@@ -276,7 +274,7 @@ void SAL_CALL osl_closePipe(oslPipe pPipe)
{
/* disconnect client */
DosDisConnectNPipe (pPipe->hPipe);
-
+
/* close the pipe */
DosClose (pPipe->hPipe);
}
@@ -288,9 +286,9 @@ void SAL_CALL osl_closePipe(oslPipe pPipe)
/*****************************************************************************/
oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
{
-
+
#define PINFO ((PIPEINFO *) &PipeInfoBuffer)
-
+
///oslPipe* pPipe = (oslPipe*) Pipe;
oslPipe pNewPipe;
BYTE PipeInfoBuffer[sizeof(PIPEINFO) + CCHMAXPATHCOMP];
@@ -303,7 +301,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
1,
(PVOID) &PipeInfoBuffer,
sizeof(PipeInfoBuffer));
-
+
if (pPipe->nLastError)
{
OSL_TRACE( "osl_acceptPipe failed for requesting pipe information.\n",
@@ -316,7 +314,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
PINFO->cbMaxInst > PINFO->cbCurInst)
{
HPIPE hPipe;
-
+
pNewPipe = __osl_createPipeImpl();
if (!pNewPipe)
@@ -327,7 +325,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
}
//pNewPipe->m_Security = pPipe->m_Security;
-
+
pNewPipe->nLastError =
DosCreateNPipe( (PCSZ)PINFO->szName,
&(pNewPipe->hPipe),
@@ -337,7 +335,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
ulBufSize, /* input buffer size */
0L /* use default time-out time
*/
);
-
+
if (pNewPipe->nLastError)
{
OSL_TRACE( "osl_acceptPipe failed creating new named pipe,
Error-Code: %d.\n",
@@ -345,21 +343,21 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
free(pNewPipe);
return NULL;
}
-
+
/* switch pipe handles */
hPipe = pPipe->hPipe;
pPipe->hPipe = pNewPipe->hPipe;
pNewPipe->hPipe = hPipe;
-
+
/* connect new handle to client */
pNewPipe->nLastError = DosConnectNPipe( pNewPipe->hPipe );
-
+
/* if failed, release allocated memory */
if (pNewPipe->nLastError)
{
OSL_TRACE( "osl_acceptPipe failed connecting pipe to client,
Error-Code: %d.\n",
pNewPipe->nLastError );
-
+
osl_closePipe((oslPipe)pNewPipe);
return NULL;
}
@@ -369,14 +367,14 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
{
/* connect original handle to client */
pPipe->nLastError = DosConnectNPipe( pPipe->hPipe );
-
+
if (pPipe->nLastError)
{
OSL_TRACE( "osl_acceptPipe failed connecting pipe to client,
Error-Code: %d.\n",
pPipe->nLastError );
return NULL;
}
-
+
return (oslPipe)pPipe;
}
}
@@ -390,7 +388,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
{
//oslPipe* pPipe = (oslPipe*) Pipe;
ULONG ulActual;
-
+
/* check parameter */
OSL_ASSERT (pPipe);
@@ -418,7 +416,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
{
//oslPipe* pPipe = (oslPipe*) Pipe;
ULONG ulActual;
-
+
/* check parameter */
OSL_ASSERT (pPipe);
@@ -453,7 +451,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
pPipe->nLastError = NO_ERROR;
} else
rc = ngLastError;
-
+
/* map OS/2 error values */
switch (rc)
{
@@ -529,7 +527,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void
*pBuffer , sal_Int32 n )
/**********************************************
osl_sendResourcePipe
*********************************************/
-
+
sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
{
sal_Bool bRet = sal_False;
@@ -540,7 +538,7 @@ sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket
pSocket)
/**********************************************
osl_receiveResourcePipe
*********************************************/
-
+
oslSocket osl_receiveResourcePipe(oslPipe pPipe)
{
oslSocket pSocket=0;
@@ -548,4 +546,4 @@ oslSocket osl_receiveResourcePipe(oslPipe pPipe)
return (oslSocket) pSocket;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/unoidl/unocpres.cxx
b/main/sd/source/ui/unoidl/unocpres.cxx
index 87ab484709..2e1ebb3627 100644
--- a/main/sd/source/ui/unoidl/unocpres.cxx
+++ b/main/sd/source/ui/unoidl/unocpres.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_sd.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
@@ -134,7 +132,7 @@ void SAL_CALL SdXCustomPresentation::removeByIndex(
sal_Int32 Index )
if(mpSdCustomShow)
{
- uno::Reference< drawing::XDrawPage > xPage;
+ uno::Reference< drawing::XDrawPage > xPage;
getByIndex( Index ) >>= xPage;
if( xPage.is() )
@@ -245,7 +243,7 @@ void SAL_CALL SdXCustomPresentation::dispose()
throw(uno::RuntimeException)
OGuard aGuard( Application::GetSolarMutex() );
if( bDisposing )
- return; // catched a recursion
+ return; // caught a recursion
bDisposing = sal_True;
@@ -489,3 +487,5 @@ SdCustomShow *
SdXCustomPresentationAccess::getSdCustomShow( const OUString& Nam
}
return NULL;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/doc/docdesc.cxx
b/main/sw/source/core/doc/docdesc.cxx
index d8b5c16b0f..215e2f8cd7 100644
--- a/main/sw/source/core/doc/docdesc.cxx
+++ b/main/sw/source/core/doc/docdesc.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,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.
- *
+ *
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
@@ -83,7 +83,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
// --> FME 2005-01-21 #i41075# Printer on demand
// This function does not require a printer anymore.
// The default page size is obtained from the application
- //locale
+ // locale
// <--
SwFmtFrmSize aFrmSize( ATT_FIX_SIZE );
@@ -107,7 +107,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
}
else if( MEASURE_METRIC ==
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() )
{
- nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; //2 centimeters
+ nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; // 2 centimeters
}
else
{
@@ -250,7 +250,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
::lcl_DescSetAttr( ((SwPageDesc&)rChged).GetMaster(),
((SwPageDesc&)rChged).GetLeft() );
- // take over NumType.
+ // take over NumType.
if( rChged.GetNumType().GetNumberingType() !=
pDesc->GetNumType().GetNumberingType() )
{
pDesc->SetNumType( rChged.GetNumType() );
@@ -288,11 +288,11 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
( rHead.IsActive() != rOldHead.IsActive() ||
rChged.IsHeaderShared() != pDesc->IsHeaderShared() );
}
- pDesc->GetMaster().SetFmtAttr( rHead );
+ pDesc->GetMaster().SetFmtAttr( rHead );
if ( rChged.IsHeaderShared() || !rHead.IsActive() )
{
// Left is sharing the Header with the Master
- pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
+ pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
}
else if ( rHead.IsActive() )
{ // Left get an own Header, when the Format hasn't one already.
@@ -341,9 +341,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
// align footer
const SwFmtFooter &rFoot = rChged.GetMaster().GetFooter();
- if (undoGuard.UndoWasEnabled())
- {
- // #i46909# no undo if header or footer changed
+ if (undoGuard.UndoWasEnabled())
+ {
+ // #i46909# no undo if header or footer changed
// are there changes in the Nodes?
const SwFmtFooter &rOldFoot = pDesc->GetMaster().GetFooter();
bHeaderFooterChanged |=
@@ -361,8 +361,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
const SwFmtFooter &rLeftFoot = pDesc->GetLeft().GetFooter();
if ( !rLeftFoot.IsActive() )
{
- SwFmtFooter aFoot( MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
- pDesc->GetLeft().SetFmtAttr( aFoot );
+ SwFmtFooter aFoot( MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
+ pDesc->GetLeft().SetFmtAttr( aFoot );
// take over further attributes (margins, borders ...)
::lcl_DescSetAttr( *rFoot.GetFooterFmt(),
*aFoot.GetFooterFmt(), sal_False);
}
@@ -425,7 +425,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
if ( (bUseOn || bFollow) && pTmpRoot)
// notify Layot!
- {
+ {
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));//swmod 080304
}
@@ -454,7 +454,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
GetIDocumentUndoRedo().DelAllUndoObj();
}
- SfxBindings* pBindings =
+ SfxBindings* pBindings =
( GetDocShell() && GetDocShell()->GetDispatcher() ) ?
GetDocShell()->GetDispatcher()->GetBindings() : 0;
if ( pBindings )
{
@@ -473,7 +473,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
|*
|* Description All descriptors have to be adapted whose Follow
|* refers to the one that has to be deleted.
-|*
+|*
|* Created MA 25. Jan. 93
|* Last change JP 04.09.95
|*
@@ -482,16 +482,16 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
&rChged )
// #i7983#
void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
{
- if (0 == pDel)
- return;
-
- // mba: test iteration as clients are removed while iteration
- SwPageDescHint aHint( aPageDescs[0] );
- pDel->CallSwClientNotify( aHint );
-
- bool bHasLayout = HasLayout();
- if ( pFtnInfo->DependsOn( pDel ) )
- {
+ if (0 == pDel)
+ return;
+
+ // mba: test iteration as clients are removed while iteration
+ SwPageDescHint aHint( aPageDescs[0] );
+ pDel->CallSwClientNotify( aHint );
+
+ bool bHasLayout = HasLayout();
+ if ( pFtnInfo->DependsOn( pDel ) )
+ {
pFtnInfo->ChgPageDesc( aPageDescs[0] );
if ( bHasLayout )
{
@@ -507,7 +507,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs),
true));
}
- }
+ }
for ( sal_uInt16 j = 0; j < aPageDescs.Count(); ++j )
{
@@ -527,19 +527,19 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
sal_uInt16 nOp)
{
- if (pDocShell)
- {
- SfxStyleSheetBasePool * pPool = pDocShell->GetStyleSheetPool();
+ if (pDocShell)
+ {
+ SfxStyleSheetBasePool * pPool = pDocShell->GetStyleSheetPool();
- if (pPool)
- {
+ if (pPool)
+ {
pPool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
SfxStyleSheetBase * pBase = pPool->Find(rName);
if (pBase != NULL)
pPool->Broadcast(SfxStyleSheetHint( nOp, *pBase ));
- }
- }
+ }
+ }
}
void SwDoc::DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast )
@@ -551,19 +551,19 @@ void SwDoc::DelPageDesc( sal_uInt16 i, sal_Bool
bBroadcast )
SwPageDesc *pDel = aPageDescs[i];
- // -> #116530#
- if (bBroadcast)
- BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PAGE,
+ // -> #116530#
+ if (bBroadcast)
+ BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PAGE,
SFX_STYLESHEET_ERASED);
- // <- #116530#
+ // <- #116530#
- if (GetIDocumentUndoRedo().DoesUndo())
- {
- SwUndo *const pUndo(new SwUndoPageDescDelete(*pDel, this));
- GetIDocumentUndoRedo().AppendUndo(pUndo);
- }
+ if (GetIDocumentUndoRedo().DoesUndo())
+ {
+ SwUndo *const pUndo(new SwUndoPageDescDelete(*pDel, this));
+ GetIDocumentUndoRedo().AppendUndo(pUndo);
+ }
- PreDelPageDesc(pDel); // #i7983#
+ PreDelPageDesc(pDel); // #i7983#
aPageDescs.Remove( i );
delete pDel;
@@ -600,8 +600,8 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const
SwPageDesc *pCpy,
{
pNew = new SwPageDesc( rName, GetDfltFrmFmt(), this );
// set default page format
- lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft() );
-
+ lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(),
pNew->GetLeft() );
+
SvxFrameDirection aFrameDirection = bRegardLanguage ?
GetDefaultFrameDirection(GetAppLanguage())
: FRMDIR_HORI_LEFT_TOP;
@@ -654,10 +654,10 @@ void SwDoc::PrtDataChanged()
{
//!!!!!!!! In case of changes please look after InJobSetup in Sw3io if
necessary
- // --> FME 2005-01-21 #i41075#
- ASSERT( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
+ // --> FME 2005-01-21 #i41075#
+ ASSERT( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
0 != getPrinter( sal_False ), "PrtDataChanged will be called
recursive!" )
- // <--
+ // <--
SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
SwWait *pWait = 0;
sal_Bool bEndAction = sal_False;
@@ -669,7 +669,7 @@ void SwDoc::PrtDataChanged()
if ( pTmpRoot )
{
ViewShell *pSh = GetCurrentViewShell();
- if( !pSh->GetViewOptions()->getBrowseMode() ||
+ if( !pSh->GetViewOptions()->getBrowseMode() ||
pSh->GetViewOptions()->IsPrtFormat() )
{
if ( GetDocShell() )
@@ -686,7 +686,7 @@ void SwDoc::PrtDataChanged()
}
pFntCache->Flush();
-
+
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt),
INV_SIZE));//swmod 080304
@@ -702,8 +702,8 @@ void SwDoc::PrtDataChanged()
}
} //swmod 080218
- if ( bDraw && pDrawModel )
- {
+ if ( bDraw && pDrawModel )
+ {
const sal_Bool bTmpAddExtLeading =
get(IDocumentSettingAccess::ADD_EXT_LEADING);
if ( bTmpAddExtLeading != pDrawModel->IsAddExtLeading() )
pDrawModel->SetAddExtLeading( bTmpAddExtLeading );
@@ -711,7 +711,7 @@ void SwDoc::PrtDataChanged()
OutputDevice* pOutDev = getReferenceDevice( false );
if ( pOutDev != pDrawModel->GetRefDevice() )
pDrawModel->SetRefDevice( pOutDev );
- }
+ }
PrtOLENotify( sal_True );
@@ -747,7 +747,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
// This doesn't make sense without Shell and therefore without
Client because
// communication relating to change in size is implemented only
in this way.
// As there is no Shell, note this unfavorable status in the
Document, this
- // will be catched up when creating the first Shell.
+ // will be caught up when creating the first Shell.
mbOLEPrtNotifyPending = sal_True;
if ( bAll )
mbAllOLENotify = sal_True;
@@ -980,3 +980,5 @@ sal_Bool SwDoc::IsSquaredPageMode() const
(const
SwTextGridItem&)GetDefault( RES_TEXTGRID );
return rGrid.IsSquaredMode();
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/doc/docedt.cxx
b/main/sw/source/core/doc/docedt.cxx
index d5f76ec6cd..ee63a4b3e3 100644
--- a/main/sw/source/core/doc/docedt.cxx
+++ b/main/sw/source/core/doc/docedt.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"
@@ -41,7 +39,7 @@
#include <txtftn.hxx>
#include <acorrect.hxx> // Autokorrektur
#include <IMark.hxx> // fuer SwBookmark
-#include <cntfrm.hxx> // fuers Spell
+#include <cntfrm.hxx> // fuers Spell
#include <crsrsh.hxx>
#include <doc.hxx>
#include <UndoManager.hxx>
@@ -55,7 +53,7 @@
#include <ndtxt.hxx>
#include <pam.hxx>
#include <redline.hxx>
-#include <rootfrm.hxx> // fuers UpdateFtn
+#include <rootfrm.hxx> // fuers UpdateFtn
#include <splargs.hxx> // fuer Spell
#include <swtable.hxx>
#include <swundo.hxx> // fuer die UndoIds
@@ -124,14 +122,14 @@ struct _SaveRedline
sal_uInt32 nSttIdx = rPos.nNode.GetIndex();
nStt = pStt->nNode.GetIndex() - nSttIdx;
nSttCnt = pStt->nContent.GetIndex();
- if( nStt == 0 )
- nSttCnt = nSttCnt - rPos.nContent.GetIndex();
+ if( nStt == 0 )
+ nSttCnt = nSttCnt - rPos.nContent.GetIndex();
if( pR->HasMark() )
{
nEnd = pEnd->nNode.GetIndex() - nSttIdx;
nEndCnt = pEnd->nContent.GetIndex();
- if( nEnd == 0 )
- nEndCnt = nEndCnt - rPos.nContent.GetIndex();
+ if( nEnd == 0 )
+ nEndCnt = nEndCnt - rPos.nContent.GetIndex();
}
pRedl->GetPoint()->nNode = 0;
@@ -154,11 +152,11 @@ struct _SaveRedline
void SetPos( const SwPosition& aPos )
{
pRedl->GetPoint()->nNode = aPos.nNode.GetIndex() + nStt;
- pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt + (
nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
+ pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(),
nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
if( pRedl->HasMark() )
{
pRedl->GetMark()->nNode = aPos.nNode.GetIndex() + nEnd;
- pRedl->GetMark()->nContent.Assign(
pRedl->GetCntntNode(sal_False), nEndCnt + ( nEnd == 0 ?
aPos.nContent.GetIndex() : 0 ) );
+ pRedl->GetMark()->nContent.Assign(
pRedl->GetCntntNode(sal_False), nEndCnt + ( nEnd == 0 ?
aPos.nContent.GetIndex() : 0 ) );
}
}
};
@@ -170,8 +168,8 @@ SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* )
bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
{
- sal_Unicode cChr = pNode->GetTxt().GetChar( nPos );
- return !( ( CH_TXTATR_BREAKWORD == cChr || CH_TXTATR_INWORD == cChr ) &&
+ sal_Unicode cChr = pNode->GetTxt().GetChar( nPos );
+ return !( ( CH_TXTATR_BREAKWORD == cChr || CH_TXTATR_INWORD == cChr ) &&
(0 != pNode->GetTxtAttrForCharAt( nPos ) ) );
}
@@ -216,7 +214,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const
SwNodeIndex& rSttIdx,
aAnchor.SetAnchor( &aPos );
pFmt->GetDoc()->GetSpzFrmFmts()->Insert(
pFmt, pFmt->GetDoc()->GetSpzFrmFmts()->Count()
);
- pFmt->SetFmtAttr( aAnchor );
+ pFmt->SetFmtAttr( aAnchor );
SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
if( pCNd && pCNd->getLayoutFrm(
pFmt->GetDoc()->GetCurrentLayout(), 0, 0, sal_False ) )
pFmt->MakeFrms();
@@ -228,12 +226,12 @@ void _SaveFlyInRange( const SwNodeRange& rRg,
_SaveFlyArr& rArr )
SwSpzFrmFmts& rFmts = *rRg.aStart.GetNode().GetDoc()->GetSpzFrmFmts();
for( sal_uInt16 n = 0; n < rFmts.Count(); ++n )
{
- SwFrmFmt *const pFmt = static_cast<SwFrmFmt*>(rFmts[n]);
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
- if (pAPos &&
- ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
- (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
+ SwFrmFmt *const pFmt = static_cast<SwFrmFmt*>(rFmts[n]);
+ SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ if (pAPos &&
+ ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
+ (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
{
_SaveFly aSave( pAPos->nNode.GetIndex() -
rRg.aStart.GetIndex(),
@@ -270,10 +268,10 @@ void _SaveFlyInRange( const SwPaM& rPam, const
SwNodeIndex& rInsPos,
sal_Bool bInsPos = sal_False;
pFmt = (SwFrmFmt*)rFmts[n];
pAnchor = &pFmt->GetAnchor();
- const SwPosition* pAPos = pAnchor->GetCntntAnchor();
- if (pAPos &&
- ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
- (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
+ const SwPosition* pAPos = pAnchor->GetCntntAnchor();
+ if (pAPos &&
+ ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
+ (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
// nicht verschieben, wenn die InsPos im CntntBereich
vom Fly ist
( 0 == ( pCntntIdx = pFmt->GetCntnt().GetCntntIdx() ) ||
!( *pCntntIdx < rInsPos &&
@@ -324,8 +322,8 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
{
SwFrmFmt *pFmt = rTbl[--i];
const SwFmtAnchor &rAnch = pFmt->GetAnchor();
- SwPosition const*const pAPos = rAnch.GetCntntAnchor();
- if (pAPos &&
+ SwPosition const*const pAPos = rAnch.GetCntntAnchor();
+ if (pAPos &&
((rAnch.GetAnchorId() == FLY_AT_PARA) ||
(rAnch.GetAnchorId() == FLY_AT_CHAR)) &&
( bDelFwrd
@@ -338,7 +336,7 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
SwFmtAnchor aAnch( pFmt->GetAnchor() );
SwPosition aPos( rMkNdIdx );
aAnch.SetAnchor( &aPos );
- pFmt->SetFmtAttr( aAnch );
+ pFmt->SetFmtAttr( aAnch );
}
else
{
@@ -359,12 +357,12 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
pDoc->DelLayoutFmt( pFmt );
- // --> FME 2004-10-06 #117913# DelLayoutFmt can also
- // trigger the deletion of objects.
- if( i > rTbl.Count() )
+ // --> FME 2004-10-06 #117913# DelLayoutFmt can
also
+ // trigger the deletion of objects.
+ if( i > rTbl.Count() )
i = rTbl.Count();
- // <--
- }
+ // <--
+ }
}
}
}
@@ -452,11 +450,11 @@ bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const
SwNodeIndex& rEndNd,
}
}
}
- // When moving from redline section into document content section, e.g.
- // after loading a document with (delete-)redlines, the footnote array
- // has to be adjusted... (#i70572)
- if( bSaveFtn )
- {
+ // When moving from redline section into document content section, e.g.
+ // after loading a document with (delete-)redlines, the footnote array
+ // has to be adjusted... (#i70572)
+ if( bSaveFtn )
+ {
SwNodeIndex aIdx( rSttNd );
while( aIdx < rEndNd ) // Check the moved section
{
@@ -489,24 +487,24 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines&
rArr )
{
SwDoc* pDoc = aPam.GetNode()->GetDoc();
- const SwPosition* pStart = aPam.Start();
- const SwPosition* pEnd = aPam.End();
+ const SwPosition* pStart = aPam.Start();
+ const SwPosition* pEnd = aPam.End();
- // get first relevant redline
+ // get first relevant redline
sal_uInt16 nCurrentRedline;
- pDoc->GetRedline( *pStart, &nCurrentRedline );
- if( nCurrentRedline > 0)
- nCurrentRedline--;
+ pDoc->GetRedline( *pStart, &nCurrentRedline );
+ if( nCurrentRedline > 0)
+ nCurrentRedline--;
- // redline mode REDLINE_IGNORE|REDLINE_ON; save old mode
+ // redline mode REDLINE_IGNORE|REDLINE_ON; save old mode
RedlineMode_t eOld = pDoc->GetRedlineMode();
pDoc->SetRedlineMode_intern( (RedlineMode_t)(( eOld &
~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
- // iterate over relevant redlines and decide for each whether it should
- // be saved, or split + saved
+ // iterate over relevant redlines and decide for each whether it should
+ // be saved, or split + saved
SwRedlineTbl& rRedlineTable = const_cast<SwRedlineTbl&>(
pDoc->GetRedlineTbl() );
- for( ; nCurrentRedline < rRedlineTable.Count(); nCurrentRedline++ )
- {
+ for( ; nCurrentRedline < rRedlineTable.Count(); nCurrentRedline++ )
+ {
SwRedline* pCurrent = rRedlineTable[ nCurrentRedline ];
SwComparePosition eCompare =
ComparePosition( *pCurrent->Start(), *pCurrent->End(),
@@ -514,8 +512,8 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines&
rArr )
// we must save this redline if it overlaps aPam
// (we may have to split it, too)
- if( eCompare == POS_OVERLAP_BEHIND ||
- eCompare == POS_OVERLAP_BEFORE ||
+ if( eCompare == POS_OVERLAP_BEHIND ||
+ eCompare == POS_OVERLAP_BEFORE ||
eCompare == POS_OUTSIDE ||
eCompare == POS_INSIDE ||
eCompare == POS_EQUAL )
@@ -523,7 +521,7 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines&
rArr )
rRedlineTable.Remove( nCurrentRedline-- );
// split beginning, if necessary
- if( eCompare == POS_OVERLAP_BEFORE ||
+ if( eCompare == POS_OVERLAP_BEFORE ||
eCompare == POS_OUTSIDE )
{
@@ -534,7 +532,7 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines&
rArr )
}
// split end, if necessary
- if( eCompare == POS_OVERLAP_BEHIND ||
+ if( eCompare == POS_OVERLAP_BEHIND ||
eCompare == POS_OUTSIDE )
{
SwRedline* pNewRedline = new SwRedline( *pCurrent );
@@ -549,8 +547,8 @@ void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines&
rArr )
}
}
- // restore old redline mode
- pDoc->SetRedlineMode_intern( eOld );
+ // restore old redline mode
+ pDoc->SetRedlineMode_intern( eOld );
}
void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition& rPos, _SaveRedlines&
rArr )
@@ -756,8 +754,8 @@ void SwDoc::DeleteSection( SwNode *pNode )
void SwDoc::SetModified(SwPaM &rPaM)
{
- SwDataChanged aTmp( rPaM, 0 );
- SetModified();
+ SwDataChanged aTmp( rPaM, 0 );
+ SetModified();
}
/*************************************************************************
@@ -829,11 +827,11 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String
&rStr )
// hinter das Zeichen (zum Aufspannen der Attribute !!)
if( nStart < pNode->GetTxt().Len() )
rIdx++;
- pNode->InsertText( c, rIdx, INS_EMPTYEXPAND );
+ pNode->InsertText( c, rIdx, INS_EMPTYEXPAND );
if( nStart+1 < rIdx.GetIndex() )
{
rIdx = nStart;
- pNode->EraseText( rIdx, 1 );
+ pNode->EraseText( rIdx, 1 );
rIdx++;
}
}
@@ -844,12 +842,12 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String
&rStr )
?
pNode->GetpSwpHints()->Count() : 0;
if( nOldAttrCnt != nNewAttrCnt )
{
- SwUpdateAttr aHint(
- 0,
- 0,
- 0);
+ SwUpdateAttr aHint(
+ 0,
+ 0,
+ 0);
- pNode->ModifyBroadcast( 0, &aHint, TYPE( SwCrsrShell ) );
+ pNode->ModifyBroadcast( 0, &aHint, TYPE( SwCrsrShell ) );
}
if (!GetIDocumentUndoRedo().DoesUndo() &&
@@ -1526,7 +1524,7 @@ bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
// N.B.: deletion must be split into several parts if the text node
// contains a text attribute with end and with dummy character
// and the selection does not contain the text attribute completely,
- // but overlaps its start (left), where the dummy character is.
+ // but overlaps its start (left), where the dummy character is.
SwPosition const & rSelectionEnd( *rPam.End() );
@@ -2264,7 +2262,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const String& rStr,
// N.B.: deletion must be split into several parts if the text node
// contains a text attribute with end and with dummy character
// and the selection does not contain the text attribute completely,
- // but overlaps its start (left), where the dummy character is.
+ // but overlaps its start (left), where the dummy character is.
bool bRet( true );
// iterate from end to start, to avoid invalidating the offsets!
@@ -2558,15 +2556,15 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
rEnd.nNode.GetIndex() + 1 == GetNodes().Count() )
{
return sal_False;
- }
+ }
// harte SeitenUmbrueche am nachfolgenden Node verschieben
sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False;
- /* #i9185# This whould lead to a segmentation fault if not catched
+ /* #i9185# This would lead to a segmentation fault if not caught
above. */
sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
- SwTableNode *const pTblNd = GetNodes()[ nNextNd ]->GetTableNode();
+ SwTableNode *const pTblNd = GetNodes()[ nNextNd ]->GetTableNode();
if( pTblNd && pNd->IsCntntNode() )
{
@@ -2595,7 +2593,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
}
}
- bool const bDoesUndo = GetIDocumentUndoRedo().DoesUndo();
+ bool const bDoesUndo = GetIDocumentUndoRedo().DoesUndo();
if( bDoesUndo )
{
if( !rPam.HasMark() )
@@ -2604,13 +2602,13 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
rPam.Exchange();
rPam.GetPoint()->nNode++;
- SwCntntNode *pTmpNode =
rPam.GetPoint()->nNode.GetNode().GetCntntNode();
- rPam.GetPoint()->nContent.Assign( pTmpNode, 0 );
- bool bGoNext = (0 == pTmpNode);
- pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode();
+ SwCntntNode *pTmpNode =
rPam.GetPoint()->nNode.GetNode().GetCntntNode();
+ rPam.GetPoint()->nContent.Assign( pTmpNode, 0 );
+ bool bGoNext = (0 == pTmpNode);
+ pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode();
rPam.GetMark()->nContent.Assign( pTmpNode, 0 );
- GetIDocumentUndoRedo().ClearRedo();
+ GetIDocumentUndoRedo().ClearRedo();
SwPaM aDelPam( *rPam.GetMark(), *rPam.GetPoint() );
{
@@ -2627,10 +2625,10 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
*rPam.GetPoint() = *aDelPam.GetPoint();
pUndo->SetPgBrkFlags( bSavePageBreak, bSavePageDesc );
- GetIDocumentUndoRedo().AppendUndo(pUndo);
- }
- else
- {
+ GetIDocumentUndoRedo().AppendUndo(pUndo);
+ }
+ else
+ {
SwNodeRange aRg( rStt.nNode, rEnd.nNode );
if( rPam.GetPoint() != &rEnd )
rPam.Exchange();
@@ -2675,9 +2673,9 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
}
}
- SwCntntNode *pTmpNode = rPam.GetBound( sal_True
).nNode.GetNode().GetCntntNode();
+ SwCntntNode *pTmpNode = rPam.GetBound( sal_True
).nNode.GetNode().GetCntntNode();
rPam.GetBound( sal_True ).nContent.Assign( pTmpNode, 0 );
- pTmpNode = rPam.GetBound( sal_False ).nNode.GetNode().GetCntntNode();
+ pTmpNode = rPam.GetBound( sal_False
).nNode.GetNode().GetCntntNode();
rPam.GetBound( sal_False ).nContent.Assign( pTmpNode, 0 );
GetNodes().Delete( aRg.aStart, nNodeDiff+1 );
}
@@ -2688,7 +2686,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
}
-void SwDoc::TransliterateText(
+void SwDoc::TransliterateText(
const SwPaM& rPaM,
utl::TransliterationWrapper& rTrans )
{
@@ -2698,13 +2696,13 @@ void SwDoc::TransliterateText(
const SwPosition* pStt = rPaM.Start(),
* pEnd = rPaM.End();
- sal_uLong nSttNd = pStt->nNode.GetIndex(),
+ sal_uLong nSttNd = pStt->nNode.GetIndex(),
nEndNd = pEnd->nNode.GetIndex();
xub_StrLen nSttCnt = pStt->nContent.GetIndex(),
nEndCnt = pEnd->nContent.GetIndex();
SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
- if( pStt == pEnd && pTNd ) // no selection?
+ if( pStt == pEnd && pTNd ) // no selection?
{
// set current word as 'area of effect'
@@ -2723,10 +2721,10 @@ void SwDoc::TransliterateText(
}
}
- if( nSttNd != nEndNd ) // is more than one text node involved?
+ if( nSttNd != nEndNd ) // is more than one text node involved?
{
- // iterate over all effected text nodes, the first and the last one
- // may be incomplete because the selection starts and/or ends there
+ // iterate over all effected text nodes, the first and the last
one
+ // may be incomplete because the selection starts and/or ends
there
SwNodeIndex aIdx( pStt->nNode );
if( nSttCnt )
@@ -2737,10 +2735,10 @@ void SwDoc::TransliterateText(
}
for( ; aIdx.GetIndex() < nEndNd; aIdx++ )
- {
+ {
if( 0 != ( pTNd = aIdx.GetNode().GetTxtNode() ))
pTNd->TransliterateText( rTrans, 0,
pTNd->GetTxt().Len(), pUndo );
- }
+ }
if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode()
))
pTNd->TransliterateText( rTrans, 0, nEndCnt, pUndo );
@@ -2751,13 +2749,13 @@ void SwDoc::TransliterateText(
if( pUndo )
{
if( pUndo->HasData() )
- {
- GetIDocumentUndoRedo().AppendUndo(pUndo);
- }
- else
+ {
+ GetIDocumentUndoRedo().AppendUndo(pUndo);
+ }
+ else
delete pUndo;
}
- SetModified();
+ SetModified();
}
@@ -2791,21 +2789,21 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat&
rStat ) const
const SwPosition* pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark()
: rPaM.GetPoint();
- const sal_uLong nSttNd = pStt->nNode.GetIndex();
- const sal_uLong nEndNd = pEnd->nNode.GetIndex();
+ const sal_uLong nSttNd = pStt->nNode.GetIndex();
+ const sal_uLong nEndNd = pEnd->nNode.GetIndex();
- const xub_StrLen nSttCnt = pStt->nContent.GetIndex();
- const xub_StrLen nEndCnt = pEnd->nContent.GetIndex();
+ const xub_StrLen nSttCnt = pStt->nContent.GetIndex();
+ const xub_StrLen nEndCnt = pEnd->nContent.GetIndex();
const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
- if( pStt == pEnd && pTNd ) // no region ?
+ if( pStt == pEnd && pTNd ) // no region ?
{
// do nothing
return;
}
- if( nSttNd != nEndNd )
- {
+ if( nSttNd != nEndNd )
+ {
SwNodeIndex aIdx( pStt->nNode );
if( nSttCnt )
{
@@ -2846,5 +2844,7 @@ void SwDoc::RemoveLeadingWhiteSpace(const SwPosition &
rPos )
aPam.GetMark()->nContent = nIdx;
DeleteRange( aPam );
}
- }
+ }
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
b/main/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
index 18024e5fe2..b6282a046c 100644
--- a/main/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
+++ b/main/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
@@ -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,26 @@
* 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.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
+#define __com_sun_star_beans_TolerantPropertySetResultType_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module beans {
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
-#define __com_sun_star_beans_TolerantPropertySetResultType_idl__
-
-
-//=============================================================================
-
-module com { module sun { module star { module beans {
-
//=============================================================================
/** specifies the possible failure types when using the
@@ -35,10 +34,10 @@ module com { module sun { module star { module beans {
interface.
<p>It usually matches one of the exception types that may occur when
- using the
+ using the
<type scope="com::sun::star::beans">XPropertySet</type> or
<type scope="com::sun::star::beans">XMultiPropertySet</type>
interfaces.</p>
-*/
+*/
constants TolerantPropertySetResultType
{
/** the property has been successfully set or retrieved.
@@ -46,26 +45,26 @@ constants TolerantPropertySetResultType
const short SUCCESS = 0;
/** the property is not available.
-
- <p>For example if a
- <type scope="com::sun::star::beans" >UnknownPropertyException</type>
- was catched.</p>
+
+ <p>For example if a
+ <type scope="com::sun::star::beans" >UnknownPropertyException</type>
+ was caught.</p>
*/
const short UNKNOWN_PROPERTY = 1;
/** the value used with the property is not valid.
- <p>For example if a
- <type scope="com::sun::star::lang" >IllegalArgumentException</type>
- was catched.</p>
+ <p>For example if a
+ <type scope="com::sun::star::lang" >IllegalArgumentException</type>
+ was caught.</p>
*/
const short ILLEGAL_ARGUMENT = 2;
/** the property could not be changed at that time.
- <p>For example if a
- <type scope="com::sun::star::beans" >PropertyVetoException</type>
- was catched.</p>
+ <p>For example if a
+ <type scope="com::sun::star::beans" >PropertyVetoException</type>
+ was caught.</p>
*/
const short PROPERTY_VETO = 3;
@@ -80,7 +79,7 @@ constants TolerantPropertySetResultType
};
//=============================================================================
-
-}; }; }; };
-
+
+}; }; }; };
+
#endif
diff --git a/main/unotools/inc/unotools/loghelper.hxx
b/main/unotools/inc/unotools/loghelper.hxx
index f6f02c1d10..aef327d941 100644
--- a/main/unotools/inc/unotools/loghelper.hxx
+++ b/main/unotools/inc/unotools/loghelper.hxx
@@ -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.
- *
+ *
*************************************************************/
-
#ifndef _SVT_LOGHELPER_HXX
#define _SVT_LOGHELPER_HXX
@@ -37,7 +36,7 @@ public:
inline void logIt(const css::uno::Exception& ex)
{
::rtl::OUStringBuffer sMsg(256);
- sMsg.appendAscii("Unexpected exception catched. Original message
was:\n\"" );
+ sMsg.appendAscii("Unexpected exception caught. Original message
was:\n\"" );
sMsg.append(ex.Message);
sMsg.appendAscii("\"");
OSL_ENSURE(sal_False,
::rtl::OUStringToOString(sMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8).getStr());
@@ -45,3 +44,4 @@ inline void logIt(const css::uno::Exception& ex)
#endif
+/* vim: set noet sw=4 ts=4: */
