diff options
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleStaticTextBase.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/paperinf.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/svxacorr.cxx | 4 | ||||
-rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 6 | ||||
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unonrule.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 8 |
13 files changed, 22 insertions, 22 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 085f7b3062e6..bb796458482d 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet() + static const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet() { // PropertyMap for character and paragraph properties static const SfxItemPropertyMapEntry aPropMap[] = diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index e080ae4468af..f8fd3c1a7b24 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -83,7 +83,7 @@ namespace accessibility // Static Helper - ESelection MakeSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, + static ESelection MakeSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, sal_Int32 nEndPara, sal_Int32 nEndIndex ) { DBG_ASSERT(nStartPara >= 0 && diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0c97c465c441..3c1168901a24 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -60,7 +60,7 @@ using std::endl; using namespace com::sun::star; -std::unique_ptr<XEditAttribute> MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) +static std::unique_ptr<XEditAttribute> MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { // Create thw new attribute in the pool const SfxPoolItem& rNew = rPool.Put( rItem ); @@ -481,7 +481,7 @@ void EditTextObjectImpl::Dump() const } #endif -EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool) +static EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool) { EditEngineItemPool* pRetval = dynamic_cast< EditEngineItemPool* >(pPool); diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 818722b34f57..7d14198c67b2 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -155,7 +155,7 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection ) } /// Translate absolute <-> relative twips: LOK wants absolute coordinates as output and gives absolute coordinates as input. -void lcl_translateTwips(vcl::Window const & rParent, vcl::Window& rChild) +static void lcl_translateTwips(vcl::Window const & rParent, vcl::Window& rChild) { // Don't translate if we already have a non-zero origin. // This prevents multiple translate calls that negate diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index b92feac5ea55..d34b797bc7a2 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1389,7 +1389,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) } -inline bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 ) +static inline bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 ) { if( pBrd1.get() == pBrd2 ) return true; diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index 63066ed180fd..b528acb693d3 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -25,7 +25,7 @@ Description: Is the printer valid --------------------------------------------------------------------*/ -inline bool IsValidPrinter( const Printer* pPtr ) +static inline bool IsValidPrinter( const Printer* pPtr ) { return !pPtr->GetName().isEmpty(); } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 20e64bbadf1c..91b558c756ce 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -104,7 +104,7 @@ static const sal_Char /* also at these ends - Brackets and all kinds of begin characters */ sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94"; -OUString EncryptBlockName_Imp(const OUString& rName); +static OUString EncryptBlockName_Imp(const OUString& rName); static inline bool NonFieldWordDelim( const sal_Unicode c ) { @@ -130,7 +130,7 @@ static inline bool IsUpperLetter( sal_Int32 nCharType ) ( css::i18n::KCharacterType::UPPER & nCharType); } -bool lcl_IsUnsupportedUnicodeChar( CharClass const & rCC, const OUString& rTxt, +static bool lcl_IsUnsupportedUnicodeChar( CharClass const & rCC, const OUString& rTxt, sal_Int32 nStt, sal_Int32 nEnd ) { for( ; nStt < nEnd; ++nStt ) diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 8d12c04e0394..ef0586291479 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1548,7 +1548,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, SkipToken(); } -inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading ) +static inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading ) { nColor = (nColor * nShading) / 100; nFillColor = (nFillColor * ( 100 - nShading )) / 100; diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index f647de146794..6a109d0c19b0 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -119,7 +119,7 @@ private: bool mbInBullet; }; -ESelection MakeEESelection( const SvxAccessibleTextIndex& rStart, const SvxAccessibleTextIndex& rEnd ) +static ESelection MakeEESelection( const SvxAccessibleTextIndex& rStart, const SvxAccessibleTextIndex& rEnd ) { // deal with field special case: to really get a field contained // within a selection, the start index must be before or on the @@ -152,7 +152,7 @@ ESelection MakeEESelection( const SvxAccessibleTextIndex& rStart, const SvxAcces rEnd.GetParagraph(), rEnd.GetEEIndex() ); } -ESelection MakeEESelection( const SvxAccessibleTextIndex& rIndex ) +static ESelection MakeEESelection( const SvxAccessibleTextIndex& rIndex ) { return ESelection( rIndex.GetParagraph(), rIndex.GetEEIndex(), rIndex.GetParagraph(), rIndex.GetEEIndex() + 1 ); diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 7dacb0625390..0ff93ac2ef83 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -67,7 +67,7 @@ public: OUString msPresentation; }; -const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) +static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] = { @@ -203,7 +203,7 @@ static util::DateTime getDate( sal_Int32 nDate ) return aDate; } -inline Date setDate( util::DateTime const & rDate ) +static inline Date setDate( util::DateTime const & rDate ) { return Date( rDate.Day, rDate.Month, rDate.Year ); } @@ -222,7 +222,7 @@ static util::DateTime getTime(sal_Int64 const nTime) return aTime; } -inline tools::Time setTime( util::DateTime const & rDate ) +static inline tools::Time setTime( util::DateTime const & rDate ) { return tools::Time( rDate ); } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 320ccc5a9916..456ac6358115 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -79,7 +79,7 @@ void SvxItemPropertySet::ClearAllUsrAny() } -bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) +static bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { bool bConvert = true; // the default is that all metric items must be converted sal_Int32 nValue = 0; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 74ac1596146a..1f5c104fca9f 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -72,13 +72,13 @@ const o3tl::enumarray<SvxAdjust, unsigned short> aSvxToUnoAdjust text::HoriOrientation::LEFT }; -SvxAdjust ConvertUnoAdjust( unsigned short nAdjust ) +static SvxAdjust ConvertUnoAdjust( unsigned short nAdjust ) { DBG_ASSERT( nAdjust <= 7, "Enum has changed! [CL]" ); return aUnoToSvxAdjust[nAdjust]; } -unsigned short ConvertUnoAdjust( SvxAdjust eAdjust ) +static unsigned short ConvertUnoAdjust( SvxAdjust eAdjust ) { DBG_ASSERT( static_cast<int>(eAdjust) <= 6, "Enum has changed! [CL]" ); return aSvxToUnoAdjust[eAdjust]; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 5d105afbdf71..f1b48747669b 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -100,7 +100,7 @@ const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet() return &aSvxTextPortionPropertySet; } -const SfxItemPropertySet* ImplGetSvxTextPortionSfxPropertySet() +static const SfxItemPropertySet* ImplGetSvxTextPortionSfxPropertySet() { static SfxItemPropertySet aSvxTextPortionSfxPropertySet( ImplGetSvxTextPortionPropertyMap() ); return &aSvxTextPortionSfxPropertySet; @@ -122,7 +122,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() return aSvxUnoOutlinerTextCursorPropertyMap; } -const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() +static const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() { static SfxItemPropertySet aTextCursorSfxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() ); return &aTextCursorSfxPropertySet; @@ -194,7 +194,7 @@ void CheckSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarde } } -void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw() +static void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw() { if (!pEdit) return; @@ -1970,7 +1970,7 @@ void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRa /// @throws lang::IllegalArgumentException /// @throws beans::UnknownPropertyException /// @throws uno::RuntimeException -void SvxPropertyValuesToItemSet( +static void SvxPropertyValuesToItemSet( SfxItemSet &rItemSet, const uno::Sequence< beans::PropertyValue >& rPropertyVaules, const SfxItemPropertySet *pPropSet, |