summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-01 13:56:48 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-02 06:20:35 +0000
commitd68a0fc050ea4d57e15246f8e71781cd42ebdaa1 (patch)
treed8f8e8823de13253a1bb41a8a4804dfec042694b /sw
parentde020fc9c3c67541067bc7e0b72ed41eae650288 (diff)
loplugin:unusedmethods
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c Reviewed-on: https://gerrit.libreoffice.org/19072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/inc/doc.hxx1
-rw-r--r--sw/inc/fldbas.hxx2
-rw-r--r--sw/inc/fmtautofmt.hxx1
-rw-r--r--sw/inc/fmtflcnt.hxx1
-rw-r--r--sw/inc/fmtinfmt.hxx4
-rw-r--r--sw/inc/fmtrfmrk.hxx1
-rw-r--r--sw/inc/fmtruby.hxx1
-rw-r--r--sw/inc/mdiexp.hxx4
-rw-r--r--sw/inc/pam.hxx2
-rw-r--r--sw/inc/sw3convert.hxx33
-rw-r--r--sw/inc/swbaslnk.hxx1
-rw-r--r--sw/inc/viewopt.hxx3
-rw-r--r--sw/source/core/doc/docdesc.cxx6
-rw-r--r--sw/source/core/docnode/ndsect.cxx30
-rw-r--r--sw/source/core/inc/cntfrm.hxx5
-rw-r--r--sw/source/core/inc/doctxm.hxx1
-rw-r--r--sw/source/core/inc/frame.hxx5
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx280
-rw-r--r--sw/source/filter/inc/fltshell.hxx6
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx6
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx5
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx32
-rw-r--r--sw/source/uibase/docvw/romenu.hxx2
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx2
-rw-r--r--sw/source/uibase/inc/initui.hxx2
-rw-r--r--sw/source/uibase/inc/pview.hxx2
-rw-r--r--sw/source/uibase/uiview/viewfunc.hxx1
29 files changed, 0 insertions, 441 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1654395a0124..3ca33e892014 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -345,7 +345,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/objectpositioning/tolayoutanchoredobjectposition \
sw/source/core/ole/ndole \
sw/source/core/para/paratr \
- sw/source/core/sw3io/sw3convert \
sw/source/core/sw3io/swacorr \
sw/source/core/swg/SwXMLBlockExport \
sw/source/core/swg/SwXMLBlockImport \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f3383480a441..0b25e5f33a84 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -922,7 +922,6 @@ public:
size_t GetPageDescCnt() const { return m_PageDescs.size(); }
const SwPageDesc& GetPageDesc(const size_t i) const { return *m_PageDescs[i]; }
SwPageDesc& GetPageDesc(size_t const i) { return *m_PageDescs[i]; }
- SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = NULL);
SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = NULL) const;
// Just searches the pointer in the m_PageDescs vector!
bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 6406fae27b71..ea30632226ad 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -224,8 +224,6 @@ enum SwDateTimeSubType
};
/// General tools.
-OUString GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM);
-void SetErrorStr(const OUString& rStr);
OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
/** Instances of SwFields and those derived from it occur 0 to n times.
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 14a103c4b3f3..092d6b099158 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -56,7 +56,6 @@ public:
void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
- std::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 83cab4bb3214..bcf3c47b52df 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -47,7 +47,6 @@ public:
inline void SetFlyFormat( SwFrameFormat* pNew = 0 ) { pFormat = pNew; }
const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
- SwTextFlyCnt *GetTextFlyCnt() { return pTextAttr; }
};
#endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index cfe3c79d30f6..5703c95e03b5 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -68,10 +68,6 @@ public:
{
return mpTextAttr;
}
- SwTextINetFormat* GetTextINetFormat()
- {
- return mpTextAttr;
- }
const OUString& GetValue() const
{
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 8e054f660859..3723d745b5df 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -61,7 +61,6 @@ public:
void InvalidateRefMark();
const SwTextRefMark *GetTextRefMark() const { return pTextAttr; }
- SwTextRefMark *GetTextRefMark() { return pTextAttr; }
inline OUString &GetRefName() { return aRefName; }
inline const OUString &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 6e4b6e7551ff..b4dcad384a80 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -57,7 +57,6 @@ public:
sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwTextRuby* GetTextRuby() const { return pTextAttr; }
- SwTextRuby* GetTextRuby() { return pTextAttr; }
OUString GetText() const { return sRubyText; }
void SetText( const OUString& rText ) { sRubyText = rText; }
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 1e21326cdcd2..d8a5e0f685e0 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -49,8 +49,6 @@ SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell );
void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell );
void RescheduleProgress( SwDocShell *pDocShell );
-void EnableCmdInterface(bool bEnable = true);
-
void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
// Read ChgMode for tables from configuration.
@@ -58,8 +56,6 @@ TableChgMode GetTableChgDefaultMode();
bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
-extern void AccessibilityScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY, bool isLeftTop);
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index cce42c00c7ee..5c9077e2f736 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -154,8 +154,6 @@ extern SwGoInDoc fnGoContentCells;
extern SwGoInDoc fnGoContentSkipHidden;
extern SwGoInDoc fnGoContentCellsSkipHidden;
-void _InitPam();
-
class SwPaM;
/// PaM is Point and Mark: a selection of the document model.
class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM>
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
deleted file mode 100644
index 1c500f06195b..000000000000
--- a/sw/inc/sw3convert.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-#ifndef INCLUDED_SW_INC_SW3CONVERT_HXX
-#define INCLUDED_SW_INC_SW3CONVERT_HXX
-
-#include <sal/config.h>
-
-class SwDoc;
-
-SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFormat,
- sal_uInt16 nVersion );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index f8c4a54b5c95..1df801feb674 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -24,7 +24,6 @@
class SwNode;
class SwContentNode;
class ReReadThread;
-long GrfNodeChanged( void* pLink, void* pCaller );
class SwBaseLink : public ::sfx2::SvBaseLink
{
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index a2e9d44c38c8..924d177ee73a 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -101,9 +101,6 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_SECTION_BOUNDARIES 0x0080
#define VIEWOPT_SHADOW 0x0100
-// Implementation in core/text/txtpaint.cxx.
-extern void SyncVout( const OutputDevice *pOut );
-
class SW_DLLPUBLIC SwViewOption
{
static Color aDocColor; // color of document boundaries
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1463650810e8..747ff3de128c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -831,12 +831,6 @@ static SwPageDesc* lcl_FindPageDesc( SwPageDescs *pPageDescs,
return res;
}
-SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, size_t* pPos )
-{
- return lcl_FindPageDesc<CompareSwPageDescName>(
- &m_PageDescs, pPos, CompareSwPageDescName(rName) );
-}
-
SwPageDesc* SwDoc::FindPageDesc( const OUString & rName, size_t* pPos ) const
{
return lcl_FindPageDesc<CompareSwPageDescName>(
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index e4a760efa6bf..85b6febcb232 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1000,36 +1000,6 @@ SwSectionNode::SwSectionNode(SwNodeIndex const& rIdx,
rFormat.UnlockModify();
}
-#ifdef DBG_UTIL
-//remove superfluous SectionFrms
-SwFrm* SwClearDummies( SwFrm* pFrm )
-{
- SwFrm* pTmp = pFrm;
- while( pTmp )
- {
- OSL_ENSURE( !pTmp->GetUpper(), "SwClearDummies: No Upper allowed!" );
- if( pTmp->IsSctFrm() )
- {
- SwSectionFrm* pSectFrm = static_cast<SwSectionFrm*>(pFrm);
- pTmp = pTmp->GetNext();
- if( !pSectFrm->GetLower() )
- {
- if( pSectFrm->GetPrev() )
- pSectFrm->GetPrev()->mpNext = pTmp;
- else
- pFrm = pTmp;
- if( pTmp )
- pTmp->mpPrev = pSectFrm->GetPrev();
- SwFrm::DestroyFrm(pSectFrm);
- }
- }
- else
- pTmp = pTmp->GetNext();
- }
- return pFrm;
-}
-#endif
-
SwSectionNode::~SwSectionNode()
{
// mba: test if iteration works as clients will be removed in callback
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 6442a9408b7c..76b3544ba2cf 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -78,7 +78,6 @@ public:
inline const SwContentFrm *GetFollow() const;
inline SwContentFrm *GetFollow();
inline const SwContentFrm *GetPrecede() const;
- inline SwContentFrm *GetPrecede();
SwTextFrm* FindMaster() const;
// layout dependent cursor travelling
@@ -140,10 +139,6 @@ inline const SwContentFrm *SwContentFrm::GetPrecede() const
{
return static_cast<const SwContentFrm*>(SwFlowFrm::GetPrecede());
}
-inline SwContentFrm *SwContentFrm::GetPrecede()
-{
- return static_cast<SwContentFrm*>(SwFlowFrm::GetPrecede());
-}
#endif
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 7689e2ae7d69..2a0aa97da2ff 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -79,7 +79,6 @@ public:
void UpdatePageNum(); // insert page numbering
TYPEINFO_OVERRIDE(); // for rtti
- SwTOXSortTabBases& GetTOXSortTabBases() { return aSortArr; }
const SwTOXSortTabBases& GetTOXSortTabBases() const { return aSortArr; }
bool SetPosAtStartEnd( SwPosition& rPos, bool bAtStart = true ) const;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index bdfb9a62b7ac..714ba6ea4339 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -224,11 +224,6 @@ class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster
friend SwFrm *SaveContent( SwLayoutFrm *, SwFrm* pStart );
friend void RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
-#ifdef DBG_UTIL
- // remove empty SwSectionFrms from a chain
- friend SwFrm* SwClearDummies( SwFrm* pFrm );
-#endif
-
// for validating a mistakenly invalidated one in SwContentFrm::MakeAll
friend void ValidateSz( SwFrm *pFrm );
// implemented in text/txtftn.cxx, prevents Footnote oscillation
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
deleted file mode 100644
index cb50b2080016..000000000000
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-#include "hintids.hxx"
-#include "sw3convert.hxx"
-#include <tools/resid.hxx>
-#include <svl/macitem.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
-#include <svl/urihelper.hxx>
-#include <sfx2/linkmgr.hxx>
-
-#include <editeng/lrspitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <fmtinfmt.hxx>
-#include <fmtfld.hxx>
-#include <frmatr.hxx>
-#include "doc.hxx"
-#include "docary.hxx"
-#include "fldbas.hxx"
-#include "flddat.hxx"
-#include "docufld.hxx"
-#include "chpfld.hxx"
-#include "ddefld.hxx"
-#include "expfld.hxx"
-#include "reffld.hxx"
-#include "usrfld.hxx"
-#include "dbfld.hxx"
-#include "txtfld.hxx"
-#include "ndtxt.hxx"
-
-//really used ids from old sw3ids.hxx
-#define SWG_INETBROWSER 0x000e // URL graph nodes, browse flag, formatter
-#define SWG_NEWFIELDS 0x0200 // Fields with Numberformatter numberformat
-
-using namespace nsSwDocInfoSubType;
-
-struct OldFormats
-{
- NfIndexTableOffset eFormatIdx;
- sal_uInt16 nOldFormat;
-};
-
-static const OldFormats aOldDateFormat40[] =
-{
- // Date fields
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Long system date
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Oct 64
- { NF_DATE_SYS_DMMMYYYY, DFF_DMMYY }, // 06. Oct 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY }, // 06. October 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY }, // 06. October 64
- { NF_DATE_SYS_NNDMMMYY, DFF_DDMMY }, // Tue, 06. Oct 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY }, // Tue, 06. October 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY }, // Tue, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY }, // Tuesday, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY }, // Tuesday, 06. October 64
- { NF_DATE_SYS_MMYY, DFF_MY }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldDateFormat30[] =
-{
- // Date fields
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Long system date
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Oct 64
- { NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/ }, // 06. Oct 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/ }, // 06. October 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/ }, // 06. October 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/ },// Tue, 06. October 1964
- { NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/ }, // Tue, 06. Oct 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/ }, // Tue, 06. October 64
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/ }, // Tuesday, 06. October 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/ }, // Tuesday, 06. October 64
- { NF_DATE_SYS_MMYY, 2 /*DFF_MY*/ }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldTimeFormat[] =
-{
- // Time fields
- { NF_TIME_HHMMSS, TF_SYSTEM }, // System time
- { NF_TIME_HHMM, TF_SSMM_24 }, // 23:25
- { NF_TIME_HHMMAMPM, TF_SSMM_12 }, // 11:25 PM
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldGetSetExpFormat40[] =
-{
- { NF_TEXT, VVF_CMD }, // Show command
- { NF_TEXT, VVF_INVISIBLE },// Invisible
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
-
- { NF_NUMBER_SYSTEM, VVF_SYS }, // Number format from system preferences
- { NF_NUMBER_INT, VVF_X }, // 1234
- { NF_NUMBER_DEC2, VVF_X_X }, // 1234,5
- { NF_NUMBER_DEC2, VVF_X_XX }, // 1245,56
- { NF_NUMBER_1000DEC2, VVF_XX_XX }, // 1.234,56
- { NF_NUMBER_1000DEC2, VVF_XX_X }, // 1.234,5
- { NF_NUMBER_1000DEC2, VVF_XX_XXX }, // 1.234,567
- { NF_CURRENCY_1000DEC2, VVF_SYS_CUR }, // Currency format from system settings
- // (1.234,00 EUR)
- { NF_CURRENCY_1000INT, VVF_X_CUR }, // 1234 EUR
- { NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR },// 1234,56 EUR 1234,00 EUR
- { NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR },// 1234,56 EUR 1234,-- EUR
- { NF_CURRENCY_1000INT, VVF_CUR_X }, // EUR 1234
- { NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX },// EUR 1234,56 EUR 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0 },// EUR 1234,56 EUR 1234,--
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-static const OldFormats aOldGetSetExpFormat30[] =
-{
- { NF_TEXT, VVF_CMD }, // Show command
- { NF_TEXT, VVF_INVISIBLE },// Invisible
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
-
- { NF_NUMBER_SYSTEM, 0x0020 }, // Number format from system preferences
- { NF_NUMBER_INT, 0x0080 }, // 1234
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,56
- { NF_NUMBER_DEC2, 0x0100 }, // 1234,5
- { NF_NUMBER_DEC2, 0x0100 }, // 1245,56
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,5
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,567
- { NF_CURRENCY_1000DEC2, 0x0200 }, // Currency format from system settings
- // (1.234,00 EUR)
- { NF_CURRENCY_1000INT, 0x1000 }, // 1234 EUR
- { NF_CURRENCY_1000DEC2, 0x1000 }, // 1234,56 EUR 1234,00 EUR
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // 1234,56 EUR 1234,-- EUR
- { NF_CURRENCY_1000INT, 0x1000 }, // EUR 1234
- { NF_CURRENCY_1000DEC2, 0x1000 }, // EUR 1234,56 EUR 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // EUR 1234,56 EUR 1234,--
-
- { NF_NUMERIC_START, 0 } // End of table
-};
-
-void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFormat,
- sal_uInt16 nVersion )
-{
- const OldFormats *pOldFormat = 0L;
-
- switch( rWhich )
- {
- case RES_DATEFLD:
- case RES_FIXDATEFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = DATEFLD;
- if( RES_FIXDATEFLD == rWhich )
- rSubType |= FIXEDFLD;
- rWhich = RES_DATETIMEFLD;
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldDateFormat30
- : aOldDateFormat40;
- }
- break;
-
- case RES_TIMEFLD:
- case RES_FIXTIMEFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = TIMEFLD;
- if( RES_FIXTIMEFLD == rWhich )
- rSubType |= FIXEDFLD;
- rWhich = RES_DATETIMEFLD;
- pOldFormat = aOldTimeFormat;
- }
- break;
-
- case RES_DBFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- rSubType = nsSwExtendedSubType::SUB_OWN_FMT;
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
- : aOldGetSetExpFormat40;
- }
- break;
-
- case RES_TABLEFLD:
- case RES_GETEXPFLD:
- case RES_SETEXPFLD:
- case RES_USERFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- if( rFormat == VVF_INVISIBLE )
- {
- rSubType = nsSwExtendedSubType::SUB_INVISIBLE;
- rFormat = 0;
- }
- else if( rFormat == VVF_CMD )
- {
- rSubType = nsSwExtendedSubType::SUB_CMD;
- rFormat = 0;
- }
- else
- {
- // Small hack: We still need the unconverted format
- // when handling number groups. We keep it temporarily
- // in the subtype; if it's a valid format in the first
- // place.
- if( RES_SETEXPFLD==rWhich &&
- /*rFormat >= (sal_uInt16)SVX_NUM_CHARS_UPPER_LETTER && always true*/
- rFormat <= (sal_uInt16)SVX_NUM_BITMAP )
- {
- rSubType = (sal_uInt16)rFormat;
- }
- pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
- : aOldGetSetExpFormat40;
- }
- }
- break;
- case RES_DOCINFOFLD:
- if( nVersion < SWG_NEWFIELDS )
- {
- switch( rFormat )
- {
- case RF_AUTHOR: rSubType = DI_SUB_AUTHOR; break;
- case RF_TIME: rSubType = DI_SUB_TIME; break;
- case RF_DATE: rSubType = DI_SUB_DATE; break;
- case RF_ALL: rSubType = DI_SUB_DATE; break;
- }
- rFormat = 0;
- }
- break;
- }
-
- if( pOldFormat )
- {
- SvNumberFormatter *pFormatter = rDoc.GetNumberFormatter();
- sal_uInt16 i = 0;
-
- while( pOldFormat[i].eFormatIdx != NF_NUMERIC_START ||
- pOldFormat[i].nOldFormat)
- {
- if( rFormat == pOldFormat[i].nOldFormat )
- {
- rFormat = pFormatter->GetFormatIndex(pOldFormat[i].eFormatIdx, LANGUAGE_SYSTEM);
- break;
- }
- i++;
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 92235d977d1e..4720707087b4 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -45,12 +45,6 @@ class SwTableBox;
class SwDoc;
class SwPaM;
-inline void SwFltClearFlag(sal_uLong& rFieldFlags, int no)
- { rFieldFlags &= ~(1L << no); }
-
-inline void SwFltSetFlag(sal_uLong& rFieldFlags, int no)
- { rFieldFlags |= sal_uLong(1) << no; }
-
inline bool SwFltGetFlag(sal_uLong nFieldFlags, int no)
{ return (nFieldFlags & (sal_uLong(1) << no)) != 0; }
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 1fc1efa205e1..9e05bae2b61b 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -65,12 +65,6 @@ typedef ::std::vector<OUString> StringVector_t;
WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize);
virtual ~WW8Sttb();
- sal_uInt32 getCount() const;
- OUString getEntry(sal_uInt32 nEntry) const
- {
- return m_Strings[nEntry];
- }
-
StringVector_t & getStrings()
{
return m_Strings;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9aa2c0c87951..2243e3d76af0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8540,11 +8540,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz
m_pSerializer->endElementNS(XML_w, XML_numPicBullet);
}
-void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue )
-{
- AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
-}
-
void DocxAttributeOutput::AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrs, ... )
{
if( !pAttrList )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 132f02f586c9..187856049b8e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -714,7 +714,6 @@ private:
void CmdField_Impl( FieldInfos& rInfos );
void EndField_Impl( FieldInfos& rInfos );
- static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( std::unique_ptr<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
static void AddToAttrList( css::uno::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index df398828fed0..d10f8e3c0c75 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -462,38 +462,6 @@ namespace sw
return item_cast<T>(rSet.GetItem(eType));
}
- /** Return a pointer to a SfxPoolItem derived class if it exists in an
- SwFormat
-
- Writer's attributes are retrieved by passing a numeric identifier
- and receiving a SfxPoolItem reference which must then typically be
- cast back to its original type which is both tedious and verbose.
-
- HasItem returns a pointer to the requested SfxPoolItem for a given
- property id if it exists in the SwFormat e.g. fontsize
-
- HasItem uses item_cast () on the retrieved pointer to test that the
- retrieved property is of the type that the developer thinks it is.
-
- @param rSet
- The SwFormat whose property we want
-
- @param eType
- The numeric identifier of the default property to be retrieved
-
- @tplparam T
- A SfxPoolItem derived class of the retrieved property
-
- @return The T requested or 0 if no T found with id eType
-
- @author
- <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
- */
- template<class T> const T* HasItem(const SwFormat &rFormat,
- sal_uInt16 eType)
- {
- return HasItem<T>(rFormat.GetAttrSet(), eType);
- }
/** Get the Paragraph Styles of a SwDoc
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index a595f6392417..07241c81425b 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -57,8 +57,6 @@ public:
void Execute( vcl::Window* pWin, sal_uInt16 nId );
};
-void GetPreferredExtension( OUString &rExt, const Graphic &rGrf );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index d25e2c80c0ba..efa8758a15b0 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -37,8 +37,6 @@ class SwViewOption;
class SwContentOptPage;
class SwShdwCrsrOptionsTabPage;
-void SetPrt( SfxPrinter* );
-
// OS 12.01.95
// Item for settings dialog - document view
class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index 462fdd58e0d4..1cf7a3e75454 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.hxx
@@ -58,8 +58,6 @@ SwGlossaryList* GetGlossaryList();
extern void _InitUI();
extern void _FinitUI();
-extern void _InitSpell();
-extern void _FinitSpell();
#endif
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 851e08862d5d..c24fa277ae94 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -235,8 +235,6 @@ private:
static void InitInterface_Impl();
public:
- inline vcl::Window& GetFrameWindow() const
- { return GetViewFrame()->GetWindow(); }
inline SwViewShell* GetViewShell() const
{ return pViewWin->GetViewShell(); }
inline void RepaintCoreRect( const SwRect& rRect )
diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx
index 9bf8b37a1bb8..a64bd360eba0 100644
--- a/sw/source/uibase/uiview/viewfunc.hxx
+++ b/sw/source/uibase/uiview/viewfunc.hxx
@@ -33,7 +33,6 @@ namespace vcl { class Window; }
// The following functions are available in viewprt.cxx
void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb );
-VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window*, const SfxItemSet& );
void SetAppPrintOptions( SwViewShell* pSh, bool bWeb );
// The following functions are available in viewport.cxx