summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/basflt/fltini.cxx8
-rw-r--r--sw/source/filter/html/htmlatr.cxx4
-rw-r--r--sw/source/filter/html/htmlftn.cxx4
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx4
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx6
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx12
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx6
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx8
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx20
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx18
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx2
21 files changed, 67 insertions, 67 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 128a1478447d..784d86d2f8e9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -63,9 +63,9 @@ using namespace com::sun::star;
SwRead ReadAscii = nullptr, ReadHTML = nullptr, ReadXML = nullptr;
-Reader* GetRTFReader();
-Reader* GetWW8Reader();
-Reader* GetDOCXReader();
+static Reader* GetRTFReader();
+static Reader* GetWW8Reader();
+static Reader* GetDOCXReader();
// Note: if editing, please don't forget to modify also the enum
// ReaderWriterEnum and aFilterDetect in iodetect.hxx & iodetect.cxx
@@ -109,7 +109,7 @@ SwRead SwGetReaderXML() // SW_DLLPUBLIC
return ReadXML;
}
-inline void SetFltPtr( sal_uInt16 rPos, SwRead pReader )
+static inline void SetFltPtr( sal_uInt16 rPos, SwRead pReader )
{
aReaderWriter[ rPos ].pReader = pReader;
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 96cd25a1e979..ef1b8d7bb636 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -416,7 +416,7 @@ SwHTMLFormatInfo::~SwHTMLFormatInfo()
{
}
-void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
+static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
const SfxItemSet *pNodeItemSet,
SwHTMLTextCollOutputInfo& rInfo )
{
@@ -963,7 +963,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
rHWrt.m_nFirstLineIndent = 0;
}
-void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
+static void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
{
SwHTMLWriter & rHWrt = static_cast<SwHTMLWriter&>(rWrt);
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 2655f2756709..90f5aae2b9cc 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -31,7 +31,7 @@
#include "swhtml.hxx"
#include "wrthtml.hxx"
-sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
+static sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
sal_Int32 nPos )
{
rPart = aEmptyOUStr;
@@ -73,7 +73,7 @@ sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
return nPos;
}
-sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
+static sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
const OUString& rContent,
bool bEndNote )
{
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index e27e3393f3bd..ae6596f43b52 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -734,7 +734,7 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox,
return pNodeInfo;
}
-void updateFinalEndOfLine(RowEndInners_t &rLastRowEnds, WW8TableNodeInfo const * pEndOfCellInfo)
+static void updateFinalEndOfLine(RowEndInners_t &rLastRowEnds, WW8TableNodeInfo const * pEndOfCellInfo)
{
sal_Int32 nDepth = pEndOfCellInfo->getDepth();
WW8TableNodeInfoInner::Pointer_t pInner = pEndOfCellInfo->getInnerForDepth(nDepth);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a72f89a7d022..37d8e972a42c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8227,7 +8227,7 @@ void DocxAttributeOutput::FormatAnchor( const SwFormatAnchor& )
// Fly frames: anchors here aren't matching the anchors in docx
}
-boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush)
+static boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush)
{
boost::optional<sal_Int32> oRet;
sal_Int32 nTransparency = rBrush.GetColor().GetTransparency();
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 4069289670e0..92ec0d103da9 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -98,7 +98,7 @@ bool DocxExportFilter::exportDocument()
// UNO stuff so that the filter is registered
#define IMPL_NAME "com.sun.star.comp.Writer.DocxExport"
-OUString DocxExport_getImplementationName()
+static OUString DocxExport_getImplementationName()
{
return OUString( IMPL_NAME );
}
@@ -108,13 +108,13 @@ OUString DocxExportFilter::getImplementationName()
return DocxExport_getImplementationName();
}
-uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw()
+static uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw()
{
return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" };
}
/// @throws uno::Exception
-uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx )
+static uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx )
{
return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx ));
}
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 8a10ac8ae651..0335062cf984 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -775,7 +775,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat
m_pImpl->m_pSerializer->endElementNS(XML_w, XML_pict);
}
-bool lcl_isLockedCanvas(const uno::Reference<drawing::XShape>& xShape)
+static bool lcl_isLockedCanvas(const uno::Reference<drawing::XShape>& xShape)
{
bool bRet = false;
uno::Sequence<beans::PropertyValue> propList = lclGetProperty(xShape, "InteropGrabBag");
@@ -984,7 +984,7 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj,
}
// Converts ARGB transparency (0..255) to drawingml alpha (opposite, and 0..100000)
-OString lcl_ConvertTransparency(const Color& rColor)
+static OString lcl_ConvertTransparency(const Color& rColor)
{
if (rColor.GetTransparency() > 0)
{
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index e8218ff98a5e..819e14c4ef21 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -101,15 +101,15 @@ void RtfSdrExport::AddShape(sal_uInt32 nShapeType, ShapeFlag nShapeFlags, sal_uI
m_nShapeFlags = nShapeFlags;
}
-inline sal_uInt16 impl_GetUInt16(const sal_uInt8*& pVal)
+static inline sal_uInt16 impl_GetUInt16(const sal_uInt8*& pVal)
{
sal_uInt16 nRet = *pVal++;
nRet += (*pVal++) << 8;
return nRet;
}
-inline sal_Int32 impl_GetPointComponent(const sal_uInt8*& pVal, std::size_t& rVerticesPos,
- sal_uInt16 nPointSize)
+static inline sal_Int32 impl_GetPointComponent(const sal_uInt8*& pVal, std::size_t& rVerticesPos,
+ sal_uInt16 nPointSize)
{
sal_Int32 nRet = 0;
if ((nPointSize == 0xfff0) || (nPointSize == 4))
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 8c88c6461c8c..e7d4ee46f61a 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -54,7 +54,7 @@ using namespace css;
namespace myImplHelpers
{
- SwTwips CalcHdFtDist(const SwFrameFormat& rFormat, sal_uInt16 nSpacing)
+ static SwTwips CalcHdFtDist(const SwFrameFormat& rFormat, sal_uInt16 nSpacing)
{
/*
The normal case for reexporting word docs is to have dynamic spacing,
@@ -94,12 +94,12 @@ namespace myImplHelpers
return nDist;
}
- SwTwips CalcHdDist(const SwFrameFormat& rFormat)
+ static SwTwips CalcHdDist(const SwFrameFormat& rFormat)
{
return CalcHdFtDist(rFormat, rFormat.GetULSpace().GetUpper());
}
- SwTwips CalcFtDist(const SwFrameFormat& rFormat)
+ static SwTwips CalcFtDist(const SwFrameFormat& rFormat)
{
return CalcHdFtDist(rFormat, rFormat.GetULSpace().GetLower());
}
@@ -313,7 +313,7 @@ namespace myImplHelpers
return pColl ? 0 : maHelper.MakeStyle(aName);
}
- OUString FindBestMSSubstituteFont(const OUString &rFont)
+ static OUString FindBestMSSubstituteFont(const OUString &rFont)
{
if (IsStarSymbol(rFont))
return OUString("Arial Unicode MS");
@@ -756,7 +756,7 @@ namespace sw
/** Find cFind in rParams if not embedded in " double quotes.
Will NOT find '\\' or '"'.
*/
- sal_Int32 findUnquoted( const OUString& rParams, sal_Unicode cFind, sal_Int32 nFromPos )
+ static sal_Int32 findUnquoted( const OUString& rParams, sal_Unicode cFind, sal_Int32 nFromPos )
{
const sal_Int32 nLen = rParams.getLength();
if (nFromPos < 0 || nLen <= nFromPos)
@@ -789,7 +789,7 @@ namespace sw
/** Find all rFind in rParams if not embedded in " double quotes and
replace with rReplace. Will NOT find '\\' or '"'.
*/
- bool replaceUnquoted( OUString& rParams, const OUString& rFind, const OUString& rReplace )
+ static bool replaceUnquoted( OUString& rParams, const OUString& rFind, const OUString& rReplace )
{
bool bReplaced = false;
if (rFind.isEmpty())
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index aca4539fd21e..ac7815c13a6a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -564,7 +564,7 @@ sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
return bRet;
}
-bool RTLDrawingsHack(long &rLeft,
+static bool RTLDrawingsHack(long &rLeft,
sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
SwTwips nPageRight, SwTwips nPageSize)
{
@@ -1531,7 +1531,7 @@ void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt3
CloseContainer(); // ESCHER_SpContainer
}
-ShapeFlag AddMirrorFlags(ShapeFlag nFlags, const SwMirrorGrf &rMirror)
+static ShapeFlag AddMirrorFlags(ShapeFlag nFlags, const SwMirrorGrf &rMirror)
{
switch (rMirror.GetValue())
{
@@ -2838,7 +2838,7 @@ sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId,
return nBorderThick;
}
-sal_uInt16 FindPos(const SwFrameFormat &rFormat, unsigned int nHdFtIndex,
+static sal_uInt16 FindPos(const SwFrameFormat &rFormat, unsigned int nHdFtIndex,
DrawObjPointerVector &rPVec)
{
auto aEnd = rPVec.end();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 5bd578015214..32353635a075 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -232,7 +232,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) :
nCurrentSwPos = SearchNext(1);
}
-sal_Int32 lcl_getMinPos( sal_Int32 pos1, sal_Int32 pos2 )
+static sal_Int32 lcl_getMinPos( sal_Int32 pos1, sal_Int32 pos2 )
{
if ( pos1 >= 0 && pos2 >= 0 )
{
@@ -855,7 +855,7 @@ void WW8AttributeOutput::EndRuby(const SwTextNode& /*rNode*/, sal_Int32 /*nPos*/
}
/*#i15387# Better ideas welcome*/
-OUString &TruncateBookmark( OUString &rRet )
+static OUString &TruncateBookmark( OUString &rRet )
{
if ( rRet.getLength() > 40 )
rRet = rRet.copy( 0, 40 );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 8cabd8d90f34..e5c423bd86ed 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1527,7 +1527,7 @@ bool WW8Export::TransBrush(const Color& rCol, WW8_SHD& rShd)
return !rCol.GetTransparency();
}
-sal_uInt32 SuitableBGColor(Color nIn)
+static sal_uInt32 SuitableBGColor(Color nIn)
{
if (nIn == COL_AUTO)
return 0xFF000000;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 55d57a77174f..4f538c6eb565 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -105,7 +105,7 @@ using namespace sw::types;
using namespace sw::util;
// helper methods
-Color WW8TransCol(SVBT32 nWC)
+static Color WW8TransCol(SVBT32 nWC)
{
#if 1 // 1 = use predefined color, 0 = ignore
@@ -460,7 +460,7 @@ SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet &
return pObj;
}
-ESelection GetESelection(EditEngine const &rDrawEditEngine, long nCpStart, long nCpEnd)
+static ESelection GetESelection(EditEngine const &rDrawEditEngine, long nCpStart, long nCpEnd)
{
sal_Int32 nPCnt = rDrawEditEngine.GetParagraphCount();
sal_Int32 nSP = 0;
@@ -920,7 +920,7 @@ sal_Int32 SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStar
//how EditEngine does it, but preserve the length and replace the extra
//chars with placeholders, record the position of the placeholders and
//remove those extra chars after attributes have been inserted
-std::vector<sal_Int32> replaceDosLineEndsButPreserveLength(OUString &rIn)
+static std::vector<sal_Int32> replaceDosLineEndsButPreserveLength(OUString &rIn)
{
OUStringBuffer aNewData(rIn);
std::vector<sal_Int32> aDosLineEndDummies;
@@ -946,7 +946,7 @@ std::vector<sal_Int32> replaceDosLineEndsButPreserveLength(OUString &rIn)
return aDosLineEndDummies;
}
-void removePositions(EditEngine &rDrawEditEngine, const std::vector<sal_Int32>& rDosLineEndDummies)
+static void removePositions(EditEngine &rDrawEditEngine, const std::vector<sal_Int32>& rDosLineEndDummies)
{
for (auto aIter = rDosLineEndDummies.rbegin(); aIter != rDosLineEndDummies.rend(); ++aIter)
{
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index ab1183600fc1..d2d39f37d526 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -232,7 +232,7 @@ void wwZOrderer::InsertObject(SdrObject* pObject, sal_uLong nPos)
}
}
-extern void WW8PicShadowToReal( WW8_PIC_SHADOW const * pPicS, WW8_PIC* pPic );
+static void WW8PicShadowToReal( WW8_PIC_SHADOW const * pPicS, WW8_PIC* pPic );
bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc)
{
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d7f24bff5596..92d9e9ec5a4f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -176,7 +176,7 @@ static SwMacroInfo* GetMacroInfo( SdrObject* pObj )
return nullptr;
};
-void lclGetAbsPath(OUString& rPath, sal_uInt16 nLevel, SwDocShell const * pDocShell)
+static void lclGetAbsPath(OUString& rPath, sal_uInt16 nLevel, SwDocShell const * pDocShell)
{
OUStringBuffer aTmpStr;
while( nLevel )
@@ -2855,7 +2855,7 @@ void SwWW8ImplReader::PostProcessAttrs()
So a encoding converter that on an undefined character attempts to
convert from 1252 on the undefined character
*/
-std::size_t Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
+static std::size_t Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
sal_Char const *pIn, std::size_t nInLen, sal_Unicode *pOut, std::size_t nOutLen)
{
const sal_uInt32 nFlags =
@@ -4358,7 +4358,7 @@ void wwSectionManager::SetUseOn(wwSection &rSection)
* Set the page descriptor on this node, handle the different cases for a text
* node or a table
*/
-void GiveNodePageDesc(SwNodeIndex const &rIdx, const SwFormatPageDesc &rPgDesc,
+static void GiveNodePageDesc(SwNodeIndex const &rIdx, const SwFormatPageDesc &rPgDesc,
SwDoc &rDoc)
{
/*
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index d1378edf6aac..447083d83ab6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1613,7 +1613,7 @@ enum wwTableSprm
sprmTDefTableNewShd, sprmTCellPadding, sprmTCellPaddingDefault
};
-wwTableSprm GetTableSprm(sal_uInt16 nId, ww::WordVersion eVer)
+static wwTableSprm GetTableSprm(sal_uInt16 nId, ww::WordVersion eVer)
{
switch (eVer)
{
@@ -3072,7 +3072,7 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
}
}
-SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi)
+static SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi)
{
SvxFrameDirection eDir = SvxFrameDirection::Environment;
// 1: Asian layout with rotated CJK characters
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index bda1388f5034..bcfdc2d95e4a 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -477,7 +477,7 @@ static void lcl_CopyGreaterEight(OUString &rDest, OUString const &rSrc,
}
}
-OUString sanitizeString(const OUString& rString)
+static OUString sanitizeString(const OUString& rString)
{
sal_Int32 i=0;
while (i < rString.getLength())
@@ -1495,7 +1495,7 @@ WW8ListManager::~WW8ListManager() COVERITY_NOEXCEPT_FALSE
}
}
-bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
+static bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
{
bool bRet =
(
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 5e275d36034a..b265592e42de 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -305,7 +305,7 @@ static void lcl_ConvertSequenceName(OUString& rSequenceName)
// FindParaStart() finds 1st Parameter that follows '\' and cToken
// and returns start of this parameter or -1
-sal_Int32 FindParaStart( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
+static sal_Int32 FindParaStart( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
{
bool bStr = false; // ignore inside a string
@@ -334,7 +334,7 @@ sal_Int32 FindParaStart( const OUString& rStr, sal_Unicode cToken, sal_Unicode c
// FindPara() finds the first parameter including '\' and cToken.
// A new String will be allocated (has to be deallocated by the caller)
// and everything that is part of the parameter will be returned.
-OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
+static OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
{
sal_Int32 n2; // end
sal_Int32 n = FindParaStart( rStr, cToken, cToken2 ); // start
@@ -408,7 +408,7 @@ bool SwWW8ImplReader::ForceFieldLanguage(SwField &rField, LanguageType nLang)
return bRet;
}
-OUString GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, LanguageType nLang)
+static OUString GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, LanguageType nLang)
{
//Get the system date in the correct final language layout, convert to
//a known language and modify the 2 digit year part to be 4 digit, and
@@ -691,7 +691,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
return nRet;
}
-bool AcceptableNestedField(sal_uInt16 nFieldCode)
+static bool AcceptableNestedField(sal_uInt16 nFieldCode)
{
switch (nFieldCode)
{
@@ -2203,7 +2203,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
//helper function
//For MS MacroButton field, the symbol in plain text is always "(" (0x28),
//which should be mapped according to the macro type
-bool ConvertMacroSymbol( const OUString& rName, OUString& rReference )
+static bool ConvertMacroSymbol( const OUString& rName, OUString& rReference )
{
bool bConverted = false;
if( rReference == "(" )
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 51547066ef96..3cb699a0a0d3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -130,7 +130,7 @@ Color SwWW8ImplReader::GetCol(sal_uInt8 nIco)
return nIco < SAL_N_ELEMENTS(eSwWW8ColA) ? eSwWW8ColA[nIco] : COL_AUTO;
}
-inline sal_uInt32 MSRoundTweak(sal_uInt32 x)
+static inline sal_uInt32 MSRoundTweak(sal_uInt32 x)
{
return x;
}
@@ -1378,7 +1378,7 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP*
return nBorder;
}
-void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace,
+static void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace,
sal_uInt32 cv, short nIdx, SvxBoxItemLine nOOIndex, sal_uInt16 nWWIndex,
short *pSize)
{
@@ -1411,7 +1411,7 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace,
}
-void Set1Border(SvxBoxItem &rBox, const WW8_BRCVer9& rBor, SvxBoxItemLine nOOIndex,
+static void Set1Border(SvxBoxItem &rBox, const WW8_BRCVer9& rBor, SvxBoxItemLine nOOIndex,
sal_uInt16 nWWIndex, short *pSize, const bool bIgnoreSpace)
{
short nSpace;
@@ -1542,7 +1542,7 @@ static void FlySecur1(short& rSize, const bool bBorder)
rSize = nMin;
}
-inline bool SetValSprm( sal_Int16* pVar, WW8PLCFx_Cp_FKP* pPap, sal_uInt16 nId )
+static inline bool SetValSprm( sal_Int16* pVar, WW8PLCFx_Cp_FKP* pPap, sal_uInt16 nId )
{
SprmResult aS = pPap->HasSprm(nId);
if (aS.pSprm && aS.nRemainingData >= 2)
@@ -1550,7 +1550,7 @@ inline bool SetValSprm( sal_Int16* pVar, WW8PLCFx_Cp_FKP* pPap, sal_uInt16 nId )
return aS.pSprm != nullptr;
}
-inline bool SetValSprm( sal_Int16* pVar, const WW8RStyle* pStyle, sal_uInt16 nId )
+static inline bool SetValSprm( sal_Int16* pVar, const WW8RStyle* pStyle, sal_uInt16 nId )
{
SprmResult aS = pStyle->HasParaSprm(nId);
if (aS.pSprm && aS.nRemainingData >= 2)
@@ -4060,7 +4060,7 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short
NewAttr( aLN );
}
-bool lcl_HasExplicitLeft(const WW8PLCFMan *pPlcxMan, bool bVer67)
+static bool lcl_HasExplicitLeft(const WW8PLCFMan *pPlcxMan, bool bVer67)
{
WW8PLCFx_Cp_FKP *pPap = pPlcxMan ? pPlcxMan->GetPapPLCF() : nullptr;
if (pPap)
@@ -5222,14 +5222,14 @@ struct SprmReadInfo
FNReadRecord pReadFnc;
};
-bool operator<(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
+static bool operator<(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
{
return (rFirst.nId < rSecond.nId);
}
typedef ww::SortedArray<SprmReadInfo> wwSprmDispatcher;
-const wwSprmDispatcher *GetWW2SprmDispatcher()
+static const wwSprmDispatcher *GetWW2SprmDispatcher()
{
static SprmReadInfo aSprms[] =
{
@@ -5385,7 +5385,7 @@ const wwSprmDispatcher *GetWW2SprmDispatcher()
return &aSprmSrch;
}
-const wwSprmDispatcher *GetWW6SprmDispatcher()
+static const wwSprmDispatcher *GetWW6SprmDispatcher()
{
static SprmReadInfo aSprms[] =
{
@@ -5597,7 +5597,7 @@ const wwSprmDispatcher *GetWW6SprmDispatcher()
return &aSprmSrch;
}
-const wwSprmDispatcher *GetWW8SprmDispatcher()
+static const wwSprmDispatcher *GetWW8SprmDispatcher()
{
static SprmReadInfo aSprms[] =
{
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b8181307d82d..13c4999c0f46 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -838,33 +838,33 @@ SprmInfo wwSprmParser::GetSprmInfo(sal_uInt16 nId) const
//-end
-inline sal_uInt8 Get_Byte( sal_uInt8 *& p )
+static inline sal_uInt8 Get_Byte( sal_uInt8 *& p )
{
sal_uInt8 n = *p;
p += 1;
return n;
}
-inline sal_uInt16 Get_UShort( sal_uInt8 *& p )
+static inline sal_uInt16 Get_UShort( sal_uInt8 *& p )
{
const sal_uInt16 n = SVBT16ToShort( *reinterpret_cast<SVBT16*>(p) );
p += 2;
return n;
}
-inline sal_Int16 Get_Short( sal_uInt8 *& p )
+static inline sal_Int16 Get_Short( sal_uInt8 *& p )
{
return Get_UShort(p);
}
-inline sal_uInt32 Get_ULong( sal_uInt8 *& p )
+static inline sal_uInt32 Get_ULong( sal_uInt8 *& p )
{
sal_uInt32 n = SVBT32ToUInt32( *reinterpret_cast<SVBT32*>(p) );
p += 4;
return n;
}
-inline sal_Int32 Get_Long( sal_uInt8 *& p )
+static inline sal_Int32 Get_Long( sal_uInt8 *& p )
{
return Get_ULong(p);
}
@@ -2592,12 +2592,12 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::Entry::operator<
return (mnFC < rSecond.mnFC);
}
-bool IsReplaceAllSprm(sal_uInt16 nSpId)
+static bool IsReplaceAllSprm(sal_uInt16 nSpId)
{
return (NS_sprm::LN_PHugePapx == nSpId || 0x6646 == nSpId);
}
-bool IsExpandableSprm(sal_uInt16 nSpId)
+static bool IsExpandableSprm(sal_uInt16 nSpId)
{
return 0x646B == nSpId;
}
@@ -6608,7 +6608,7 @@ MSOFactoidType::MSOFactoidType()
namespace MSOPBString
{
-OUString Read(SvStream& rStream)
+static OUString Read(SvStream& rStream)
{
OUString aRet;
@@ -6624,7 +6624,7 @@ OUString Read(SvStream& rStream)
return aRet;
}
-void Write(const OUString& rString, SvStream& rStream)
+static void Write(const OUString& rString, SvStream& rStream)
{
sal_uInt16 nBuf = 0;
nBuf |= rString.getLength(); // cch, 0..14th bits.
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index d879292d5aba..56cd728628ae 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -132,7 +132,7 @@ bool sw_frmitems_parseXMLBorder( const OUString& rValue,
return rHasStyle || rHasWidth || rHasColor;
}
-void sw_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
+static void sw_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
{
SvxBorderLineStyle eStyle = SvxBorderLineStyle::NONE;
if ( nStyle != table::BorderLineStyle::NONE )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 19:15:00 +0000