[Libreoffice-commits] .: sw/inc sw/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue May 24 05:55:33 PDT 2011
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/source/core/doc/docbm.cxx | 13 ++++++-------
sw/source/core/fields/docufld.cxx | 5 ++---
sw/source/core/layout/wsfrm.cxx | 7 +++----
sw/source/ui/envelp/envfmt.cxx | 10 ++++------
5 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit 23613448a2f6361175edbb82a2683d956b179b98
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue May 24 05:55:24 2011 -0700
Remove some extra #incude <tools/pstm.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index a976f6d..d577822 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -853,7 +853,6 @@
#include "tools/mempool.hxx"
#include "tools/multisel.hxx"
#include "tools/poly.hxx"
-#include "tools/pstm.hxx"
#include "tools/rc.hxx"
#include "tools/ref.hxx"
#include "tools/resary.hxx"
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7c03f51..502d830 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,6 @@
#include <sfx2/linkmgr.hxx>
#include <swserv.hxx>
#include <swundo.hxx>
-#include <tools/pstm.hxx>
#include <unocrsr.hxx>
#include <viscrs.hxx>
#include <stdio.h>
@@ -423,19 +422,19 @@ namespace sw { namespace mark
const rtl::OUString& rName,
const rtl::OUString& rType )
{
- sw::mark::IMark* pMark = makeMark( rPaM, rName,
+ sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::TEXT_FIELDMARK );
sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
pFieldMark->SetFieldname( rType );
return pFieldMark;
}
-
- ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+
+ ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType)
{
- sw::mark::IMark* pMark = makeMark( rPaM, rName,
+ sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::CHECKBOX_FIELDMARK );
sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
pFieldMark->SetFieldname( rType );
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index ea83304..bc0dbe7 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#include <textapi.hxx>
-#include <tools/pstm.hxx>
#include <hintids.hxx>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
@@ -1113,7 +1112,7 @@ String SwDocInfoField::Expand() const
util::Date aDate;
util::DateTime aDateTime;
util::Duration aDuration;
- if( aAny >>= aDate)
+ if( aAny >>= aDate)
{
SvNumberFormatter* pFormatter = pDocShell->GetDoc()->GetNumberFormatter();
Date* pNullDate = pFormatter->GetNullDate();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 424f82c..346dea4 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -31,7 +31,6 @@
#include <hintids.hxx>
#include <hints.hxx>
-#include <tools/pstm.hxx>
#include <vcl/outdev.hxx>
#include <svl/itemiter.hxx>
#include <editeng/brshitem.hxx>
@@ -122,8 +121,8 @@ const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess()
}
bool SwFrm::KnowsFormat( const SwFmt& rFmt ) const
-{
- return GetRegisteredIn() == &rFmt;
+{
+ return GetRegisteredIn() == &rFmt;
}
void SwFrm::RegisterToFormat( SwFmt& rFmt )
@@ -3127,7 +3126,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
const sal_uInt16 nLower = pAttrs->CalcBottom();
sal_Bool bVert = IsVertical() && !IsPageFrm();
//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
- SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
+ SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
if ( !bValidPrtArea )
{
bValidPrtArea = sal_True;
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index e4ab485..b6b44a1 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,6 @@
#include <hintids.hxx>
-#include <tools/pstm.hxx>
-
#include <editeng/paperinf.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
@@ -307,7 +305,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
SfxAllItemSet aTmpSet(*pCollSet);
// The CHRATR_BACKGROUND attribute gets transformed into a
- // RES_BACKGROUND for the dialog and back again ...
+ // RES_BACKGROUND for the dialog and back again ...
const SfxPoolItem *pTmpBrush;
if( SFX_ITEM_SET == aTmpSet.GetItemState( RES_CHRATR_BACKGROUND,
@@ -368,14 +366,14 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
aTmpSet.Put( aOff );
- // set BoxInfo
+ // set BoxInfo
::PrepareBoxInfo( aTmpSet, *pSh );
SwParaDlg *pDlg = new SwParaDlg(GetParent(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName());
if ( pDlg->Execute() == RET_OK )
{
- // maybe relocate defaults
+ // maybe relocate defaults
const SfxPoolItem* pItem = 0;
SfxItemSet* pOutputSet = (SfxItemSet*)pDlg->GetOutputItemSet();
sal_uInt16 nNewDist;
More information about the Libreoffice-commits
mailing list