summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 16:56:44 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 16:56:44 +0100
commit0c8fee704a47933619e8f97f9c5b4d013576bb12 (patch)
tree2c5d1de00f3a35d5cba0b35adc6c0fe6f818e987 /sw
parent1a359bd2a8d7621574942287703e7df69ebffa16 (diff)
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/flowfrm.cxx8
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx2
-rwxr-xr-xsw/source/core/view/viewpg.cxx6
4 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d585a27d2388..08a5a3f9a984 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -510,10 +510,10 @@ BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
pParent->pLower = pStart;
else
//Modified for #i100782#,04/03/2009
- //If the pParent has more than 1 child nodes, former design will
- //ignore them directly without any collection work. It will make some
- //dangling pointers. This lead the crash...
- //The new design will find the last child of pParent in loop way, and
+ //If the pParent has more than 1 child nodes, former design will
+ //ignore them directly without any collection work. It will make some
+ //dangling pointers. This lead the crash...
+ //The new design will find the last child of pParent in loop way, and
//add the pStart after the last child.
// pParent->Lower()->pNext = pStart;
{
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 5f1f37da73cd..245ec916fd4a 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -184,7 +184,7 @@ BOOL SwFmtAutoFmt::QueryValue( uno::Any& rVal, BYTE ) const
BOOL SwFmtAutoFmt::PutValue( const uno::Any& , BYTE )
{
- //the format is not renameable via API
+ //the format is not renameable via API
return FALSE;
}
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index d8f2b023de63..00c987f419de 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -529,7 +529,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
}
eNewState =
aCharStyles.getLength() ?
- PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;;
+ PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;;
if(pAny)
(*pAny) <<= aCharStyles;
}
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 03cdf3d53959..fcb702a7112a 100755
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -94,11 +94,11 @@ void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions
// print brochure
// OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling
// for a page to be printed.
-void ViewShell::PrintProspect(
- OutputDevice *pOutDev,
+void ViewShell::PrintProspect(
+ OutputDevice *pOutDev,
const SwPrintData &rPrintData,
sal_Int32 nRenderer // the index in the vector of prospect pages to be printed
- )
+ )
{
const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagePairsForProspectPrinting().size() - 1;
#if OSL_DEBUG_LEVEL > 1