summaryrefslogtreecommitdiff
path: root/sc/source/ui/app
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-10-12 13:26:46 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-10-12 13:34:47 +0200
commitf7a24eff2d40ca30c6f299ab6534393c5c146b95 (patch)
tree41639f5f6d1f02968d888051e7aeaedbb397d272 /sc/source/ui/app
parent2c3759735f53c06ebd75a344cc10a47f20f32f09 (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: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5
Diffstat (limited to 'sc/source/ui/app')
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx16
-rw-r--r--sc/source/ui/app/inputwin.cxx12
-rw-r--r--sc/source/ui/app/scmod.cxx6
-rw-r--r--sc/source/ui/app/seltrans.cxx7
5 files changed, 20 insertions, 23 deletions
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index a78afe7bd998..b8647d4cab1c 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -658,7 +658,7 @@ void ScDrawTransferObj::SetDrawPersist( const SfxObjectShellRef& rRef )
aDrawPersistRef = rRef;
}
-void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB nTab )
+static void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB nTab )
{
rDest.ShowSdrPage(rDest.GetModel()->GetPage(nTab));
SdrPageView* pDestPV = rDest.GetSdrPageView();
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 78fd03e5c3ea..9b92164efb95 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -308,7 +308,7 @@ handle_r1c1:
}
}
-void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOldSel )
+static void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOldSel )
{
if ( pView )
{
@@ -394,12 +394,12 @@ inline String GetEditText(EditEngine* pEng)
return ScEditUtil::GetSpaceDelimitedString(*pEng);
}
-void lcl_RemoveTabs(rtl::OUString& rStr)
+static void lcl_RemoveTabs(rtl::OUString& rStr)
{
removeChars(rStr, sal_Unicode('\t'));
}
-void lcl_RemoveLineEnd(rtl::OUString& rStr)
+static void lcl_RemoveLineEnd(rtl::OUString& rStr)
{
rStr = convertLineEnd(rStr, LINEEND_LF);
removeChars(rStr, sal_Unicode('\n'));
@@ -1237,7 +1237,7 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
pActiveView->ShowCursor();
}
-void lcl_CompleteFunction( EditView* pView, const String& rInsert, bool& rParInserted )
+static void lcl_CompleteFunction( EditView* pView, const String& rInsert, bool& rParInserted )
{
if (pView)
{
@@ -1309,7 +1309,7 @@ void ScInputHandler::PasteFunctionData()
// Selektion berechnen und als Tip-Hilfe anzeigen
//
-String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos )
+static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos )
{
//! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!!
//! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt)
@@ -2098,7 +2098,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
return bNewTable;
}
-void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel )
+static void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel )
{
OSL_ENSURE( rSel.nStartPara==0 && rSel.nEndPara==0, "SetTopSelection: Para != 0" );
@@ -2454,7 +2454,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
// lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur)
-bool lcl_IsNumber(const String& rString)
+static bool lcl_IsNumber(const String& rString)
{
xub_StrLen nLen = rString.Len();
for (xub_StrLen i=0; i<nLen; i++)
@@ -2466,7 +2466,7 @@ bool lcl_IsNumber(const String& rString)
return true;
}
-void lcl_SelectionToEnd( EditView* pView )
+static void lcl_SelectionToEnd( EditView* pView )
{
if ( pView )
{
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 37346de866a7..ba20b96abab3 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -159,7 +159,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
//==================================================================
#define IMAGE(id) pImgMgr->SeekImage(id)
-bool lcl_isExperimentalMode()
+static bool lcl_isExperimentalMode()
{
// make inputbar feature on by default, leave the switch for the
// moment in case we need to back it out easily
@@ -170,7 +170,7 @@ bool lcl_isExperimentalMode()
// class ScInputWindow
//==================================================================
-ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind )
+static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind )
{
ScTabViewShell* pViewSh = NULL;
SfxDispatcher* pDisp = pBind->GetDispatcher();
@@ -1291,7 +1291,7 @@ void ScMultiTextWnd::StartEditEngine()
pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT );
}
-void lcl_ExtendEditFontAttribs( SfxItemSet& rSet )
+static void lcl_ExtendEditFontAttribs( SfxItemSet& rSet )
{
const SfxPoolItem& rFontItem = rSet.Get( EE_CHAR_FONTINFO );
rSet.Put( rFontItem, EE_CHAR_FONTINFO_CJK );
@@ -1310,7 +1310,7 @@ void lcl_ExtendEditFontAttribs( SfxItemSet& rSet )
rSet.Put( rLangItem, EE_CHAR_LANGUAGE_CTL );
}
-void lcl_ModifyRTLDefaults( SfxItemSet& rSet )
+static void lcl_ModifyRTLDefaults( SfxItemSet& rSet )
{
rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
@@ -1325,7 +1325,7 @@ void lcl_ModifyRTLDefaults( SfxItemSet& rSet )
rSet.Put( aItem );
}
-void lcl_ModifyRTLVisArea( EditView* pEditView )
+static void lcl_ModifyRTLVisArea( EditView* pEditView )
{
Rectangle aVisArea = pEditView->GetVisArea();
Size aPaper = pEditView->GetEditEngine()->GetPaperSize();
@@ -2231,7 +2231,7 @@ void ScPosWnd::HideTip()
}
}
-ScNameInputType lcl_GetInputType( const String& rText )
+static ScNameInputType lcl_GetInputType( const String& rText )
{
ScNameInputType eRet = SC_NAME_INPUT_BAD_NAME; // the more general error
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 294ac6e64565..2b74872eafb8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1615,7 +1615,7 @@ void ScModule::SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewF
}
}
-SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId )
+static SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId )
{
// first try the current view
@@ -1747,7 +1747,7 @@ sal_Bool ScModule::IsFormulaMode()
return bIsFormula;
}
-void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab )
+static void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab )
{
if (rMark.GetSelectCount() > 1)
{
@@ -1862,7 +1862,7 @@ void ScModule::AnythingChanged()
nIdleCount = 0;
}
-void lcl_CheckNeedsRepaint( ScDocShell* pDocShell )
+static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell )
{
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );
while ( pFrame )
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index c514d0f8e179..aefa0fc131a6 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -50,7 +50,7 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-sal_Bool lcl_IsURLButton( SdrObject* pObject )
+static sal_Bool lcl_IsURLButton( SdrObject* pObject )
{
sal_Bool bRet = false;
@@ -325,9 +325,6 @@ void ScSelectionTransferObj::CreateCellData()
OSL_ENSURE( pCellData, "can't create CellData" );
}
-//! make static member of ScDrawView
-extern void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle );
-
void ScSelectionTransferObj::CreateDrawData()
{
OSL_ENSURE( !pDrawData, "CreateDrawData twice" );
@@ -340,7 +337,7 @@ void ScSelectionTransferObj::CreateDrawData()
{
sal_Bool bAnyOle, bOneOle;
const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
- lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
+ ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle );
//---------------------------------------------------------
ScDocShellRef aDragShellRef;