summaryrefslogtreecommitdiff
path: root/xmloff/source/style
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/style')
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx8
-rw-r--r--xmloff/source/style/XMLBackgroundImageContext.cxx6
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx2
-rw-r--r--xmloff/source/style/bordrhdl.cxx2
-rw-r--r--xmloff/source/style/fonthdl.cxx2
-rw-r--r--xmloff/source/style/xmlbahdl.cxx4
-rw-r--r--xmloff/source/style/xmlnumfe.cxx10
-rw-r--r--xmloff/source/style/xmlnumfi.cxx6
-rw-r--r--xmloff/source/style/xmlnumi.cxx6
9 files changed, 23 insertions, 23 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index eedb4a4a9396..3b4db9324b0d 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -44,7 +44,7 @@ using namespace ::xmloff::token;
//______________________________________________________________________________
-inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
+static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
{
return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) &&
(rLine1.OuterLineWidth == rLine2.OuterLineWidth) &&
@@ -59,20 +59,20 @@ inline sal_Bool operator==( const table::BorderLine2& rLine1, const table::Borde
( rLine1.LineStyle == rLine2.LineStyle );
}
-inline void lcl_RemoveState( XMLPropertyState* pState )
+static inline void lcl_RemoveState( XMLPropertyState* pState )
{
pState->mnIndex = -1;
pState->maValue.clear();
}
-void lcl_RemoveStateIfZero16( XMLPropertyState* pState )
+static void lcl_RemoveStateIfZero16( XMLPropertyState* pState )
{
sal_Int16 nValue = sal_Int16();
if( (pState->maValue >>= nValue) && !nValue )
lcl_RemoveState( pState );
}
-void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const rtl::OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps)
+static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const rtl::OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps)
{
if(::cppu::any2bool(xProps->getPropertyValue(rProperty)))
rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True)));
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index ae1e77b356cf..4d741201f59b 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -63,7 +63,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_BGIMG_OPACITY,
XML_TOK_NGIMG_END=XML_TOK_UNKNOWN
};
-const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
+static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
{
static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
@@ -96,7 +96,7 @@ static SvXMLEnumMapEntry psXML_BrushVertPos[] =
{ XML_TOKEN_INVALID, 0 }
};
-void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos,
+static void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos,
GraphicLocation eHori )
{
DBG_ASSERT( GraphicLocation_LEFT_MIDDLE==eHori ||
@@ -136,7 +136,7 @@ void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos,
}
}
-void lcl_xmlbic_MergeVertPos( GraphicLocation& ePos,
+static void lcl_xmlbic_MergeVertPos( GraphicLocation& ePos,
GraphicLocation eVert )
{
DBG_ASSERT( GraphicLocation_MIDDLE_TOP==eVert ||
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 290dfe6a3640..a5052d021816 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -67,7 +67,7 @@ enum XMLFontStyleAttrTokens
XML_TOK_FONT_STYLE_ATTR_END=XML_TOK_UNKNOWN
};
-const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
+static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
{
static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
{
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 385f82447951..2e0af30537b9 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -101,7 +101,7 @@ static sal_uInt16 const aBorderWidths[] =
DEF_LINE_WIDTH_2
};
-void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sal_uInt16 nStyle )
+static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sal_uInt16 nStyle )
{
sal_Int16 eStyle = -1; // None
if ( nStyle != API_LINE_NONE )
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index f4d1705fa357..3bac8798b09f 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -43,7 +43,7 @@ using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-const SvXMLEnumMapEntry* lcl_getFontFamilyGenericMapping()
+static const SvXMLEnumMapEntry* lcl_getFontFamilyGenericMapping()
{
static SvXMLEnumMapEntry const aFontFamilyGenericMapping[] =
{
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index f4892fffc5c9..cce3e657de5d 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -41,7 +41,7 @@ using ::rtl::OUStringBuffer;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-void lcl_xmloff_setAny( Any& rValue, sal_Int32 nValue, sal_Int8 nBytes )
+static void lcl_xmloff_setAny( Any& rValue, sal_Int32 nValue, sal_Int8 nBytes )
{
switch( nBytes )
{
@@ -65,7 +65,7 @@ void lcl_xmloff_setAny( Any& rValue, sal_Int32 nValue, sal_Int8 nBytes )
}
}
-sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue,
+static sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue,
sal_Int8 nBytes )
{
sal_Bool bRet = sal_False;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 63f8f8ecad5a..aef97f500b51 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -309,7 +309,7 @@ SvXMLNumFmtExport::~SvXMLNumFmtExport()
// helper methods
//
-OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const rtl::OUString& rPrefix )
+static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const rtl::OUString& rPrefix )
{
OUStringBuffer aFmtName( 10L );
aFmtName.append( rPrefix );
@@ -836,7 +836,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
//-------------------------------------------------------------------------
-OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLang )
+static OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLang )
{
// get name of first non-gregorian calendar for the language
@@ -863,7 +863,7 @@ OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLa
//-------------------------------------------------------------------------
-sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sal_uInt16 nPos )
+static sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sal_uInt16 nPos )
{
sal_uInt16 nCount = rEmbeddedEntries.size();
for (sal_uInt16 i=0; i<nCount; i++)
@@ -873,7 +873,7 @@ sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sa
return sal_False; // not found
}
-sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
+static sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
{
// make an extra loop to collect date elements, to check if it is a default format
// before adding the automatic-order attribute
@@ -1769,7 +1769,7 @@ void SvXMLNumFmtExport::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
-const SvNumberformat* lcl_GetFormat( SvNumberFormatter* pFormatter,
+static const SvNumberformat* lcl_GetFormat( SvNumberFormatter* pFormatter,
sal_uInt32 nKey )
{
return ( pFormatter != NULL ) ? pFormatter->GetEntry( nKey ) : NULL;
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index c0035bbd493a..fb126139fa8e 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -770,7 +770,7 @@ void SvXMLNumFmtEmbeddedTextContext::EndElement()
//-------------------------------------------------------------------------
-sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rParent )
+static sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rParent )
{
sal_uInt16 nFormatType = rParent.GetType();
@@ -816,7 +816,7 @@ sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rParent
return sal_False;
}
-void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent )
+static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent )
{
sal_Bool bQuote = sal_True;
sal_Int32 nLength = rContent.getLength();
@@ -1978,7 +1978,7 @@ void SvXMLNumFormatContext::AddNfKeyword( sal_uInt16 nIndex )
}
}
-sal_Bool lcl_IsAtEnd( rtl::OUStringBuffer& rBuffer, const String& rToken )
+static sal_Bool lcl_IsAtEnd( rtl::OUStringBuffer& rBuffer, const String& rToken )
{
sal_Int32 nBufLen = rBuffer.getLength();
xub_StrLen nTokLen = rToken.Len();
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 023059033827..d4af1ab982f9 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -169,7 +169,7 @@ enum SvxXMLTextListLevelStyleAttrTokens
XML_TOK_TEXT_LEVEL_ATTR_END=XML_TOK_UNKNOWN
};
-const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap()
+static const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap()
{
static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
{
@@ -680,7 +680,7 @@ enum SvxXMLStyleAttributesAttrTokens
XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE,
XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN
};
-const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
+static const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
{
static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
{
@@ -1004,7 +1004,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
XML_TOK_STYLE_ATTRIBUTES_LABEL_ALIGNMENT_ATTR_END=XML_TOK_UNKNOWN
};
-const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap()
+static const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap()
{
static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
{