[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source vcl/source
Stephan Bergmann
sbergman at redhat.com
Wed Oct 2 08:19:21 PDT 2013
sw/inc/editsh.hxx | 4 ----
sw/inc/ndarr.hxx | 1 -
sw/inc/ndtxt.hxx | 4 ----
sw/source/core/doc/ftnidx.cxx | 1 -
sw/source/core/doc/poolfmt.cxx | 1 -
sw/source/core/docnode/ndcopy.cxx | 1 -
sw/source/core/docnode/ndsect.cxx | 2 --
sw/source/core/docnode/ndtbl.cxx | 1 -
sw/source/core/docnode/swbaslnk.cxx | 1 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 7 -------
sw/source/core/txtnode/ndtxt.cxx | 3 ---
sw/source/core/unocore/unoobj2.cxx | 16 ++++------------
sw/source/core/unocore/unoprnms.cxx | 1 -
sw/source/core/unocore/unosett.cxx | 10 ----------
sw/source/filter/ww8/ww8atr.cxx | 9 ++-------
sw/source/filter/ww8/ww8par.cxx | 12 ------------
sw/source/filter/ww8/ww8par2.cxx | 9 +--------
sw/source/filter/ww8/ww8par5.cxx | 7 +------
sw/source/filter/xml/swxml.cxx | 9 ---------
sw/source/ui/app/docsh2.cxx | 4 ----
sw/source/ui/app/docst.cxx | 3 ---
sw/source/ui/index/cnttab.cxx | 8 +++-----
sw/source/ui/misc/outline.cxx | 4 ----
sw/source/ui/wrtsh/wrtsh1.cxx | 7 -------
vcl/source/helper/canvastools.cxx | 2 --
25 files changed, 11 insertions(+), 116 deletions(-)
New commits:
commit 6e9f03780d4ea217da9e9890e79808d9856937d3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 2 17:18:49 2013 +0200
-Werror,-Wunused-variable
Change-Id: I5edfd48f499c0b06ae50baefa208875ac51653f7
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 519f97f..ab5d777 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -225,8 +225,6 @@ namespace vcl
// determine alpha channel depth
const uno::Sequence<sal_Int8> aTags(
aLayout.ColorSpace->getComponentTags() );
- const uno::Sequence<sal_Int32> aDepths(
- aLayout.ColorSpace->getComponentBitCounts() );
const sal_Int8* pStart(aTags.getConstArray());
const sal_Size nLen(aTags.getLength());
const sal_Int8* pEnd(pStart+nLen);
commit faad24aa3339c9de06ab942ad36b19403de494f2
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Sep 29 18:32:12 2013 +0200
remove/add blank lines
Conflicts:
sw/source/core/unocore/unoprnms.cxx
Change-Id: Icc044955b7b9f28d9f237e97865198cd2ded89a1
Reviewed-on: https://gerrit.libreoffice.org/6079
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 0e6e9ed..c0b4e4d 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -97,7 +97,6 @@ class SwAuthEntry;
class SwRewriter;
struct SwConversionArgs;
-
namespace com { namespace sun { namespace star { namespace uno {
template < class > class Sequence;
}}}}
@@ -119,7 +118,6 @@ namespace sw {
#define GETSELTXT_PARABRK_KEEP 1
#define GETSELTXT_PARABRK_TO_ONLYCR 2
-
/// For querying the INet-attributes for Navigator.
struct SwGetINetAttr
{
@@ -299,7 +297,6 @@ public:
SwCharFmt* MakeCharFmt( const String& rName, SwCharFmt* pDerivedFrom = 0 );
SwCharFmt* FindCharFmtByName( const String& rName ) const;
-
/* FormatCollections (new) - Explaining the general naming pattern:
* GetXXXCount() returns the count of xxx in the document.
* GetXXX(i) returns i-th xxx (ERR_RAISE if beyond range!).
@@ -977,7 +974,6 @@ public:
~SwMvContext();
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 56b1cce..ca02795 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -282,7 +282,6 @@ public:
SwTxtFmtColl* pTxtColl
/*, SwUndo... pUndo*/ );
-
/// Create regular text from what was table.
sal_Bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
SwUndoTblToTxt* = 0 );
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 6be3944..a2d3378 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -159,7 +159,6 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
LanguageType nLang, sal_uInt16 nLangWhichId,
const Font *pFont, sal_uInt16 nFontWhichId );
-
/// Start: Data collected during idle time
SW_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const;
@@ -203,7 +202,6 @@ public:
SwWrongList* GetSmartTags();
bool TryCharSetExpandToNum(const SfxItemSet& pCharSet);
-
/// End: Data collected during idle time
protected:
@@ -725,7 +723,6 @@ public:
inline bool HasHiddenParaField() const
{ return m_pSwpHints ? m_pSwpHints->HasHiddenParaField() : false; }
-
/// Hidden Paragraph Field:
inline bool HasHiddenCharAttribute( bool bWholePara ) const
@@ -738,7 +735,6 @@ public:
inline void SetCalcHiddenCharFlags() const
{ m_bRecalcHiddenCharFlags = true; }
-
/** @return if the node is hidden due to
1. HiddenParaField
2. HiddenCharAttribute
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index d50619b..91bcb89 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -211,7 +211,6 @@ void SwFtnIdxs::UpdateAllFtn()
pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nNo++, rFtn.GetNumStr() );
}
}
-
}
// We use bool here, so that we also iterate through the Endnotes with a chapter setting.
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index c6e52af..bcf7c90 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1933,7 +1933,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
pNewRule->Set( 2, aFmt );
-
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 5b69592..9d73cd8 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -837,7 +837,6 @@ static bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
} while ( pTxtNd && pTxtNd != pEndTxtNd );
}
-
return bRet;
}
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 288c445..55baa79 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -849,7 +849,6 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
if( pTemp->GetIndex() >= aInsPos.GetIndex() )
aInsPos = pTemp->GetIndex()+1; // ...I have to correct my end position
}
-
}
else
{
@@ -1177,7 +1176,6 @@ void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEndIdx )
if( !pEndIdx )
delete pEnd;
}
-
}
void SwSectionNode::DelFrms()
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 015136b..1b5b2c1 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3715,7 +3715,6 @@ sal_Bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt&
if( pFndBox->GetLines().empty() ) // One too far? (only one sel. Box)
pFndBox = pFndBox->GetUpper()->GetUpper();
-
// Disable Undo, but first store parameters
SwUndoTblAutoFmt* pUndo = 0;
bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 31b01a4..16bd2ff 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -155,7 +155,6 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
aFrmFmtSz =
Application::GetDefaultDevice()->PixelToLogic(
aGrf.GetSizePixel(), aMapTwip );
-
}
else
{
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 46e26f7..845c7b0 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -298,7 +298,6 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
}
}
-
/*
* SwTaggedPDFHelper::~SwTaggedPDFHelper()
*/
@@ -393,7 +392,6 @@ bool SwTaggedPDFHelper::CheckReopenTag()
return bRet && !bContinue;
}
-
/*
* SwTaggedPDFHelper::CheckRestoreTag()
*/
@@ -416,7 +414,6 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
return bRet;
}
-
/*
* SwTaggedPDFHelper::BeginTag()
*/
@@ -478,7 +475,6 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const OUS
SetAttributes( eType );
}
-
/*
* SwTaggedPDFHelper::EndTag()
*/
@@ -491,7 +487,6 @@ void SwTaggedPDFHelper::EndTag()
#endif
}
-
/*
* SwTaggedPDFHelper::SetAttributes()
*
@@ -1335,7 +1330,6 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
}
}
-
/*
* SwTaggedPDFHelper::EndStructureElements()
*/
@@ -1350,7 +1344,6 @@ void SwTaggedPDFHelper::EndStructureElements()
CheckRestoreTag();
}
-
/*
* SwTaggedPDFHelper::BeginInlineStructureElements()
*/
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a994f5a..b8566a6 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -81,10 +81,8 @@
#include <switerator.hxx>
#include <attrhint.hxx>
-
using namespace ::com::sun::star;
-
typedef std::vector<SwTxtAttr*> SwpHts;
TYPEINIT1( SwTxtNode, SwCntntNode )
@@ -3800,7 +3798,6 @@ void SwTxtNode::ResetEmptyListStyleDueToResetOutlineLevelAttr()
}
}
-
void SwTxtNode::SetAttrListLevel( int nLevel )
{
if ( nLevel < 0 || nLevel >= MAXLEVEL )
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 7fccf6a..3cd6ca3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -393,6 +393,7 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam,
*pSet, nStart, nEnd, bOnlyTxtAttr, bGetFromChrFmt);
}
break;
+
case ND_GRFNODE:
case ND_OLENODE:
static_cast<SwCntntNode*>(pNd)->GetAttr( *pSet );
@@ -426,9 +427,7 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam,
class SwXParagraphEnumeration::Impl
: public SwClient
{
-
public:
-
uno::Reference< text::XText > const m_xParentText;
const CursorType m_eCursorType;
/// Start node of the cell _or_ table the enumeration belongs to.
@@ -496,7 +495,6 @@ public:
protected:
// SwClient
virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew);
-
};
void SwXParagraphEnumeration::Impl::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew)
@@ -727,9 +725,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
class SwXTextRange::Impl
: public SwClient
{
-
public:
-
const SfxItemPropertySet & m_rPropSet;
const enum RangePosition m_eRangePosition;
SwDoc & m_rDoc;
@@ -766,10 +762,10 @@ public:
}
const ::sw::mark::IMark * GetBookmark() const { return m_pMark; }
+
protected:
// SwClient
virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew);
-
};
void SwXTextRange::Impl::Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew)
@@ -1538,9 +1534,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
class SwXTextRanges::Impl
: public SwClient
{
-
public:
-
::std::vector< uno::Reference< text::XTextRange > > m_Ranges;
Impl(SwPaM *const pPaM)
@@ -1566,10 +1560,10 @@ public:
}
void MakeRanges();
+
protected:
// SwClient
virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew);
-
};
void SwXTextRanges::Impl::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew)
@@ -1727,9 +1721,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
class SwXParaFrameEnumeration::Impl
: public SwClient
{
-
public:
-
// created by hasMoreElements
uno::Reference< text::XTextContent > m_xNextObject;
FrameDependList_t m_Frames;
@@ -1753,10 +1745,10 @@ public:
return static_cast<SwUnoCrsr*>(
const_cast<SwModify*>(GetRegisteredIn()));
}
+
protected:
// SwClient
virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew);
-
};
struct InvalidFrameDepend {
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 7318255..6f09ce6 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -20,7 +20,6 @@
#include <svl/itemprop.hxx>
#include <unoprnms.hxx>
-
//#define MAP_CHAR_LEN(cchar) cchar, sizeof(cchar) - 1
const SwPropNameTab aPropNameTab = {
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7f26de8..afadc74 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/svxids.hrc>
#include <editeng/memberids.hrc>
#include <swtypes.hxx>
@@ -616,12 +615,10 @@ SwXEndnoteProperties::SwXEndnoteProperties(SwDoc* pDc) :
pDoc(pDc),
m_pPropertySet(GetEndnoteSet())
{
-
}
SwXEndnoteProperties::~SwXEndnoteProperties()
{
-
}
uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo(void) throw( uno::RuntimeException )
@@ -847,12 +844,10 @@ SwXLineNumberingProperties::SwXLineNumberingProperties(SwDoc* pDc) :
pDoc(pDc),
m_pPropertySet(GetLineNumberingSet())
{
-
}
SwXLineNumberingProperties::~SwXLineNumberingProperties()
{
-
}
uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo(void) throw( uno::RuntimeException )
@@ -1293,7 +1288,6 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen
}
else
throw uno::RuntimeException();
-
}
sal_Int32 SwXNumberingRules::getCount(void) throw( uno::RuntimeException )
@@ -1542,7 +1536,6 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
aPropertyValues.push_back(pData);
}
}
-
}
else
{
@@ -2137,7 +2130,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
else if(bExcept)
throw uno::RuntimeException();
rNumRule.Set( (sal_uInt16)nIndex, aFmt );
-
}
uno::Reference< XPropertySetInfo > SwXNumberingRules::getPropertySetInfo()
@@ -2168,7 +2160,6 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
if(!pNumRule && !pDocRule && !pCreatedRule)
throw RuntimeException();
-
if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC)))
{
sal_Bool bVal = *(sal_Bool*)rValue.getValue();
@@ -2439,7 +2430,6 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
SwXTextColumns::~SwXTextColumns()
{
-
}
sal_Int32 SwXTextColumns::getReferenceValue(void) throw( uno::RuntimeException )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 12c3897..c627e98 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/*
* This file contains methods for the WW8 output
* (nodes, attributes, formats und chars).
@@ -301,7 +300,9 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
pISet = 0; // fuer Doppel-Attribute
}
}
+
#include "switerator.hxx"
+
void MSWordExportBase::GatherChapterFields()
{
//If the header/footer contains a chapter field
@@ -1810,7 +1811,6 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
( eFldType == ww::ePAGEREF || eFldType == ww::eREF ||
eFldType == ww::eNOTEREF || eFldType == ww::eFOOTREF ))
bHandleBookmark = true;
-
}
if ( bHandleBookmark )
@@ -3073,10 +3073,8 @@ void WW8AttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
m_rWW8Export.InsUInt16( nVal );
}
-
// NoHyphen: ich habe keine Entsprechung in der SW-UI und WW-UI gefunden
-
// RefMark, NoLineBreakHere fehlen noch
void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
@@ -3189,7 +3187,6 @@ static bool lcl_IsAtTxtEnd(const SwFmtFtn& rFtn)
return bRet;
}
-
void AttributeOutputBase::TextFootnote( const SwFmtFtn& rFtn )
{
sal_uInt16 nTyp;
@@ -3957,7 +3954,6 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
}
}
-
void WW8AttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
{
if ( !m_rWW8Export.mpParentFrame )
@@ -4872,7 +4868,6 @@ void SwWW8WrTabu::PutAll(WW8Export& rWrt)
rWrt.OutSprmBytes(pAddTyp, nAdd); // AddTypArray
}
-
static void ParaTabStopAdd( WW8Export& rWrt,
const SvxTabStopItem& rTStops,
const long nLParaMgn )
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ce951a8..6a58d2f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/embed/ElementModes.hpp>
#include <i18nlangtag/languagetag.hxx>
@@ -81,7 +80,6 @@
#include <fchrfmt.hxx>
#include <charfmt.hxx>
-
#include <comphelper/extract.hxx>
#include <fltini.hxx>
@@ -186,7 +184,6 @@ OUString BasicProjImportHelper::getProjectName()
return sProjName;
}
-
class Sttb : TBBase
{
struct SBBItem
@@ -250,7 +247,6 @@ void Sttb::Print( FILE* fp )
for ( sal_Int32 index = 0; index < cData; ++index )
fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
}
-
}
OUString
@@ -374,7 +370,6 @@ void SwWW8ImplReader::SetToggleBiDiAttrFlags(sal_uInt16 nFlags)
pCtrlStck->SetToggleBiDiAttrFlags(nFlags);
}
-
SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
DffObjData& rObjData,
void* pData,
@@ -1945,7 +1940,6 @@ void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrmFmt* pHdFtFmt)
*pPaM->GetPoint() = aTmpPos;
}
-
bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const
{
// Each CP of Plcfhdd MUST be less than FibRgLw97.ccpHdd
@@ -4010,7 +4004,6 @@ void wwSectionManager::InsertSegments()
mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
}
-
if (bInsertPageDesc)
{
/*
@@ -4636,7 +4629,6 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
const sal_uLong nNd = pPos->nNode.GetIndex();
bReadNoTbl = ( nNd < rDoc.GetNodes().GetEndOfInserts().GetIndex() &&
rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex() < nNd );
-
}
::SetProgressState(nProgress, mpDocShell); // Update
@@ -4709,7 +4701,6 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
mbOnLoadingMain = true;
ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
mbOnLoadingMain = false;
-
}
::SetProgressState(nProgress, mpDocShell); // Update
@@ -4772,9 +4763,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
pFlyFmt->SetFmtAttr( aChain );
}
}
-
}
-
}
if (mbNewDoc)
@@ -5698,7 +5687,6 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co
sal_uInt16 nOldBuffSize = 32768;
bool bNew = !bInsertMode; // New Doc (no inserting)
-
SvStorageStreamRef refStrm; // So that no one else can steal the Stream
SvStream* pIn = pStrm;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c243c12..3e4d83a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -69,7 +69,6 @@
using namespace ::com::sun::star;
-
class WW8SelBoxInfo
: public std::vector<SwTableBox*>
{
@@ -217,7 +216,6 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
}
}
-
void wwSectionManager::SetCurrentSectionHasFootnote()
{
OSL_ENSURE(!maSegments.empty(),
@@ -555,6 +553,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
return aRet;
}
+
//---------------------------------------------------------------------
// helper methods for outline, numbering and bullets
//---------------------------------------------------------------------
@@ -785,7 +784,6 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
return;
}
-
if( nSwNumLevel <= MAXLEVEL // Value range mapping WW:1..9 -> SW:0..8
&& nSwNumLevel <= 9 ){ // No Bullets or Numbering
@@ -886,7 +884,6 @@ void ANLDRuleMap::SetNumRule(SwNumRule *pRule, sal_uInt8 nNumType)
mpOutlineNumRule = pRule;
}
-
// StartAnl is called at the beginning of a row area that contains
// outline / numbering / bullets
void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
@@ -1202,8 +1199,6 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS)
}
}
}
-
-
}
}
@@ -3294,7 +3289,6 @@ SwTableBox* WW8TabDesc::UpdateTableMergeGroup( WW8_TCell& rCell,
return pResult;
}
-
sal_uInt16 WW8TabDesc::GetLogicalWWCol() const // returns number of col as INDICATED within WW6 UI status line -1
{
sal_uInt16 nCol = 0;
@@ -4447,7 +4441,6 @@ void WW8RStyle::Import()
else
pIo->pDfltTxtFmtColl = pIo->rDoc.GetDfltTxtFmtColl();
-
// set Hyphenation flag on BASIC para-style
if (pIo->mbNewDoc && pIo->pStandardFmtColl)
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f71e705..d62c32a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/types.h>
#include <tools/solar.h>
#include <comphelper/processfactory.hxx>
@@ -580,7 +579,6 @@ sal_uInt16 SwWW8ImplReader::End_Field()
std::pair< OUString, uno::Any >(
ODF_OLE_PARAM, uno::makeAny( OUString( sOleId ) ) ) );
}
-
}
}
@@ -665,7 +663,6 @@ void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode)
return maParams;
}
-
// Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann,
// wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird.
// Returnwert: Gesamtlaenge des Feldes ( zum UEberlesen )
@@ -1055,7 +1052,6 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
return pF->nLen;
}
-
//-----------------------------------------
// normale Felder
//-----------------------------------------
@@ -1852,7 +1848,6 @@ eF_ResT SwWW8ImplReader::Read_F_Embedd( WW8FieldDesc*, OUString& rStr )
return FLD_TEXT;
}
-
// "SET"
eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF, OUString& rStr )
{
@@ -2052,6 +2047,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
return FLD_OK;
}
+
//helper function
//For MS MacroButton field, the symbol in plain text is always "(" (0x28),
//which should be mapped according to the macro type
@@ -2264,7 +2260,6 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
return FLD_READ_FSPA;
}
-
String wwSectionNamer::UniqueName()
{
const OUString aName(msFileLinkSeed + OUString::number(++mnFileSectionNo));
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 010ed84..66c8d28 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <rsc/rscsfx.hxx>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -74,7 +73,6 @@
#include <sfx2/DocumentMetadataAccess.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -82,7 +80,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
-
static void lcl_EnsureValidPam( SwPaM& rPam )
{
if( rPam.GetCntntNode() != NULL )
@@ -162,7 +159,6 @@ sal_Int32 ReadThroughComponent(
uno::Reference < XImporter > xImporter( xFilter, UNO_QUERY );
xImporter->setTargetDocument( xModelComponent );
-
#ifdef TIMELOG
// if we do profiling, we want to know the stream
OString aString(OUStringToOString(rStreamName,
@@ -457,7 +453,6 @@ static void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
}
}
}
-
}
static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc )
@@ -548,7 +543,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
if( !xModelComp.is() )
return ERR_SWG_READ_ERROR;
-
// create and prepare the XPropertySet that gets passed through
// the components, and the XStatusIndicator that shows progress to
// the user.
@@ -672,7 +666,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
}
}
-
// set progress range and start status indicator
sal_Int32 nProgressRange(1000000);
if (xStatusIndicator.is())
@@ -816,7 +809,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
aAny <<= rDoc.GetRedlinePassword();
xInfoSet->setPropertyValue( sRedlineProtectionKey, aAny );
-
// force redline mode to "none"
rDoc.SetRedlineMode_intern( nsRedlineMode_t::REDLINE_NONE );
@@ -1031,7 +1023,6 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium,
{
try
{
-
xml::sax::InputSource aParserInput;
OUString sDocName( "content.xml" );
aParserInput.sSystemId = sDocName;
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index f946a07..346cb47 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/drawing/ModuleDispatcher.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/DispatchHelper.hpp>
@@ -1341,7 +1340,6 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
pDoc->set(IDocumentSettingAccess::BROWSE_MODE, bWasBrowseMode);
pSrcView->SetPool(&GetPool());
-
const String& rMedname = GetMedium()->GetName();
// The HTML template still has to be set
@@ -1373,7 +1371,6 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
rWrtSh.CheckBrowseView( sal_True );
}
-
// Take HTTP-Header-Attibutes over into the DokInfo again.
// The Base-URL doesn't matter here because TLX uses the one from the document
// for absolutization.
@@ -1492,7 +1489,6 @@ SfxInPlaceClient* SwDocShell::GetIPClient( const ::svt::EmbeddedObjectRef& xObjR
return pResult;
}
-
int SwFindDocShell( SfxObjectShellRef& xDocSh,
SfxObjectShellLock& xLockRef,
const OUString& rFileName,
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index c6e1590..3900b66 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -487,7 +486,6 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet !=0));
else
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet));
-
}
class ApplyStyle
@@ -1246,7 +1244,6 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrent
SfxObjectShell::LoadStyles( rSource );
}
-
void SwDocShell::FormatPage(
const String& rPage,
const OString& rPageId,
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4b8ea5e..dd1225c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -461,7 +461,6 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase(
pDesc->SetAutoMarkURL(rSh.GetTOIAutoMarkURL());
pDesc->SetTitle(pCurTOX->GetTitle());
-
pDesc->SetContentOptions(pCurTOX->GetCreateType());
if(pDesc->GetTOXType() == TOX_INDEX)
pDesc->SetIndexOptions(pCurTOX->GetOptions());
@@ -2088,7 +2087,6 @@ void SwTOXEntryTabPage::UpdateDescriptor()
m_pThirdKeyLB->GetSelectEntryPos());
aKey3.bSortAscending = m_pThirdSortUpRB->IsChecked();
-
rDesc.SetSortKeys(aKey1, aKey2, aKey3);
}
SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType);
@@ -2374,7 +2372,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
m_pNumberFormatFT->Show( bIsEntryNumber );
m_pNumberFormatLB->Show( bIsEntryNumber );
-
//now enable the visible buttons
//- inserting the same type of control is not allowed
//- some types of controls can only appear once (EntryText EntryNumber)
@@ -3243,6 +3240,7 @@ String SwTokenWindow::GetPattern() const
Description: Check if a control of the specified
TokenType is already contained in the list
--------------------------------------------------*/
+
sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
{
bool bRet = false;
@@ -3568,6 +3566,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
}
return 0;
}
+
/*--------------------------------------------------------------------
Description: allocate templates
--------------------------------------------------------------------*/
@@ -3661,7 +3660,6 @@ void SwTOXStylesTabPage::Modify()
#define ITEM_CASE 6
#define ITEM_WORDONLY 7
-
SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder)
: SwEntryBrowseBox_Base( pParent, EBBF_NONE, WB_TABSTOP | WB_BORDER,
BROWSER_KEEPSELECTION |
@@ -3701,6 +3699,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde
aStyle &= ~WB_CLIPCHILDREN;
SetStyle( aStyle );
}
+
const String* aTitles[7] =
{
&sSearch,
@@ -3718,7 +3717,6 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde
for(sal_uInt16 i = 1; i < 8; i++)
InsertDataColumn( i, *aTitles[i - 1], nWidth,
HIB_STDSTYLE, HEADERBAR_APPEND );
-
}
void SwEntryBrowseBox::Resize()
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6723f08..3436f8e 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -291,7 +291,6 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
}
delete pDlg;
return 0;
-
}
if( nLevelNo-- )
@@ -887,7 +886,6 @@ static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, sa
}
}
return nRet;
-
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumberingPreview(Window *pParent, VclBuilder::stringmap &)
@@ -1058,7 +1056,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
nXStart = static_cast<sal_uInt16>( rFmt.GetIndentAt() / nWidthRelation );
}
-
Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
pVDev->SetFillColor( GetSettings().GetStyleSettings().GetWindowColor() ); // Color( COL_BLACK ) );
pVDev->DrawRect( aRect1 );
@@ -1134,7 +1131,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
Point(0,0), aSize,
*pVDev );
delete pVDev;
-
}
NumberingPreview::~NumberingPreview()
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index e52f7af..6d36ed1 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/embed/EmbedMisc.hpp>
@@ -287,7 +286,6 @@ void SwWrtShell::Insert( const String &rPath, const String &rFilter,
bSetGrfSize = false;
pFrmMgr->SetHeightSizeType(ATT_FIX_SIZE);
-
}
// Insert the graphic
@@ -814,8 +812,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
pCli->SetObjAreaAndScale( aArea.SVRect(), aScaleWidth, aScaleHeight );
}
-
-
void SwWrtShell::ConnectObj( svt::EmbeddedObjectRef& xObj, const SwRect &rPrt,
const SwRect &rFrm )
{
@@ -1566,7 +1562,6 @@ void SwWrtShell::AutoUpdateFrame( SwFrmFmt* pFmt, const SfxItemSet& rStyleSet )
EndAction();
}
-
void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar )
{
ResetCursorStack();
@@ -1611,7 +1606,6 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell )
}
}
-
SwWrtShell::SwWrtShell( SwDoc& rDoc, Window *_pWin, SwView &rShell,
const SwViewOption *pViewOpt )
: SwFEShell( rDoc, _pWin, pViewOpt),
@@ -1701,7 +1695,6 @@ void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt )
GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
}
-
void SwWrtShell::SetReadonlyOption(sal_Bool bSet)
{
GetView().GetEditWin().GetFrameControlsManager().SetReadonlyControls( bSet );
More information about the Libreoffice-commits
mailing list