[Libreoffice-commits] .: 3 commits - basic/source connectivity/source cui/source dbaccess/source editeng/source extensions/source forms/source framework/source linguistic/source oox/source reportdesign/source rsc/source sal/rtl scaddins/source sccomp/source sc/inc sc/source sd/source sfx2/source sot/source starmath/source svl/source svtools/source svx/source toolkit/source unotools/source vbahelper/source vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 12 04:35:20 PDT 2012
basic/source/classes/sbunoobj.cxx | 8 +--
basic/source/runtime/methods1.cxx | 6 +-
basic/source/runtime/step0.cxx | 8 +--
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 4 -
connectivity/source/drivers/calc/CTable.cxx | 16 +++---
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/options/optgdlg.cxx | 4 -
cui/source/options/optlingu.cxx | 14 ++---
cui/source/options/optsave.cxx | 2
cui/source/options/treeopt.cxx | 4 -
cui/source/tabpages/autocdlg.cxx | 4 -
cui/source/tabpages/backgrnd.cxx | 6 +-
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/numpages.cxx | 12 ++--
cui/source/tabpages/paragrph.cxx | 2
cui/source/tabpages/swpossizetabpage.cxx | 8 +--
cui/source/tabpages/transfrm.cxx | 4 -
dbaccess/source/core/api/RowSetCache.cxx | 2
editeng/source/editeng/editundo.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit2.cxx | 2
editeng/source/editeng/impedit3.cxx | 4 -
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/frmitems.cxx | 4 -
editeng/source/items/numitem.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/rtf/svxrtf.cxx | 2
extensions/source/bibliography/bibload.cxx | 2
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/bibliography/general.cxx | 4 -
forms/source/xforms/binding.cxx | 18 +++---
forms/source/xforms/model.cxx | 2
forms/source/xforms/model_ui.cxx | 18 +++---
forms/source/xforms/submission.cxx | 2
forms/source/xforms/xmlhelper.cxx | 2
framework/source/uielement/fontmenucontroller.cxx | 2
linguistic/source/dicimp.cxx | 2
linguistic/source/lngopt.cxx | 2
oox/source/export/SchXMLSeriesHelper.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 4 -
rsc/source/prj/gui.cxx | 2
sal/rtl/source/math.cxx | 6 +-
sc/inc/attarray.hxx | 2
sc/inc/compiler.hxx | 2
sc/inc/shapeuno.hxx | 2
sc/source/core/data/attarray.cxx | 8 +--
sc/source/core/data/attrib.cxx | 4 -
sc/source/core/data/cell.cxx | 2
sc/source/core/data/cell2.cxx | 2
sc/source/core/data/column2.cxx | 4 -
sc/source/core/data/column3.cxx | 4 -
sc/source/core/data/conditio.cxx | 6 +-
sc/source/core/data/dociter.cxx | 10 +--
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/documen3.cxx | 6 +-
sc/source/core/data/documen5.cxx | 4 -
sc/source/core/data/document.cxx | 6 +-
sc/source/core/data/dpobject.cxx | 20 +++----
sc/source/core/data/dpoutput.cxx | 2
sc/source/core/data/dpsave.cxx | 4 -
sc/source/core/data/dptabres.cxx | 8 +--
sc/source/core/data/dptabsrc.cxx | 12 ++--
sc/source/core/data/drwlayer.cxx | 8 +--
sc/source/core/data/fillinfo.cxx | 2
sc/source/core/data/patattr.cxx | 2
sc/source/core/data/stlpool.cxx | 2
sc/source/core/data/table3.cxx | 2
sc/source/core/data/table4.cxx | 4 -
sc/source/core/tool/addincol.cxx | 10 +--
sc/source/core/tool/address.cxx | 4 -
sc/source/core/tool/appoptio.cxx | 8 +--
sc/source/core/tool/chgtrack.cxx | 2
sc/source/core/tool/compiler.cxx | 6 +-
sc/source/core/tool/consoli.cxx | 8 +--
sc/source/core/tool/detfunc.cxx | 4 -
sc/source/core/tool/docoptio.cxx | 2
sc/source/core/tool/editutil.cxx | 4 -
sc/source/core/tool/interpr1.cxx | 8 +--
sc/source/core/tool/interpr2.cxx | 4 -
sc/source/core/tool/interpr3.cxx | 14 ++---
sc/source/core/tool/interpr4.cxx | 4 -
sc/source/core/tool/interpr5.cxx | 6 +-
sc/source/core/tool/progress.cxx | 4 -
sc/source/core/tool/rangeseq.cxx | 6 +-
sc/source/core/tool/reffind.cxx | 2
sc/source/core/tool/refupdat.cxx | 18 +++---
sc/source/core/tool/token.cxx | 8 +--
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xeview.cxx | 2
sc/source/filter/html/htmlpars.cxx | 4 -
sc/source/filter/starcalc/collect.cxx | 2
sc/source/filter/starcalc/scflt.cxx | 4 -
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 8 +--
sc/source/filter/xcl97/xcl97rec.cxx | 4 -
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2
sc/source/filter/xml/sheetdata.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 14 ++---
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/app/inputhdl.cxx | 16 +++---
sc/source/ui/app/inputwin.cxx | 12 ++--
sc/source/ui/app/scmod.cxx | 6 +-
sc/source/ui/app/seltrans.cxx | 7 --
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 4 -
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 8 +--
sc/source/ui/docshell/docsh3.cxx | 4 -
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/docsh6.cxx | 4 -
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 8 +--
sc/source/ui/docshell/olinefun.cxx | 4 -
sc/source/ui/docshell/servobj.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 4 -
sc/source/ui/drawfunc/fuins1.cxx | 4 -
sc/source/ui/drawfunc/futext.cxx | 4 -
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 4 -
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/miscdlgs/conflictsdlg.cxx | 8 +--
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/miscdlgs/solverutil.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 2
sc/source/ui/navipi/content.cxx | 10 +--
sc/source/ui/pagedlg/areasdlg.cxx | 18 +++---
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 16 +++---
sc/source/ui/undo/areasave.cxx | 2
sc/source/ui/undo/undoblk.cxx | 4 -
sc/source/ui/undo/undoblk3.cxx | 2
sc/source/ui/undo/undostyl.cxx | 2
sc/source/ui/undo/undotab.cxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 6 +-
sc/source/ui/unoobj/cellsuno.cxx | 44 ++++++++---------
sc/source/ui/unoobj/chartuno.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 16 +++---
sc/source/ui/unoobj/datauno.cxx | 6 +-
sc/source/ui/unoobj/defltuno.cxx | 2
sc/source/ui/unoobj/dispuno.cxx | 4 -
sc/source/ui/unoobj/docuno.cxx | 12 ++--
sc/source/ui/unoobj/eventuno.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 10 +--
sc/source/ui/unoobj/forbiuno.cxx | 2
sc/source/ui/unoobj/funcuno.cxx | 6 +-
sc/source/ui/unoobj/linkuno.cxx | 6 +-
sc/source/ui/unoobj/nameuno.cxx | 6 +-
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 28 +++++-----
sc/source/ui/unoobj/srchuno.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 14 ++---
sc/source/ui/unoobj/targuno.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/unoobj/tokenuno.cxx | 6 +-
sc/source/ui/unoobj/viewuno.cxx | 8 +--
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbaborders.cxx | 2
sc/source/ui/vba/vbafont.cxx | 2
sc/source/ui/vba/vbaformatcondition.cxx | 2
sc/source/ui/vba/vbainterior.cxx | 2
sc/source/ui/vba/vbarange.cxx | 28 +++++-----
sc/source/ui/vba/vbastyle.cxx | 2
sc/source/ui/vba/vbastyles.cxx | 2
sc/source/ui/vba/vbavalidation.cxx | 4 -
sc/source/ui/vba/vbawindows.cxx | 2
sc/source/ui/vba/vbaworksheets.cxx | 2
sc/source/ui/view/cellsh.cxx | 4 -
sc/source/ui/view/cellsh2.cxx | 4 -
sc/source/ui/view/colrowba.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 4 -
sc/source/ui/view/drawvie4.cxx | 8 +--
sc/source/ui/view/editsh.cxx | 6 +-
sc/source/ui/view/gridwin.cxx | 22 ++++----
sc/source/ui/view/gridwin4.cxx | 8 +--
sc/source/ui/view/notemark.cxx | 4 -
sc/source/ui/view/olinewin.cxx | 2
sc/source/ui/view/output.cxx | 10 +--
sc/source/ui/view/output2.cxx | 14 ++---
sc/source/ui/view/preview.cxx | 4 -
sc/source/ui/view/prevloc.cxx | 2
sc/source/ui/view/printfun.cxx | 12 ++--
sc/source/ui/view/tabcont.cxx | 2
sc/source/ui/view/tabview.cxx | 10 +--
sc/source/ui/view/tabview2.cxx | 2
sc/source/ui/view/tabview3.cxx | 2
sc/source/ui/view/tabview4.cxx | 4 -
sc/source/ui/view/tabvwsh3.cxx | 4 -
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 2
sc/source/ui/view/tabvwshh.cxx | 2
sc/source/ui/view/viewfun2.cxx | 12 ++--
sc/source/ui/view/viewfun3.cxx | 2
sc/source/ui/view/viewfun7.cxx | 2
sc/source/ui/view/viewfunc.cxx | 4 -
scaddins/source/analysis/analysishelper.cxx | 4 -
scaddins/source/analysis/financial.cxx | 4 -
sccomp/source/solver/solver.cxx | 8 +--
sd/source/core/drawdoc3.cxx | 2
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/prntopts.cxx | 2
sd/source/ui/unoidl/unoobj.cxx | 14 ++---
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/control/templatelocalview.cxx | 4 -
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/objuno.cxx | 2
sfx2/source/doc/templatedlg.cxx | 10 +--
sot/source/sdstor/stgcache.cxx | 2
starmath/source/node.cxx | 2
starmath/source/parse.cxx | 2
starmath/source/unomodel.cxx | 4 -
svl/source/numbers/numfmuno.cxx | 6 +-
svl/source/numbers/zforlist.cxx | 4 -
svl/source/numbers/zformat.cxx | 4 -
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/control/ctrlbox.cxx | 2
svtools/source/control/ruler.cxx | 2
svtools/source/svhtml/htmlout.cxx | 6 +-
svx/source/dialog/hdft.cxx | 2
svx/source/dialog/optgrid.cxx | 4 -
svx/source/dialog/srchdlg.cxx | 2
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/tabwin.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdomedia.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 10 +--
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/unocontrolcontainer.cxx | 2
toolkit/source/helper/unowrapper.cxx | 2
unotools/source/config/configitem.cxx | 6 +-
unotools/source/config/syslocaleoptions.cxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 4 -
vbahelper/source/msforms/vbacontrols.cxx | 2
vcl/unx/gtk/window/gtkframe.cxx | 2
240 files changed, 610 insertions(+), 613 deletions(-)
New commits:
commit 83154f9234659585cdac1c2e6781cd3498ff4a51
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Oct 12 13:33:22 2012 +0200
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I37b2c7b7acd31437f4be74b0163f4dac2279655b
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index eb2883b..d7bd76f 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 51a60c2..6fcf817 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 74a545d..7bfce09 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 e669a7f..29a469e 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 692b228..db12eda 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 447bcf5..d479aef 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 a2b2306..d4f0535 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 26b284d..1e0856f 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 a69a9a7..6f50eba 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 18e1752..36321b2 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 3dad1ae..010bfea 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 97704f8..63cee2b 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 24bbe33..b6aae0b 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 230dd3e..5c57721 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 e5a8b38..accb2c1 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 d0206fd..1bff49d 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 91774b7..4558312 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 9c5c8f8..06b7caa 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 67e67aa..8119276 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 49322e4..cfa436e 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 f7890f1..e525203 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 b7364c7..577e387 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 6357359..a3eb762 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 604344b..961ac75 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 c144d40..f97ee77 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 02a568a..b1798e3 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 838606d..d749b6d 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;
commit 190334febe62d56d80489034f0ee3cf59100f6c4
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Oct 12 13:30:30 2012 +0200
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I1a0e436051d48e7f6224d6f0fc602347df2d4df1
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index d963d2c..8dce89a 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -458,7 +458,7 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const
return m_xCursor;
}
-rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns,
+static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns,
const Mapping* pMapping, const String& rColumnName)
{
String sColumnName(rColumnName);
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 242733b..3aed966 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -289,7 +289,7 @@ public:
};
-sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
+static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
const ::rtl::OUString& rLogicalColumnName)
{
for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++)
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 554ef62..0ca51d1 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -409,7 +409,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
return bResult;
}
-Window* lcl_GetFocusChild( Window* pParent )
+static Window* lcl_GetFocusChild( Window* pParent )
{
sal_uInt16 nChildren = pParent->GetChildCount();
for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index ca25076..eccb955 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -65,7 +65,7 @@ using namespace ::rtl;
#define C2S(cChar) String::CreateFromAscii(cChar)
#define DISTANCE_CONTROL_TO_FIXEDTEXT 5
-::Point lcl_MovePoint(const FixedText& rFixedText)
+static ::Point lcl_MovePoint(const FixedText& rFixedText)
{
::Point aRet(rFixedText.GetPosPixel());
aRet.X() += rFixedText.GetSizePixel().Width();
@@ -74,7 +74,7 @@ using namespace ::rtl;
}
//-----------------------------------------------------------------------------
-OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
+static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
{
BibConfig* pBibConfig = BibModul::GetConfig();
OUString sRet = pBibConfig->GetDefColumnName(nIndexPos);
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 2770906..39658f1 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -840,7 +840,7 @@ sal_Bool SAL_CALL
return bRes;
}
-void lcl_SequenceRemoveElementAt(
+static void lcl_SequenceRemoveElementAt(
uno::Sequence< uno::Reference< XDictionaryEntry > >& rEntries, int nPos )
{
//TODO: helper for SequenceRemoveElementAt available?
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 37af9e9..8568661 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -142,7 +142,7 @@ OUString LinguOptions::GetName( sal_Int32 nWID )
//! map must be sorted by first entry in alphabetical increasing order.
-const SfxItemPropertyMapEntry* lcl_GetLinguProps()
+static const SfxItemPropertyMapEntry* lcl_GetLinguProps()
{
static const SfxItemPropertyMapEntry aLinguProps[] =
{
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index 4f59040..0d5b034 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -100,7 +100,7 @@ using ::rtl::OUString;
return aRet;
}
-uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries(
+static uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries(
const uno::Reference< chart2::XDiagram >& xDiagram
, const Reference< chart2::XDataSeries >& xSeries )
{
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 279aeba..8a46d0a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -230,7 +230,7 @@ namespace
}
// -----------------------------------------------------------------------------
-void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
+static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
ODesignView* _pView,
uno::Reference< awt::XWindow>& _xWindow,
::std::vector< uno::Reference< uno::XInterface > >& _rControlsFormats)
@@ -2298,7 +2298,7 @@ void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) th
}
// -----------------------------------------------------------------------------
-sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups
+static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups
,sal_Int32 _nGroupPos
,::std::mem_fun_t<sal_Bool,OGroupHelper>&_pGroupMemberFunction)
{
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index b3a3e88..2c7ff3c 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -40,7 +40,7 @@ static RscCompiler * pRscCompiler = NULL;
delete pRscCompiler;
}
-RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
+static RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
{
for ( int i = 0; i < argc; ++i )
{
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index 67b3a51..a6f05b9 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -78,7 +78,7 @@ static double getN10Exp( int nExp )
}
/** Approximation algorithm for erf for 0 < x < 0.65. */
-void lcl_Erf0065( double x, double& fVal )
+static void lcl_Erf0065( double x, double& fVal )
{
static const double pn[] = {
1.12837916709551256,
@@ -107,7 +107,7 @@ void lcl_Erf0065( double x, double& fVal )
}
/** Approximation algorithm for erfc for 0.65 < x < 6.0. */
-void lcl_Erfc0600( double x, double& fVal )
+static void lcl_Erfc0600( double x, double& fVal )
{
double fPSum = 0.0;
double fQSum = 0.0;
@@ -172,7 +172,7 @@ void lcl_Erfc0600( double x, double& fVal )
/** Approximation algorithm for erfc for 6.0 < x < 26.54 (but used for all
x > 6.0). */
-void lcl_Erfc2654( double x, double& fVal )
+static void lcl_Erfc2654( double x, double& fVal )
{
static const double pn[] = {
5.64189583547756078E-1,
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index cdd6ed1..b075baf 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1176,7 +1176,7 @@ double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
//-------
// COUPPCD: find last coupon date before settlement (can be equal to settlement)
-void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
+static void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
throw( lang::IllegalArgumentException )
{
rDate = rMat;
@@ -1201,7 +1201,7 @@ double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
//-------
// COUPNCD: find first coupon date after settlement (is never equal to settlement)
-void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
+static void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
throw( lang::IllegalArgumentException )
{
rDate = rMat;
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index 14415dd..eb1cac5 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -455,7 +455,7 @@ double SAL_CALL AnalysisAddIn::getOddlyield( constREFXPS& xOpt,
#define D_(i) (*rDates.Get(i))
/** Calculates the resulting amount for the passed interest rate and the given XIRR parameters. */
-double lcl_sca_XirrResult( const ScaDoubleList& rValues, const ScaDoubleList& rDates, double fRate )
+static double lcl_sca_XirrResult( const ScaDoubleList& rValues, const ScaDoubleList& rDates, double fRate )
{
/* V_0 ... V_n = input values.
D_0 ... D_n = input dates.
@@ -477,7 +477,7 @@ double lcl_sca_XirrResult( const ScaDoubleList& rValues, const ScaDoubleList& rD
}
/** Calculates the first derivation of lcl_sca_XirrResult(). */
-double lcl_sca_XirrResult_Deriv1( const ScaDoubleList& rValues, const ScaDoubleList& rDates, double fRate )
+static double lcl_sca_XirrResult_Deriv1( const ScaDoubleList& rValues, const ScaDoubleList& rDates, double fRate )
{
/* V_0 ... V_n = input values.
D_0 ... D_n = input dates.
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index b04f1a1..fa50695 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -71,7 +71,7 @@ using ::rtl::OUString;
static ResMgr* pSolverResMgr = NULL;
-OUString lcl_GetResourceString( sal_uInt32 nId )
+static OUString lcl_GetResourceString( sal_uInt32 nId )
{
if (!pSolverResMgr)
pSolverResMgr = ResMgr::CreateResMgr("solver");
@@ -123,7 +123,7 @@ typedef boost::unordered_map< table::CellAddress, std::vector<double>, ScSolverC
// -----------------------------------------------------------------------
-uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
const table::CellAddress& rPos )
{
uno::Reference<container::XIndexAccess> xSheets( xDoc->getSheets(), uno::UNO_QUERY );
@@ -131,13 +131,13 @@ uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadshe
return xSheet->getCellByPosition( rPos.Column, rPos.Row );
}
-void lcl_SetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static void lcl_SetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
const table::CellAddress& rPos, double fValue )
{
lcl_GetCell( xDoc, rPos )->setValue( fValue );
}
-double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+static double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
const table::CellAddress& rPos )
{
return lcl_GetCell( xDoc, rPos )->getValue();
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index ab8b0e5..50a3466 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -127,7 +127,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
|*
\************************************************************************/
-void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBookmarkDoc,
+static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBookmarkDoc,
const std::vector<rtl::OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount,
InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator )
{
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 8653fc6..6e23f76 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -388,7 +388,7 @@ static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
// -----------------------------------------------------------------------------
-bool lcl_HasOnlyOneTable( SdrModel* pModel )
+static bool lcl_HasOnlyOneTable( SdrModel* pModel )
{
if ( pModel )
{
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index ed7976a..1f67940 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -258,7 +258,7 @@ void SdPrintOptions::updateControls()
aCbxPagename.Enable( !aRbtBooklet.IsChecked() && (aCbxDraw.IsChecked() || aCbxNotes.IsChecked() || aCbxOutline.IsChecked()) );
}
-void lcl_MoveRB_Impl(Window& rBtn, long nXDiff)
+static void lcl_MoveRB_Impl(Window& rBtn, long nXDiff)
{
Point aPos(rBtn.GetPosPixel());
aPos.X() -= nXDiff;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index c0f468c..5dda9c7 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -171,7 +171,7 @@ static SdTypesCache gImplTypesCache;
{ 0,0,0,0,0,0}
- const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
+ static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
{
static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] =
@@ -182,7 +182,7 @@ static SdTypesCache gImplTypesCache;
return aImpress_SdXShapePropertyGraphicMap_Impl;
}
- const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertySimpleMap_Impl()
+ static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertySimpleMap_Impl()
{
static const SfxItemPropertyMapEntry aImpress_SdXShapePropertySimpleMap_Impl[] =
@@ -199,7 +199,7 @@ static SdTypesCache gImplTypesCache;
{ MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\
{ 0,0,0,0,0,0}
- const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
+ static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
{
static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyMap_Impl[] =
{
@@ -207,7 +207,7 @@ static SdTypesCache gImplTypesCache;
};
return aDraw_SdXShapePropertyMap_Impl;
}
- const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()
+ static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()
{
static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] =
{
@@ -216,7 +216,7 @@ static SdTypesCache gImplTypesCache;
};
return aDraw_SdXShapePropertyGraphicMap_Impl;
}
- const SfxItemPropertyMapEntry* lcl_ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool bGraphicObj )
+ static const SfxItemPropertyMapEntry* lcl_ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool bGraphicObj )
{
const SfxItemPropertyMapEntry* pRet = 0;
if( bImpress )
@@ -236,7 +236,7 @@ static SdTypesCache gImplTypesCache;
return pRet;
}
- const SvxItemPropertySet* lcl_ImplGetShapePropertySet( sal_Bool bImpress, sal_Bool bGraphicObj )
+ static const SvxItemPropertySet* lcl_ImplGetShapePropertySet( sal_Bool bImpress, sal_Bool bGraphicObj )
{
const SvxItemPropertySet* pRet = 0;
if( bImpress )
@@ -267,7 +267,7 @@ static SdTypesCache gImplTypesCache;
}
return pRet;
}
- const SfxItemPropertyMapEntry* lcl_GetEmpty_SdXShapePropertyMap_Impl()
+ static const SfxItemPropertyMapEntry* lcl_GetEmpty_SdXShapePropertyMap_Impl()
{
static SfxItemPropertyMapEntry aEmpty_SdXShapePropertyMap_Impl[] =
{
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8e360c6..09268a3 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2016,7 +2016,7 @@ long TextWin_Impl::Notify( NotifyEvent& rNEvt )
// -----------------------------------------------------------------------
// remove docking area acceptor from layoutmanager, so it will not layout anything further .-)
-void lcl_disableLayoutOfFrame(const Reference< XFrame >& xFrame)
+static void lcl_disableLayoutOfFrame(const Reference< XFrame >& xFrame)
{
static const ::rtl::OUString PROP_LAYOUT_MANAGER(DEFINE_CONST_UNICODE("LayoutManager"));
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index a9754b4..820ec14 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -31,7 +31,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
-void lcl_updateThumbnails (TemplateLocalViewItem *pItem);
+static void lcl_updateThumbnails (TemplateLocalViewItem *pItem);
class FolderFilter_Application
{
@@ -742,7 +742,7 @@ IMPL_LINK(TemplateLocalView, ChangeNameHdl, TemplateView*, pView)
return true;
}
-void lcl_updateThumbnails (TemplateLocalViewItem *pItem)
+static void lcl_updateThumbnails (TemplateLocalViewItem *pItem)
{
pItem->maPreview1.Clear();
pItem->maPreview2.Clear();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e501569..e92b7f0 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2497,7 +2497,7 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox
IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
//-------------------------------------------------------------------------
-::rtl::OUString lcl_GetLabel(uno::Any& rAny)
+static ::rtl::OUString lcl_GetLabel(uno::Any& rAny)
{
::rtl::OUString sRet;
uno::Sequence< beans::PropertyValue >aPropSeq;
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 4f5c8e1..336affb 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -86,7 +86,7 @@ using namespace ::com::sun::star;
#define PROPERTY_UNBOUND 0
#define PROPERTY_MAYBEVOID ::com::sun::star::beans::PropertyAttribute::MAYBEVOID
-const SfxItemPropertyMapEntry* lcl_GetDocInfoPropertyMap()
+static const SfxItemPropertyMapEntry* lcl_GetDocInfoPropertyMap()
{
static SfxItemPropertyMapEntry aDocInfoPropertyMap_Impl[] =
{
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a01366b..c79c779 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -64,11 +64,11 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
-void lcl_createTemplate(uno::Reference<XComponentLoader> xDesktop, const FILTER_APPLICATION eApp);
+static void lcl_createTemplate(uno::Reference<XComponentLoader> xDesktop, const FILTER_APPLICATION eApp);
-bool lcl_getServiceName (const OUString &rFileURL, OUString &rName );
+static bool lcl_getServiceName (const OUString &rFileURL, OUString &rName );
-std::vector<OUString> lcl_getAllFactoryURLs ();
+static std::vector<OUString> lcl_getAllFactoryURLs ();
// Sort by name in ascending order
class SortView_Name
@@ -1471,7 +1471,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId)
SearchUpdateHdl(mpSearchEdit);
}
-bool lcl_getServiceName ( const OUString &rFileURL, OUString &rName )
+static bool lcl_getServiceName ( const OUString &rFileURL, OUString &rName )
{
bool bRet = false;
@@ -1499,7 +1499,7 @@ bool lcl_getServiceName ( const OUString &rFileURL, OUString &rName )
return bRet;
}
-std::vector<OUString> lcl_getAllFactoryURLs ()
+static std::vector<OUString> lcl_getAllFactoryURLs ()
{
SvtModuleOptions aModOpt;
std::vector<OUString> aList;
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index e787c08..00c20d4 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -80,7 +80,7 @@ bool StgPage::IsPageGreater( const StgPage *pA, const StgPage *pB )
// The disk cache holds the cached sectors. The sector type differ according
// to their purpose.
-sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short nPageSize )
+static sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short nPageSize )
{
// return (nFileSize >= 512) ? (nFileSize - 512) / nPageSize : 0;
// #i61980# reallife: last page may be incomplete, return number of *started* pages
commit f7a24eff2d40ca30c6f299ab6534393c5c146b95
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Oct 12 13:26:46 2012 +0200
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 6735dfe..cd43e1b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -494,7 +494,7 @@ void clearNativeObjectWrapperVector( void )
GaNativeObjectWrapperVector::get().clear();
}
-sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
+static sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
{
NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get();
sal_uInt32 nIndex = rNativeObjectWrapperVector.size();
@@ -502,7 +502,7 @@ sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
return nIndex;
}
-SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
+static SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
{
SbxObjectRef xRetObj;
NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get();
@@ -4552,7 +4552,7 @@ typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
static DisposeItemVector GaDisposeItemVector;
-DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
+static DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
{
DisposeItemVector::iterator it;
for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it )
@@ -4564,7 +4564,7 @@ DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
return GaDisposeItemVector.end();
}
-StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
+static StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
{
DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL;
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 4692ca4..7072c09 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -915,7 +915,7 @@ RTLFUNC(FindPropertyObject)
-sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
sal_uIntPtr nFPos = pStrm->Tell();
@@ -1001,7 +1001,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
return pStrm->GetErrorCode() ? sal_False : sal_True;
}
-sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
(void)bBinary;
@@ -1111,7 +1111,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
// nCurDim = 1...n
-sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
{
DBG_ASSERT( nCurDim > 0,"Bad Dim");
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 40d8f69..05a2759 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -43,8 +43,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
// for a patch forward declaring these methods below makes sense
// but, #FIXME lets really just move the methods to the top
-void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
-void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
+static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType );
+static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled );
SbxVariable* getDefaultProp( SbxVariable* pRef );
@@ -972,7 +972,7 @@ void SbiRuntime::StepREDIMP_ERASE()
refVar->SetType( SbxEMPTY );
}
-void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
+static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
{
sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
@@ -981,7 +981,7 @@ void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
refVar->Clear();
}
-void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled )
+static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled )
{
SbxDataType eType = refVar->GetType();
if( eType & SbxARRAY )
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index a72ab7a..9afd1b1 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce
// -------------------------------------------------------------------------
-sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName )
{
Any aAny = xSheets->getByName( rName );
Reference<XSpreadsheet> xSheet;
@@ -326,7 +326,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r
return sal_False;
}
-sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName )
{
sal_Bool bUnnamed = sal_False;
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 3d0f2cb..da8cbe5 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::util;
-void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
+static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_UpdateArea" );
// update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below
@@ -90,7 +90,7 @@ void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol
}
}
-void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount )
+static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetDataArea" );
Reference<XSheetCellCursor> xCursor = xSheet->createCursor();
@@ -140,7 +140,7 @@ void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnC
rRowCount = nEndRow; // first row (headers) is not counted
}
-CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
+static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetContentOrResultType" );
CellContentType eCellType = xCell->getType();
@@ -160,7 +160,7 @@ CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
return eCellType;
}
-Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
+static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetUsedCell" );
Reference<XCell> xCell = xSheet->getCellByPosition( nDocColumn, nDocRow );
@@ -198,7 +198,7 @@ Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int
return xCell;
}
-bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
+static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_HasTextInColumn" );
// look for any text cell or text result in the column
@@ -226,7 +226,7 @@ bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocC
return false;
}
-void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats,
+static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats,
sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders,
::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
{
@@ -314,7 +314,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X
// -------------------------------------------------------------------------
-void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
+static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
sal_Int32 nStartCol, sal_Int32 nStartRow, sal_Bool bHasHeaders,
const ::Date& rNullDate,
sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType )
@@ -431,7 +431,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
// -------------------------------------------------------------------------
-::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn )
+static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetColumnStr" );
if ( nColumn < 26 )
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 1a43828..54f94cf 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1925,7 +1925,7 @@ struct LanguagePosition_Impl
};
typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl;
-void lcl_InsertBreakPosition_Impl(
+static void lcl_InsertBreakPosition_Impl(
LanguagePositions_Impl& rBreakPositions, sal_uInt16 nInsert, LanguageType eLanguage)
{
LanguagePositions_Impl::iterator aStart = rBreakPositions.begin();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5484fd8..6567e7b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1359,7 +1359,7 @@ SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAtt
return new OfaLanguagesTabPage(pParent, rAttrSet);
}
-LanguageType lcl_LangStringToLangType(const OUString& rLang)
+static LanguageType lcl_LangStringToLangType(const OUString& rLang)
{
Locale aLocale;
sal_Int32 nSep = rLang.indexOf('-');
@@ -1375,7 +1375,7 @@ LanguageType lcl_LangStringToLangType(const OUString& rLang)
return eLangType;
}
-void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
+static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
{
SfxViewFrame* pCurrentFrm = SfxViewFrame::Current();
SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index cae5377..dab862d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -261,7 +261,7 @@ void DicUserData::SetChecked( sal_Bool bVal )
// class BrwString_Impl -------------------------------------------------
-void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck )
+static void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck )
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
@@ -566,7 +566,7 @@ public:
};
-sal_Int32 lcl_SeqGetIndex( const Sequence< OUString > &rSeq, const OUString &rTxt )
+static sal_Int32 lcl_SeqGetIndex( const Sequence< OUString > &rSeq, const OUString &rTxt )
{
sal_Int32 nRes = -1;
sal_Int32 nLen = rSeq.getLength();
@@ -644,7 +644,7 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp
//-----------------------------------------------------------------------------
-void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd)
+static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd)
{
const Locale* pAdd = rAdd.getConstArray();
Sequence<Locale> aLocToAdd(rAdd.getLength());
@@ -672,7 +672,7 @@ void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >&
pAllLocales2[nLength++] = pLocToAdd[i];
}
-void lcl_MergeDisplayArray(
+static void lcl_MergeDisplayArray(
SvxLinguData_Impl &rData,
const ServiceInfo_Impl &rToAdd )
{
@@ -1195,14 +1195,14 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
//------------------------------------------------------------------------
-Any lcl_Bool2Any(sal_Bool bVal)
+static Any lcl_Bool2Any(sal_Bool bVal)
{
Any aRet(&bVal, ::getBooleanCppuType());
return aRet;
}
-sal_Bool lcl_Bool2Any(Any& rVal)
+static sal_Bool lcl_Bool2Any(Any& rVal)
{
return *(sal_Bool*)rVal.getValue();
}
@@ -2120,7 +2120,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
return 0;
}
-OUString lcl_GetServiceName(sal_uInt8 nType)
+static OUString lcl_GetServiceName(sal_uInt8 nType)
{
switch(nType)
{
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index f8a5b01..d818d91 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -542,7 +542,7 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
return 0;
}
-OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
+static OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
{
OUString sRet;
const PropertyValue* pProperties = rProperties.getConstArray();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0403d1a..3f57e56 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2162,7 +2162,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
return aOutNodeList;
}
-sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB )
+static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB )
{
String sGroupName( rGroupName );
sal_uInt16 nRet = 0;
@@ -2182,7 +2182,7 @@ sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox&
return USHRT_MAX;
}
-void lcl_insertLeaf(
+static void lcl_insertLeaf(
OfaTreeOptionsDialog* pDlg, OptionsNode* pNode, OptionsLeaf* pLeaf, const SvTreeListBox& rTreeLB )
{
sal_uInt16 nGrpId = lcl_getGroupId( pNode->m_sLabel, rTreeLB );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 646e48b..1c6e725 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -152,7 +152,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS );
}
-sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry,
+static sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry,
CollatorWrapper& rCmpClass )
{
sal_uInt16 nCount = rLB.GetEntryCount();
@@ -1342,7 +1342,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
return 0;
}
-sal_Bool lcl_FindInArray(std::vector<rtl::OUString>& rStrings, const String& rString)
+static sal_Bool lcl_FindInArray(std::vector<rtl::OUString>& rStrings, const String& rString)
{
for(std::vector<rtl::OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i)
{
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 930e380..76feb79 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -100,16 +100,16 @@ struct SvxBackgroundPage_Impl
pLoadTimer(NULL), bIsImportDlgInExecute(sal_False) {}
};
-inline sal_uInt8 lcl_PercentToTransparency(long nPercent)
+static inline sal_uInt8 lcl_PercentToTransparency(long nPercent)
{
//0xff must not be returned!
return sal_uInt8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0);
}
-inline sal_uInt8 lcl_TransparencyToPercent(sal_uInt8 nTrans)
+static inline sal_uInt8 lcl_TransparencyToPercent(sal_uInt8 nTrans)
{
return (nTrans * 100 + 127) / 254;
}
-void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
+static void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
{
uno::Any aTransparency;
aTransparency <<= (sal_Int8)nTransparency;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 89bd14f..8a44475 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -75,7 +75,7 @@ static sal_uInt16 pRanges[] =
};
// -----------------------------------------------------------------------
-void lcl_SetDecimalDigitsTo1(MetricField& rField)
+static void lcl_SetDecimalDigitsTo1(MetricField& rField)
{
sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
rField.SetDecimalDigits(1);
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 84de225..2297dd8 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -36,7 +36,7 @@
#define TWIP_TO_INCH 1440
-inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
+static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
{
return static_cast<long>(rMetric.Denormalize( rMetric.GetValue( eUnit )));
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 808c6cb..b4ee86b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -101,14 +101,14 @@ static const sal_Char cSuffix[] = "Suffix";
static const sal_Char cBulletChar[] = "BulletChar";
static const sal_Char cBulletFontName[] = "BulletFontName";
-Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
+static Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
{
Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
Reference<XDefaultNumberingProvider> xRet = text::DefaultNumberingProvider::create(xContext);
return xRet;
}
-SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps)
+static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps)
{
const PropertyValue* pValues = rLevelProps.getConstArray();
SvxNumSettings_Impl* pNew = new SvxNumSettings_Impl;
@@ -154,7 +154,7 @@ static sal_Char const aNumChar[] =
};
// Is one of the masked formats set?
-sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
+static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
{
sal_Bool bRet = sal_False;
sal_uInt16 nMask = 1;
@@ -167,7 +167,7 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
return bRet;
}
-Font& lcl_GetDefaultBulletFont()
+static Font& lcl_GetDefaultBulletFont()
{
static sal_Bool bInit = 0;
static Font aDefBulletFont( rtl::OUString("StarSymbol"),
@@ -2257,7 +2257,7 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
return 0;
}
-sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart,
+static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart,
sal_uInt16 nYStart, sal_uInt16 nDivision)
{
const SvxBrushItem* pBrushItem = rFmt.GetBrush();
@@ -2279,7 +2279,7 @@ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sa
}
-sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
+static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
const SvxNumberFormat& rFmt, sal_uInt16 nXStart,
sal_uInt16 nYStart, const Size& rSize)
{
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7a8348f..91a376c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2291,7 +2291,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
return bRet;
}
-void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox)
+static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox)
{
sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId);
SfxItemState eState = rSet.GetItemState(_nWhich, sal_True);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index db44837..73c0e0f 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -354,7 +354,7 @@ static FrmMap aVAsCharHtmlMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::LINE_CENTER, LB_REL_ROW}
};
-std::size_t lcl_GetFrmMapCount(const FrmMap* pMap)
+static std::size_t lcl_GetFrmMapCount(const FrmMap* pMap)
{
if( pMap )
{
@@ -407,7 +407,7 @@ std::size_t lcl_GetFrmMapCount(const FrmMap* pMap)
return 0;
}
-SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(
+static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(
SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bRTL)
{
//special handling of STR_FROMLEFT
@@ -466,7 +466,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(
}
// #i22341# - helper method in order to determine all possible
// listbox relations in a relation map for a given relation
-sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel )
+static sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel )
{
sal_uLong nLBRelations = 0L;
@@ -483,7 +483,7 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel )
// #i22341# - helper method on order to determine all possible
// listbox relations in a relation map for a given string ID
-sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
+static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
const SvxSwFramePosString::StringId _eStrId,
const bool _bUseMirrorStr )
{
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 93d83ae..752a5b0 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -80,7 +80,7 @@ static sal_uInt16 pSlantRanges[] =
0
};
-void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const MapUnit ePoolUnit, const FieldUnit eDlgUnit)
+static void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const MapUnit ePoolUnit, const FieldUnit eDlgUnit)
{
const basegfx::B2DPoint aTopLeft(
(double)MetricField::ConvertValue(basegfx::fround(rRange.getMinX()), nDigits, ePoolUnit, eDlgUnit),
@@ -92,7 +92,7 @@ void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const
rRange = basegfx::B2DRange(aTopLeft, aBottomRight);
}
-void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
+static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
{
const double fFactor(1.0 / double(aUIScale));
rRange = basegfx::B2DRange(rRange.getMinimum() * fFactor, rRange.getMaximum() * fFactor);
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index c178713..0a18b04 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -479,7 +479,7 @@ Reference< XResultSetMetaData > ORowSetCache::getMetaData( )
return m_xMetaData;
}
-Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet)
+static Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet)
{
switch ( i_aValue.getTypeKind() )
{
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index ac5a6de..3448e02 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -40,7 +40,7 @@ DBG_NAME( EditUndo )
#define NO_UNDO 0xFFFF
#define GROUP_NOTFOUND 0xFFFF
-void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
+static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
{
EPaM aEPaM( nPara, 0 );
EditPaM aPaM( pView->GetImpEditEngine()->CreateEditPaM( aEPaM ) );
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index e63014e..9da9323 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::linguistic2;
#define SCRLRANGE 20 // Scroll 1/20 of the width/height, when in QueryDrop
-inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiffX, short nDiffY )
+static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiffX, short nDiffY )
{
rPoint = pOutDev->LogicToPixel( rPoint );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3c9990e..0249020 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -77,7 +77,7 @@
using namespace ::com::sun::star;
-sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
+static sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
{
sal_uInt16 nExtra = 0;
if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 79edb1e..5878822 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -152,7 +152,7 @@ sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar )
}
}
-void lcl_DrawRedLines(
+static void lcl_DrawRedLines(
OutputDevice* pOutDev,
long nFontHeight,
const Point& rPnt,
@@ -238,7 +238,7 @@ void lcl_DrawRedLines(
}
}
-Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, double nCos )
+static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, double nCos )
{
Point aRotatedPos;
// Translation...
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f530670..d6ff77f 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -290,7 +290,7 @@ sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, s
return ( rLst.Count() ? sal_True : sal_False );
}
-void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType )
+static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType )
{
sal_uInt16 nAttr = 0;
EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 0cd31ad..cd903fe 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3588,12 +3588,12 @@ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
}
// -----------------------------------------------------------------------
-inline sal_Int8 lcl_PercentToTransparency(long nPercent)
+static inline sal_Int8 lcl_PercentToTransparency(long nPercent)
{
//0xff must not be returned!
return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0);
}
-inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
+static inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
{
return (sal_Int8)((nTrans * 100 + 127) / 254);
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 039d3e4..e019815 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::style;
sal_Int32 SvxNumberType::nRefCount = 0;
com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> SvxNumberType::xFormatter = 0;
-void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter)
+static void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter)
{
if(!_xFormatter.is())
{
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 41ea8a6..70ae5fe 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -932,7 +932,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
// Calculate the relative deviation from the expected height.
-sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip)
+static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip)
{
sal_uInt32 nRet = nHeight;
short nDiff = 0;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 2f727e3..986a654 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -51,7 +51,7 @@
using namespace ::com::sun::star;
-CharSet lcl_GetDefaultTextEncodingForRTF()
+static CharSet lcl_GetDefaultTextEncodingForRTF()
{
::com::sun::star::lang::Locale aLocale;
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index c9d47c5..9f8c8bd 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -527,7 +527,7 @@ Model* Binding::getModelImpl( const Model_t& xModel ) const
return pModel;
}
-void lcl_addListenerToNode( Reference<XNode> xNode,
+static void lcl_addListenerToNode( Reference<XNode> xNode,
Reference<XEventListener> xListener )
{
Reference<XEventTarget> xTarget( xNode, UNO_QUERY );
@@ -548,7 +548,7 @@ void lcl_addListenerToNode( Reference<XNode> xNode,
}
}
-void lcl_removeListenerFromNode( Reference<XNode> xNode,
+static void lcl_removeListenerFromNode( Reference<XNode> xNode,
Reference<XEventListener> xListener )
{
Reference<XEventTarget> xTarget( xNode, UNO_QUERY );
@@ -691,7 +691,7 @@ void Binding::bind( bool bForceRebind )
// helper for Binding::valueModified
-void lcl_modified( const Binding::XModifyListener_t xListener,
+static void lcl_modified( const Binding::XModifyListener_t xListener,
const Reference<XInterface> xSource )
{
OSL_ENSURE( xListener.is(), "no listener?" );
@@ -699,7 +699,7 @@ void lcl_modified( const Binding::XModifyListener_t xListener,
}
// helper for Binding::valueModified
-void lcl_listentry( const Binding::XListEntryListener_t xListener,
+static void lcl_listentry( const Binding::XListEntryListener_t xListener,
const Reference<XInterface> xSource )
{
OSL_ENSURE( xListener.is(), "no listener?" );
@@ -708,7 +708,7 @@ void lcl_listentry( const Binding::XListEntryListener_t xListener,
}
// helper for Binding::valueModified
-void lcl_validate( const Binding::XValidityConstraintListener_t xListener,
+static void lcl_validate( const Binding::XValidityConstraintListener_t xListener,
const Reference<XInterface> xSource )
{
OSL_ENSURE( xListener.is(), "no listener?" );
@@ -886,7 +886,7 @@ void Binding::clear()
}
-void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom,
+static void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom,
Binding::XNameContainer_t& xTo )
{
OSL_ENSURE( xFrom.is(), "no source" );
@@ -913,7 +913,7 @@ void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom,
* @param bFromSource true: use elements from source
* false: use only elements from target
*/
-void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom,
+static void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom,
Binding::XNameContainer_t& xTo,
bool bOverwrite )
{
@@ -1132,7 +1132,7 @@ sal_Int32 Binding::getListEntryCount()
return maBindingExpression.getNodeList().size();
}
-void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer )
+static void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer )
{
if( xNode->getNodeType() == NodeType_TEXT_NODE
|| xNode->getNodeType() == NodeType_ATTRIBUTE_NODE )
@@ -1150,7 +1150,7 @@ void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer )
}
}
-OUString lcl_getString( const Reference<XNode>& xNode )
+static OUString lcl_getString( const Reference<XNode>& xNode )
{
OUStringBuffer aBuffer;
lcl_getString( xNode, aBuffer );
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 31c7169..53e7239 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -144,7 +144,7 @@ Model::~Model() throw()
mpSubmissions = NULL;
}
-Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel )
+static Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel )
{
Model* pModel = NULL;
if( xTunnel.is() )
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index f1e4d53..2b16251 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -132,7 +132,7 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode )
}
-void lcl_OutPosition( OUStringBuffer& rBuffer,
+static void lcl_OutPosition( OUStringBuffer& rBuffer,
const Reference<XNode>& xNode )
{
OSL_ENSURE( xNode->getParentNode().is(), "need parent" );
@@ -167,7 +167,7 @@ void lcl_OutPosition( OUStringBuffer& rBuffer,
}
}
-void lcl_OutName( OUStringBuffer& rBuffer,
+static void lcl_OutName( OUStringBuffer& rBuffer,
const Reference<XNode>& xNode )
{
rBuffer.insert( 0, xNode->getNodeName() );
@@ -179,7 +179,7 @@ void lcl_OutName( OUStringBuffer& rBuffer,
}
}
-void lcl_OutInstance( OUStringBuffer& rBuffer,
+static void lcl_OutInstance( OUStringBuffer& rBuffer,
const Reference<XNode>& xNode,
Model* pModel )
{
@@ -275,7 +275,7 @@ OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode )
return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() );
}
-bool lcl_isWhitespace( const OUString& rString )
+static bool lcl_isWhitespace( const OUString& rString )
{
sal_Int32 nLength = rString.getLength();
const sal_Unicode* pStr = rString.getStr();
@@ -442,7 +442,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName,
return xInstance;
}
-sal_Int32 lcl_findProp( const PropertyValue* pValues,
+static sal_Int32 lcl_findProp( const PropertyValue* pValues,
sal_Int32 nLength,
const rtl::OUString& rName )
{
@@ -519,7 +519,7 @@ void Model::removeInstance( const rtl::OUString& sName )
mpInstances->removeItem( mpInstances->getItem( nPos ) );
}
-Reference<XNameContainer> lcl_getModels(
+static Reference<XNameContainer> lcl_getModels(
const Reference<com::sun::star::frame::XModel>& xComponent )
{
Reference<XNameContainer> xRet;
@@ -769,7 +769,7 @@ void Model::removeBindingForNode( const XNode_t& )
// determine whether suitable binding is still used
}
-OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
+static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
{
::rtl::OUString sResult;
OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid argument!" );
@@ -791,7 +791,7 @@ OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
return sResult;
}
-OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
+static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
{
::rtl::OUString sResult;
@@ -879,7 +879,7 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
return sResult;
}
-OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult )
+static OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult )
{
// error handling first
if( ! xResult.is() )
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index e5d7401..3919028 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -488,7 +488,7 @@ sal_Int64 SAL_CALL Submission::getSomething(
}
-OUString lcl_message( const OUString& rID, const OUString& rText )
+static OUString lcl_message( const OUString& rID, const OUString& rText )
{
OUStringBuffer aMessage;
aMessage.append( OUSTRING("XForms submission '") );
diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx
index 025bebf..5458cd1 100644
--- a/forms/source/xforms/xmlhelper.cxx
+++ b/forms/source/xforms/xmlhelper.cxx
@@ -43,7 +43,7 @@ using com::sun::star::xml::dom::XDocumentBuilder;
// 2: NameChar
// 4: NCNameStartChar
// 8: NCNameChar
-inline sal_uInt8 lcl_getCharClass( sal_Unicode c )
+static inline sal_uInt8 lcl_getCharClass( sal_Unicode c )
{
sal_uInt8 nClass = 0;
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 78f8b7f..79ac152 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -56,7 +56,7 @@ using namespace com::sun::star::util;
using namespace std;
-bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2)
+static bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2)
{
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
return rI18nHelper.CompareString( rStr1, rStr2 ) < 0 ? true : false;
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 1674049..6598341 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -96,7 +96,7 @@ friend class ScDocument; // for FillInfo
friend class ScDocumentIterator;
friend class ScAttrIterator;
friend class ScHorizontalAttrIterator;
-friend void lcl_IterGetNumberFormat( sal_uLong& nFormat,
+friend void ScAttrArray_IterGetNumberFormat( sal_uLong& nFormat,
const ScAttrArray*& rpArr, SCROW& nAttrEndRow,
const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc );
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 32a54f8..86e46c5 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -130,7 +130,7 @@ struct ScRawToken: private ScRawTokenBase
// Friends that use a temporary ScRawToken on the stack (and therefor need
// the private dtor) and know what they're doing..
friend class ScTokenArray;
- friend sal_uInt16 lcl_ScRawTokenOffset();
+ static sal_uInt16 sbyteOffset();
public:
union {
double nValue;
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 3c1c0e7..c376f14 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -72,7 +72,7 @@ class ScShapeObj :public ScShapeObj_Base
,public ScShapeObj_TextBase
{
private:
-friend ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate );
+ friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
// cached pointers to avoid repeated queryAggregation calls:
::com::sun::star::beans::XPropertySet* pShapePropertySet;
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index b7b2260..d3ea03d 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -899,7 +899,7 @@ bool ScAttrArray::SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize)
return true;
}
-void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
+static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
{
const SfxPoolItem* pNewItem;
const SfxPoolItem* pOldItem;
@@ -986,7 +986,7 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
// assemble border
-bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine,
+static bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine,
sal_uInt8& rModified, const SvxBorderLine*& rpNew )
{
if (rModified == SC_LINE_DONTCARE)
@@ -1018,7 +1018,7 @@ bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine,
}
-void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
+static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
ScLineFlags& rFlags, const ScPatternAttr* pPattern,
bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom )
{
@@ -1209,7 +1209,7 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf
}
-long lcl_LineSize( const SvxBorderLine& rLine )
+static long lcl_LineSize( const SvxBorderLine& rLine )
{
// only one line -> half width, min. 20
// double line -> half line spacing + (per min. 20)
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 3ad9b8b..6a29e52 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -743,7 +743,7 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-void lcl_SetSpace( String& rStr, const ESelection& rSel )
+static void lcl_SetSpace( String& rStr, const ESelection& rSel )
{
// Text durch ein Leerzeichen ersetzen, damit Positionen stimmen:
@@ -752,7 +752,7 @@ void lcl_SetSpace( String& rStr, const ESelection& rSel )
rStr.SetChar( rSel.nStartPos, ' ' );
}
-bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
+static bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
{
bool bChange = false;
sal_uInt16 nParCnt = rEng.GetParagraphCount();
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index c4ddb68..e27339e 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1986,7 +1986,7 @@ ScDetectiveRefIter::ScDetectiveRefIter( ScFormulaCell* pCell )
aPos = pCell->aPos;
}
-bool lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
+static bool lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
{
ScSingleRefData& rRef1 = p->GetSingleRef();
if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted()
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 16088a6..809e2ed 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1522,7 +1522,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
StartListeningTo( pDocument ); // Listener wie vorher
}
-void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
+static void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
{
for (FormulaToken* p = pCode->First(); p; p = pCode->Next())
{
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b554ff9..964f1d4 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -635,7 +635,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, doubl
return nOldWidth;
}
-sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId )
+static sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId )
{
sal_uInt16 nHeight = (sal_uInt16) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight();
const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN);
@@ -1633,7 +1633,7 @@ void ScColumn::CompileColRowNameFormula()
}
}
-void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
+static void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
{
double nValue = 0.0;
bool bVal = false;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c853c16..dff64c1 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -882,7 +882,7 @@ void ScColumn::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
// Ergebnis in rVal1
-sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction )
+static sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction )
{
sal_Bool bOk = false;
switch (nFunction)
@@ -905,7 +905,7 @@ sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction )
}
-void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell )
+static void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell )
{
rArr.AddOpCode(ocOpen);
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index f7b6b86..e72556f 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -80,7 +80,7 @@ void ScFormatEntry::endRendering()
{
}
-bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 )
+static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 )
{
if (pFormula)
{
@@ -499,7 +499,7 @@ void ScConditionEntry::SetFormula2( const ScTokenArray& rArray )
}
}
-void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, bool& rChanged, SCTAB nTabs )
+static void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, bool& rChanged, SCTAB nTabs )
{
// Insert table: only update absolute table references.
// (Similar to ScCompiler::UpdateInsertTab with bIsName=true, result is the same as for named ranges)
@@ -595,7 +595,7 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
//! als Vergleichsoperator ans TokenArray ???
-bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
+static bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
{
// verglichen wird nur das nicht-UPN Array
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 2d8808e..a71fbad 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -225,7 +225,7 @@ void ScDocumentIterator::GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab )
//------------------------------------------------------------------------
//------------------------------------------------------------------------
-void lcl_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr,
+void ScAttrArray_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr,
SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow,
ScDocument* pDoc )
{
@@ -332,7 +332,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr)
--nRow;
if ( bCalcAsShown )
{
- lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
+ ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray,
nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
}
@@ -350,7 +350,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr)
bNextValid = true;
if ( bCalcAsShown )
{
- lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
+ ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray,
nAttrEndRow, pCol->pAttrArray, nNextRow, pDoc );
fNextValue = pDoc->RoundValueAsShown( fNextValue, nNumFormat );
}
@@ -594,7 +594,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
{
const ScAttrArray* pNewAttrArray =
ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol);
- lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
+ ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray,
nAttrEndRow, pNewAttrArray, nRow, mpDoc );
rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat );
}
@@ -1868,7 +1868,7 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr )
if ( bCalcAsShown )
{
ScColumn* pCol = &pDoc->maTabs[nCurTab]->aCol[nCurCol];
- lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
+ ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray,
nAttrEndRow, pCol->pAttrArray, nCurRow, pDoc );
rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
}
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index cc8915f..3fe7aec 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -679,7 +679,7 @@ SfxItemPool* ScDocumentPool::Clone() const
return new SfxItemPool (*this, sal_True);
}
-SfxItemPresentation lcl_HFPresentation
+static SfxItemPresentation lcl_HFPresentation
(
const SfxPoolItem& rItem,
SfxItemPresentation ePresentation,
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 209ba19..54ce14f 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1654,7 +1654,7 @@ void ScDocument::ResetEmbedded()
while result is less than nStopTwips.
@return true if advanced at least one row.
*/
-bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEndRow, const ScTable * pTable )
+static bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEndRow, const ScTable * pTable )
{
SCROW nRow = rPosY;
bool bAdded = false;
@@ -1779,7 +1779,7 @@ void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (
// VisArea auf Zellgrenzen anpassen
-void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol )
+static void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol )
{
SCCOL nCol = 0;
long nTwips = (long) (rVal / HMM_PER_TWIPS);
@@ -1799,7 +1799,7 @@ void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol )
rStartCol = nCol;
}
-void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow )
+static void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow )
{
SCROW nRow = 0;
long nTwips = (long) (rVal / HMM_PER_TWIPS);
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 9950a42..9f5408a 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc,
+static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc,
rtl::OUString& rRanges, chart::ChartDataRowSource& rDataRowSource,
bool& rHasCategories, bool& rFirstCellAsLabel )
{
@@ -97,7 +97,7 @@ void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xCh
}
}
-void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >& xReceiver,
+static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >& xReceiver,
const rtl::OUString& rRanges, chart::ChartDataRowSource eDataRowSource,
bool bHasCategories, bool bFirstCellAsLabel )
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 30e1229..3715f45 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1035,7 +1035,7 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList )
}
-void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab )
+static void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab )
{
// without ScMarkData, leave start/end unchanged
if ( pTabMark )
@@ -1053,7 +1053,7 @@ void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScM
}
}
-bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab )
+static bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab )
{
if ( pTabMark )
{
@@ -1477,7 +1477,7 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool
// (ohne Paint)
-void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
+static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
ScRange& rColRange, bool& rInsCol, bool& rDelCol,
ScRange& rRowRange, bool& rInsRow, bool& rDelRow )
{
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 634eeb2..95b0307 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -265,7 +265,7 @@ void DBConnector::getValue(long nCol, ScDPItemData &rData, short& rNumType) cons
}
-sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource )
+static sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource )
{
long nRet = sheet::DataPilotFieldOrientation_HIDDEN;
if ( xSource.is() )
@@ -809,7 +809,7 @@ const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType )
return pOutput->GetOutputRange(nType);
}
-sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
+static sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
{
return ((const ScMergeFlagAttr*)pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasButton();
}
@@ -1324,7 +1324,7 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi
pOutput->GetMemberResultNames(rNames, nDimension); // used only with table data -> level not needed
}
-bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult )
+static bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult )
{
// nStartPos has to point to opening quote
@@ -1373,7 +1373,7 @@ struct ScGetPivotDataFunctionEntry
sheet::GeneralFunction eFunc;
};
-bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc )
+static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc )
{
static const ScGetPivotDataFunctionEntry aFunctions[] =
{
@@ -1437,7 +1437,7 @@ bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& r
return bFound;
}
-bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatched,
+static bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatched,
bool bAllowBracket, sheet::GeneralFunction* pFunc )
{
sal_Int32 nMatchList = 0;
@@ -1870,7 +1870,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
}
}
-long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container::XNameAccess>& xCollection )
+static long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container::XNameAccess>& xCollection )
{
if ( xCollection.is() )
{
@@ -1884,7 +1884,7 @@ long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container:
return -1; // not found
}
-sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask
+static sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask
{
uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY );
if ( xDimProp.is() && xDimSupp.is() )
@@ -1933,7 +1933,7 @@ sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimPro
return 0;
}
-sal_uInt16 lcl_CountBits( sal_uInt16 nBits )
+static sal_uInt16 lcl_CountBits( sal_uInt16 nBits )
{
if (!nBits) return 0;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list