diff options
27 files changed, 41 insertions, 43 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index eb2883bde514..d7bd76fdb315 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2860,7 +2860,7 @@ void SmAttributNode::CreateTextFromNode(String &rText) /**************************************************************************/ -bool lcl_IsFromGreekSymbolSet( const String &rTokenText ) +static bool lcl_IsFromGreekSymbolSet( const String &rTokenText ) { bool bRes = false; diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 51a60c2afbf8..6fcf81712a89 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -1901,7 +1901,7 @@ void SmParser::Font() // gets number used as arguments in Math formulas (e.g. 'size' command) // Format: no negative numbers, must start with a digit, no exponent notation, ... -bool lcl_IsNumber(const rtl::OUString& rText) +static bool lcl_IsNumber(const rtl::OUString& rText) { bool bPoint = false; const sal_Unicode* pBuffer = rText.getStr(); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 74a545d79338..7bfce092c64a 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -231,7 +231,7 @@ enum SmModelPropertyHandles HANDLE_BASELINE }; -PropertySetInfo * lcl_createModelPropertyInfo () +static PropertySetInfo * lcl_createModelPropertyInfo () { static PropertyMapEntry aModelPropertyInfoMap[] = { @@ -387,7 +387,7 @@ sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId ) return SfxBaseModel::getSomething( rId ); } -sal_Int16 lcl_AnyToINT16(const uno::Any& rAny) +static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny) { uno::TypeClass eType = rAny.getValueType().getTypeClass(); diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index e669a7f8e8fe..29a469e03c73 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -66,7 +66,7 @@ using namespace com::sun::star; // alles ohne Which-ID, Map nur fuer PropertySetInfo -const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() { static SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { @@ -88,7 +88,7 @@ const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() return aNumberFormatPropertyMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() { static SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { @@ -103,7 +103,7 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() //---------------------------------------------------------------------------------------- -LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) +static LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) { // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.isEmpty() ) diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 692b228c7da6..db12eda74e33 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3458,7 +3458,7 @@ void SvNumberFormatter::GetCompatibilityCurrency( String& rSymbol, String& rAbbr } -void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr ) +static void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr ) { switch ( rCurr.GetPositiveFormat() ) { @@ -4043,7 +4043,7 @@ sal_uInt16 NfCurrencyEntry::GetEffectivePositiveFormat( //! Call this only if nCurrFormat is really with parentheses! -sal_uInt16 lcl_MergeNegativeParenthesisFormat( sal_uInt16 nIntlFormat, sal_uInt16 nCurrFormat ) +static sal_uInt16 lcl_MergeNegativeParenthesisFormat( sal_uInt16 nIntlFormat, sal_uInt16 nCurrFormat ) { short nSign = 0; // -1:=Klammer 0:=links, 1:=mitte, 2:=rechts switch ( nIntlFormat ) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 447bcf54da32..d479aeff1133 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -547,7 +547,7 @@ SvNumberformat::SvNumberformat( SvNumberformat& rFormat, ImpSvNumberformatScan& ImpCopyNumberformat( rFormat ); } -bool lcl_SvNumberformat_IsBracketedPrefix( short nSymbolType ) +static bool lcl_SvNumberformat_IsBracketedPrefix( short nSymbolType ) { if ( nSymbolType > 0 ) return true; // conditions @@ -4507,7 +4507,7 @@ Color* SvNumberformat::GetColor( sal_uInt16 nNumFor ) const return NumFor[nNumFor].GetColor(); } -void lcl_SvNumberformat_AddLimitStringImpl( String& rStr, +static void lcl_SvNumberformat_AddLimitStringImpl( String& rStr, SvNumberformatLimitOps eOp, double fLimit, const String& rDecSep ) { if ( eOp != NUMBERFORMAT_OP_NO ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index a2b230604088..d4f0535e52a8 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2934,7 +2934,7 @@ void SvImpLBox::PaintDDCursor( SvLBoxEntry* pInsertionPos ) } // Delete all submenus of a PopupMenu, recursively -void lcl_DeleteSubPopups(PopupMenu* pPopup) +static void lcl_DeleteSubPopups(PopupMenu* pPopup) { for(sal_uInt16 i = 0; i < pPopup->GetItemCount(); i++) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 26b284d55ce0..1e0856f9713b 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -397,7 +397,7 @@ long BorderWidthImpl::GetGap( long nWidth ) const return result; } -double lcl_getGuessedWidth( long nTested, double nRate, bool nChanging ) +static double lcl_getGuessedWidth( long nTested, double nRate, bool nChanging ) { double nWidth = -1.0; if ( nChanging ) diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index a69a9a7a3966..6f50eba262c3 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -806,7 +806,7 @@ static void ImplCenterTabPos( Point& rPos, sal_uInt16 nTabStyle ) } // ----------------------------------------------------------------------- -void lcl_RotateRect_Impl(Rectangle& rRect, const long nReference, sal_Bool bRightAligned) +static void lcl_RotateRect_Impl(Rectangle& rRect, const long nReference, sal_Bool bRightAligned) { if(!rRect.IsEmpty()) { diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 18e1752200d4..36321b23b22c 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -67,7 +67,7 @@ HTMLOutContext::~HTMLOutContext() rtl_destroyUnicodeToTextConverter( m_hConv ); } -const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, +static const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, rtl_TextEncoding eDestEnc ) { const sal_Char* pStr = 0; @@ -400,7 +400,7 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, return pStr; } -rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, +static rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, HTMLOutContext& rContext, String *pNonConvertableChars ) { @@ -487,7 +487,7 @@ rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, return aDest.makeStringAndClear(); } -rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) +static rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) { rtl::OStringBuffer aDest; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 3dad1aef8ab0..010bfea18cfa 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -955,7 +955,7 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl) return 0; } -void lcl_Move(Window& rWin, sal_Int32 nDiff) +static void lcl_Move(Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); aPos.Y() -= nDiff; diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 97704f8f9ab2..63cee2bfc570 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -41,7 +41,7 @@ #include "svx/dlgutil.hxx" // local functions -void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) +static void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) { nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) )); nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP ) )); @@ -49,7 +49,7 @@ void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin nMax = static_cast<long>(rField.Denormalize( rField.GetMax( FUNIT_TWIP ) )); } -void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast, long nMin, long nMax) +static void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast, long nMin, long nMax) { rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP ); rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 24bbe33a3947..b6aae0b4b176 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -358,7 +358,7 @@ SvxSearchDialog::~SvxSearchDialog() delete pMoreBtn; } -void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) +static void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) { Point aPos(rWindow.GetPosPixel()); aPos.Y() += nOffset; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 230dd3e193e4..5c5772101b81 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -629,7 +629,7 @@ void DbCellControl::doPropertyListening(const OUString& _rPropertyName) implDoPropertyListening( _rPropertyName ); } //------------------------------------------------------------------------------ -void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster) +static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster) { if ( _pBroadcaster ) { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index e5a8b38cd89e..accb2c1ed08a 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -99,7 +99,7 @@ struct ColumnInfo } }; -void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) +static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); const ::rtl::OUString* pEntries = aEntries.getConstArray(); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index d0206fd9933a..1bff49d54bc7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2194,7 +2194,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } -void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem) +static void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem) { if (bMerge) rAttr.MergeValue(rItem,true); else rAttr.Put(rItem); diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 91774b7873a1..455831207650 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -302,7 +302,7 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() } /// copy a stream from XStorage to temp file -bool lcl_HandlePackageURL( +static bool lcl_HandlePackageURL( ::rtl::OUString const & rURL, SdrModel *const pModel, ::rtl::OUString & o_rTempFileURL) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 9c5c8f89d4e6..06b7caa2d964 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -94,7 +94,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Obj* _pObject) +static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Obj* _pObject) { uno::Reference < beans::XPropertySet > xFrame; if ( _pObject ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 67e67aa12d9c..81192762e963 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -98,8 +98,8 @@ // don't make more than 15 entries visible at once #define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) -void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ); -void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); +static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ); +static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); // namespaces using ::rtl::OUString; @@ -1307,7 +1307,7 @@ sal_Bool SvxFrameWindow_Impl::Close() //======================================================================== // class SvxLineWindow_Impl -------------------------------------------------- //======================================================================== -Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) +static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); } @@ -2627,7 +2627,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, //======================================================================== -void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) +static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) { Size aSize = rWin.GetOutputSizePixel(); aSize.Width() -= 4; @@ -2637,7 +2637,7 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) // ----------------------------------------------------------------------- -void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) +static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { Size aSize = rValueSet.CalcWindowSizePixel( aItemSize ); aSize.Width() += 4; diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 49322e47f08d..cfa436e5c58b 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1769,7 +1769,7 @@ void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw if ( mxTabController.is() && !mbDesignMode ) mxTabController->activateTabOrder(); } -void lcl_ApplyResolverToNestedContainees( const Reference< resource::XStringResourceResolver >& xStringResourceResolver, const Reference< XControlContainer >& xContainer ) +static void lcl_ApplyResolverToNestedContainees( const Reference< resource::XStringResourceResolver >& xStringResourceResolver, const Reference< XControlContainer >& xContainer ) { rtl::OUString aPropName( PROPERTY_RESOURCERESOLVER ); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index f7890f18163f..e525203c2bde 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star; -extern WorkWindow* lcl_GetDefaultWindow(); - // ---------------------------------------------------- // class UnoControlHolder // ---------------------------------------------------- diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index b7364c7d3dec..577e3875ac40 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -238,7 +238,7 @@ void ImplSmartWindowCreated( Window* pNewWindow ) } */ -sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild ) +static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild ) { Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL; while ( pWindow && ( pWindow != pParentWindow ) ) diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 63573594e947..a3eb7626a3e6 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star::configuration; #include <cppuhelper/implbase1.hxx> // helper for implementations #ifdef DBG_UTIL -inline void lcl_CFG_DBG_EXCEPTION(const sal_Char* cText, const Exception& rEx) +static inline void lcl_CFG_DBG_EXCEPTION(const sal_Char* cText, const Exception& rEx) { OString sMsg(cText); sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); @@ -161,7 +161,7 @@ ConfigChangeListener_Impl::~ConfigChangeListener_Impl() { } -sal_Bool lcl_Find( +static sal_Bool lcl_Find( const rtl::OUString& rTemp, const OUString* pCheckPropertyNames, sal_Int32 nLength) @@ -646,7 +646,7 @@ void ConfigItem::RemoveChangesListener() } } -void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eFormat, Reference<XInterface> const& _xParentNode) +static void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eFormat, Reference<XInterface> const& _xParentNode) { switch (_eFormat) { diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 604344ba66f5..961ac7544c17 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -48,7 +48,7 @@ namespace : public rtl::Static<Link, CurrencyChangeLink> {}; } -com::sun::star::lang::Locale lcl_str_to_locale( const ::rtl::OUString rStr ) +static com::sun::star::lang::Locale lcl_str_to_locale( const ::rtl::OUString rStr ) { com::sun::star::lang::Locale aRet; if ( !rStr.isEmpty() ) diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index c144d40d8c23..f97ee77cf824 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -414,7 +414,7 @@ PointerStyles styles[] = { }; -long lcl_loPointerToMsoPointer( PointerStyle eType ) +static long lcl_loPointerToMsoPointer( PointerStyle eType ) { long nRet = msforms::fmMousePointer::fmMousePointerDefault; for ( int i = 0, nElems = SAL_N_ELEMENTS( styles ); i < nElems; ++i ) @@ -428,7 +428,7 @@ long lcl_loPointerToMsoPointer( PointerStyle eType ) return nRet; } -Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) +static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) { Pointer aPointer( POINTER_ARROW ); for ( int i = 0, nElems = SAL_N_ELEMENTS( styles ); i < nElems; ++i ) diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 02a568a7fcac..b1798e38b83b 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -208,7 +208,7 @@ public: }; -uno::Reference<container::XIndexAccess > +static uno::Reference<container::XIndexAccess > lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg ) { return new ControlArrayWrapper( xDlg ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 838606d082d8..d749b6dce96f 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -4060,7 +4060,7 @@ uno::Reference<accessibility::XAccessibleEditableText> return uno::Reference< accessibility::XAccessibleEditableText >(); } -uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText() +static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText() { uno::Reference<accessibility::XAccessibleEditableText> xText; Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin; |