summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-10-12 13:33:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-10-12 13:34:48 +0200
commit83154f9234659585cdac1c2e6781cd3498ff4a51 (patch)
treebfbd678453ed1a4ed0d652e722bc3c84b9ec428a /svx
parent190334febe62d56d80489034f0ee3cf59100f6c4 (diff)
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
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/hdft.cxx2
-rw-r--r--svx/source/dialog/optgrid.cxx4
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/tabwin.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdomedia.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx10
9 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 3dad1aef8ab0..010bfea18cfa 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -955,7 +955,7 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl)
return 0;
}
-void lcl_Move(Window& rWin, sal_Int32 nDiff)
+static void lcl_Move(Window& rWin, sal_Int32 nDiff)
{
Point aPos(rWin.GetPosPixel());
aPos.Y() -= nDiff;
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 97704f8f9ab2..63cee2bfc570 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -41,7 +41,7 @@
#include "svx/dlgutil.hxx"
// local functions
-void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax)
+static void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax)
{
nFirst = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ));
nLast = static_cast<long>(rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ));
@@ -49,7 +49,7 @@ void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin
nMax = static_cast<long>(rField.Denormalize( rField.GetMax( FUNIT_TWIP ) ));
}
-void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast, long nMin, long nMax)
+static void lcl_SetMinMax(MetricField& rField, long nFirst, long nLast, long nMin, long nMax)
{
rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP );
rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 24bbe33a3947..b6aae0b4b176 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -358,7 +358,7 @@ SvxSearchDialog::~SvxSearchDialog()
delete pMoreBtn;
}
-void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
+static void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
{
Point aPos(rWindow.GetPosPixel());
aPos.Y() += nOffset;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 230dd3e193e4..5c5772101b81 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -629,7 +629,7 @@ void DbCellControl::doPropertyListening(const OUString& _rPropertyName)
implDoPropertyListening( _rPropertyName );
}
//------------------------------------------------------------------------------
-void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster)
+static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster)
{
if ( _pBroadcaster )
{
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index e5a8b38cd89e..accb2c1ed08a 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -99,7 +99,7 @@ struct ColumnInfo
}
};
-void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
+static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
{
uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames();
const ::rtl::OUString* pEntries = aEntries.getConstArray();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index d0206fd9933a..1bff49d54bc7 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2194,7 +2194,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
}
-void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem)
+static void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem)
{
if (bMerge) rAttr.MergeValue(rItem,true);
else rAttr.Put(rItem);
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 91774b7873a1..455831207650 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -302,7 +302,7 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream()
}
/// copy a stream from XStorage to temp file
-bool lcl_HandlePackageURL(
+static bool lcl_HandlePackageURL(
::rtl::OUString const & rURL,
SdrModel *const pModel,
::rtl::OUString & o_rTempFileURL)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 9c5c8f89d4e6..06b7caa2d964 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -94,7 +94,7 @@
using namespace ::rtl;
using namespace ::com::sun::star;
-uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Obj* _pObject)
+static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Obj* _pObject)
{
uno::Reference < beans::XPropertySet > xFrame;
if ( _pObject )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 67e67aa12d9c..81192762e963 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -98,8 +98,8 @@
// don't make more than 15 entries visible at once
#define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 )
-void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
-void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
+static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
+static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
// namespaces
using ::rtl::OUString;
@@ -1307,7 +1307,7 @@ sal_Bool SvxFrameWindow_Impl::Close()
//========================================================================
// class SvxLineWindow_Impl --------------------------------------------------
//========================================================================
-Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
+static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
{
return SvxBorderLine::threeDMediumColor( aMain );
}
@@ -2627,7 +2627,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState,
//========================================================================
-void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
+static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
{
Size aSize = rWin.GetOutputSizePixel();
aSize.Width() -= 4;
@@ -2637,7 +2637,7 @@ void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
// -----------------------------------------------------------------------
-void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize )
+static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize )
{
Size aSize = rValueSet.CalcWindowSizePixel( aItemSize );
aSize.Width() += 4;