pyuno/source/module/pyuno_module.cxx | 2
reportdesign/source/ui/report/propbrw.cxx | 2
rsc/source/rsc/rsc.cxx | 6 -
sal/rtl/strtmpl.cxx | 4 -
sal/textenc/convertsimple.cxx | 2
sax/qa/cppunit/test_converter.cxx | 14
++--
sax/source/expatwrap/saxwriter.cxx | 4 -
sc/source/core/data/cellvalue.cxx | 2
sc/source/core/data/formulacell.cxx | 18
++---
sc/source/core/tool/interpr1.cxx | 4 -
sc/source/filter/xcl97/xcl97rec.cxx | 8 +-
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 4 -
sfx2/source/appl/appserv.cxx | 6 -
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/guisaveas.cxx | 8 +-
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/objxtor.cxx | 2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 4 -
stoc/source/implementationregistration/implreg.cxx | 34
+++++-----
stoc/source/javavm/javavm.cxx | 2
stoc/source/proxy_factory/proxyfac.cxx | 6 -
stoc/source/security/access_controller.cxx | 2
stoc/source/servicemanager/servicemanager.cxx | 2
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 2
svgio/qa/cppunit/SvgImportTest.cxx | 2
svtools/source/control/calendar.cxx | 2
svtools/source/table/gridtablerenderer.cxx | 6 -
svtools/source/uno/unoiface.cxx | 2
svtools/source/uno/wizard/unowizard.cxx | 6 -
svx/source/accessibility/AccessibleControlShape.cxx | 8 +-
svx/source/fmcomp/gridcell.cxx | 12 +--
svx/source/form/fmcontrollayout.cxx | 4 -
svx/source/form/fmpgeimp.cxx | 4 -
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmtools.cxx | 2
svx/source/form/formcontrolfactory.cxx | 6 -
svx/source/form/formcontroller.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/unodraw/unoshap2.cxx | 10 +-
42 files changed, 109 insertions(+), 109 deletions(-)
New commits:
commit cb495d71063d60da46215a2510736eccd910fa7a
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:46:49 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I364aa7d67c2bf867588798e07df95c3f3f2bd7f3
Reviewed-on: https://gerrit.libreoffice.org/23676
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index ac7e4c2..d70d9a7 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1394,7 +1394,7 @@ int permutation256 [256]= {
116, 171, 99, 202, 7, 107, 253, 108
};
-static void initPermTexture(GLuint *texID)
+void initPermTexture(GLuint *texID)
{
CHECK_GL_ERROR();
glGenTextures(1, texID);
@@ -1597,7 +1597,7 @@ GLuint VortexTransition::makeShader() const
return OpenGLHelper::LoadShaders( "vortexVertexShader",
"vortexFragmentShader", "vortexGeometryShader" );
}
-static glm::mat4 lookAt(glm::vec3 eye, glm::vec3 center, glm::vec3 up) {
+glm::mat4 lookAt(glm::vec3 eye, glm::vec3 center, glm::vec3 up) {
glm::vec3 f = glm::normalize(center - eye);
glm::vec3 u = glm::normalize(up);
glm::vec3 s = glm::normalize(glm::cross(f, u));
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index c95159b..45d699f 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -112,7 +112,7 @@ const StringPool &spool()
// static deleteAllLinkReferences()
-static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
+void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >& xSource)
// throw ( InvalidRegistryException, RuntimeException )
{
@@ -195,7 +195,7 @@ static void deleteAllLinkReferences(const Reference <
XSimpleRegistry >& xReg,
// static prepareLink
-static void prepareLink( const Reference < XSimpleRegistry > & xDest,
+void prepareLink( const Reference < XSimpleRegistry > & xDest,
const Reference < XRegistryKey > & xSource,
const OUString& link)
// throw ( InvalidRegistryException, RuntimeException )
@@ -239,7 +239,7 @@ static void prepareLink( const Reference < XSimpleRegistry
> & xDest,
// static searchImplForLink
-static OUString searchImplForLink(
+OUString searchImplForLink(
const Reference < XRegistryKey > & xRootKey,
const OUString& linkName,
const OUString& implName )
@@ -279,7 +279,7 @@ static OUString searchImplForLink(
// static searchLinkTargetForImpl
-static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >&
xRootKey,
+OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
const OUString& linkName,
const OUString& implName)
// throw ( InvalidRegistryException, RuntimeException )
@@ -323,7 +323,7 @@ static OUString searchLinkTargetForImpl(const Reference <
XRegistryKey >& xRootK
// static createUniqueSubEntry
-static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
+void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
const OUString& value)
// throw ( InvalidRegistryException, RuntimeException )
{
@@ -382,7 +382,7 @@ static void createUniqueSubEntry(const Reference <
XRegistryKey > & xSuperKey,
// static deleteSubEntry
-static bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const
OUString& value)
+bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const
OUString& value)
// throw ( InvalidRegistryException, RuntimeException )
{
if (xSuperKey->getValueType() == RegistryValueType_ASCIILIST)
@@ -427,7 +427,7 @@ static bool deleteSubEntry(const Reference < XRegistryKey
>& xSuperKey, const OU
// static prepareUserLink
-static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
+void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
const OUString& linkName,
const OUString& linkTarget,
const OUString& implName)
@@ -454,7 +454,7 @@ static void prepareUserLink(const Reference <
XSimpleRegistry >& xDest,
// static deleteUserLink
-static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
+void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
const OUString& path)
{
try
@@ -481,7 +481,7 @@ static void deletePathIfPossible(const Reference <
XRegistryKey >& xRootKey,
// static deleteUserLink
-static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
+void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
const OUString& linkName,
const OUString& linkTarget,
const OUString& implName)
@@ -584,7 +584,7 @@ static void deleteUserLink(const Reference < XRegistryKey
>& xRootKey,
// static prepareUserKeys
-static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
+void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
const Reference < XRegistryKey >& xUnoKey,
const Reference < XRegistryKey >& xKey,
const OUString& implName,
@@ -661,7 +661,7 @@ static void prepareUserKeys(const Reference <
XSimpleRegistry >& xDest,
// static deleteAllImplementations
-static void deleteAllImplementations( const Reference < XSimpleRegistry >&
xReg,
+void deleteAllImplementations( const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >&
xSource,
const OUString& locationUrl,
std::list<OUString> & implNames)
@@ -748,7 +748,7 @@ static void deleteAllImplementations( const Reference <
XSimpleRegistry >& xRe
}
-static void delete_all_singleton_entries(
+void delete_all_singleton_entries(
Reference < registry::XRegistryKey > const & xSingletons_section,
::std::list< OUString > const & impl_names )
// throw (InvalidRegistryException, RuntimeException)
@@ -813,7 +813,7 @@ static void delete_all_singleton_entries(
// static deleteAllServiceEntries
-static void deleteAllServiceEntries( const Reference < XSimpleRegistry >&
xReg,
+void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >&
xSource,
const OUString& implName)
// throw ( InvalidRegistryException, RuntimeException )
@@ -890,7 +890,7 @@ static void deleteAllServiceEntries( const Reference <
XSimpleRegistry >& xRe
}
-static bool is_supported_service(
+bool is_supported_service(
OUString const & service_name,
Reference< reflection::XServiceTypeDescription > const & xService_td )
{
@@ -908,7 +908,7 @@ static bool is_supported_service(
}
-static void insert_singletons(
+void insert_singletons(
Reference< registry::XSimpleRegistry > const & xDest,
Reference< registry::XRegistryKey > const & xImplKey,
Reference< XComponentContext > const & xContext )
@@ -1029,7 +1029,7 @@ static void insert_singletons(
// static prepareRegistry
-static void prepareRegistry(
+void prepareRegistry(
const Reference < XSimpleRegistry >& xDest,
const Reference < XRegistryKey >& xSource,
const OUString& implementationLoaderUrl,
@@ -1142,7 +1142,7 @@ static void prepareRegistry(
}
-static void findImplementations( const Reference < XRegistryKey > & xSource,
+void findImplementations( const Reference < XRegistryKey > & xSource,
std::list <OUString>& implNames)
{
bool isImplKey = false;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 0e65773..290198c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -465,7 +465,7 @@ void getJavaPropsFromSafetySettings(
xConfRegistry_simple->close();
}
-static void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
+void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
/* A Bug in the Java function
** struct Hjava_util_Properties * java_lang_System_initProperties(
** struct Hjava_lang_System *this,
diff --git a/stoc/source/proxy_factory/proxyfac.cxx
b/stoc/source/proxy_factory/proxyfac.cxx
index 2ce250b..6153062 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -50,12 +50,12 @@ using namespace css::uno;
namespace
{
-static OUString proxyfac_getImplementationName()
+OUString proxyfac_getImplementationName()
{
return OUString(IMPL_NAME);
}
-static Sequence< OUString > proxyfac_getSupportedServiceNames()
+Sequence< OUString > proxyfac_getSupportedServiceNames()
{
OUString str_name = SERVICE_NAME;
return Sequence< OUString >( &str_name, 1 );
@@ -450,7 +450,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames()
}
-static Reference< XInterface > SAL_CALL proxyfac_create(
+Reference< XInterface > SAL_CALL proxyfac_create(
SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
throw (Exception)
{
diff --git a/stoc/source/security/access_controller.cxx
b/stoc/source/security/access_controller.cxx
index b5966bb..13b5f3b 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -258,7 +258,7 @@ Any acc_CurrentContext::getValueByName( OUString const &
name )
}
-static inline Reference< security::XAccessControlContext >
getDynamicRestriction(
+inline Reference< security::XAccessControlContext > getDynamicRestriction(
Reference< XCurrentContext > const & xContext )
{
if (xContext.is())
diff --git a/stoc/source/servicemanager/servicemanager.cxx
b/stoc/source/servicemanager/servicemanager.cxx
index 7553398..861e73f 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -68,7 +68,7 @@ using namespace std;
namespace {
-static Sequence< OUString > retrieveAsciiValueList(
+Sequence< OUString > retrieveAsciiValueList(
const Reference< XSimpleRegistry > &xReg, const OUString &keyName )
{
Reference< XEnumerationAccess > xAccess( xReg, UNO_QUERY );
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index eaf8741..3092c8d 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -138,7 +138,7 @@ OUString parsePart(
namespace
{
- static OUString encodeNameOrParamFragment( OUString const & fragment )
+ OUString encodeNameOrParamFragment( OUString const & fragment )
{
static sal_Bool const aCharClass[] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*
NameOrParamFragment */
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index 046d905..bf61830 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -133,7 +133,7 @@ void Test::checkRectPrimitive(Primitive2DSequence&
rPrimitive)
}
-static bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const
Primitive2DSequence& rB)
+bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const
Primitive2DSequence& rB)
{
const sal_Int32 nCount(rA.getLength());
diff --git a/svtools/source/control/calendar.cxx
b/svtools/source/control/calendar.cxx
index 56ab8f5..5801087 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -608,7 +608,7 @@ sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date&
rDate ) const
namespace
{
-static void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const
Rectangle& rRect, bool bPrev)
+void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const Rectangle&
rRect, bool bPrev)
{
long i;
long n;
diff --git a/svtools/source/table/gridtablerenderer.cxx
b/svtools/source/table/gridtablerenderer.cxx
index 3c935ab..93f3e75e 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -126,7 +126,7 @@ namespace svt { namespace table
namespace
{
- static Rectangle lcl_getContentArea( GridTableRenderer_Impl const &
i_impl, Rectangle const & i_cellArea )
+ Rectangle lcl_getContentArea( GridTableRenderer_Impl const & i_impl,
Rectangle const & i_cellArea )
{
Rectangle aContentArea( i_cellArea );
if ( i_impl.bUseGridLines )
@@ -136,7 +136,7 @@ namespace svt { namespace table
}
return aContentArea;
}
- static Rectangle lcl_getTextRenderingArea( Rectangle const &
i_contentArea )
+ Rectangle lcl_getTextRenderingArea( Rectangle const & i_contentArea )
{
Rectangle aTextArea( i_contentArea );
aTextArea.Left() += 2; aTextArea.Right() -= 2;
@@ -144,7 +144,7 @@ namespace svt { namespace table
return aTextArea;
}
- static DrawTextFlags lcl_getAlignmentTextDrawFlags(
GridTableRenderer_Impl const & i_impl, ColPos const i_columnPos )
+ DrawTextFlags lcl_getAlignmentTextDrawFlags( GridTableRenderer_Impl
const & i_impl, ColPos const i_columnPos )
{
DrawTextFlags nVertFlag = DrawTextFlags::Top;
VerticalAlignment const eVertAlign =
i_impl.rModel.getVerticalAlign();
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index df5a473..595106e 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -43,7 +43,7 @@
namespace
{
- static void lcl_setWinBits( vcl::Window* _pWindow, WinBits _nBits, bool
_bSet )
+ void lcl_setWinBits( vcl::Window* _pWindow, WinBits _nBits, bool _bSet )
{
WinBits nStyle = _pWindow->GetStyle();
if ( _bSet )
diff --git a/svtools/source/uno/wizard/unowizard.cxx
b/svtools/source/uno/wizard/unowizard.cxx
index d3b5d7b..03c57d3 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -166,7 +166,7 @@ namespace {
namespace
{
- static void lcl_checkPaths( const Sequence< Sequence< sal_Int16 > >&
i_rPaths, const Reference< XInterface >& i_rContext )
+ void lcl_checkPaths( const Sequence< Sequence< sal_Int16 > >&
i_rPaths, const Reference< XInterface >& i_rContext )
{
// need at least one path
if ( i_rPaths.getLength() == 0 )
@@ -245,7 +245,7 @@ namespace {
m_bInitialized = true;
}
- static OString lcl_getHelpId( const OUString& _rHelpURL )
+ OString lcl_getHelpId( const OUString& _rHelpURL )
{
INetURLObject aHID( _rHelpURL );
if ( aHID.GetProtocol() == INetProtocol::Hid )
@@ -255,7 +255,7 @@ namespace {
}
- static OUString lcl_getHelpURL( const OString& sHelpId )
+ OUString lcl_getHelpURL( const OString& sHelpId )
{
OUStringBuffer aBuffer;
OUString aTmp(
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx
b/svx/source/accessibility/AccessibleControlShape.cxx
index 22c47fa..6891b37 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -58,19 +58,19 @@ using namespace ::com::sun::star::container;
namespace
{
- static OUString lcl_getNamePropertyName( )
+ OUString lcl_getNamePropertyName( )
{
return OUString( "Name" );
}
- static OUString lcl_getDescPropertyName( )
+ OUString lcl_getDescPropertyName( )
{
return OUString( "HelpText" );
}
- static OUString lcl_getLabelPropertyName( )
+ OUString lcl_getLabelPropertyName( )
{
return OUString( "Label" );
}
- static OUString lcl_getLabelControlPropertyName( )
+ OUString lcl_getLabelControlPropertyName( )
{
return OUString("LabelControl");
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 30df2f2..8f9861e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -93,7 +93,7 @@ const char OBJECTTEXT[] = "<OBJECT>";
namespace
{
- static LineEnd getModelLineEndSetting( const Reference< XPropertySet >&
_rxModel )
+ LineEnd getModelLineEndSetting( const Reference< XPropertySet >& _rxModel )
{
LineEnd eFormat = LINEEND_LF;
@@ -927,7 +927,7 @@ void DbCellControl::SetTextLineColor(const Color& _rColor)
namespace
{
- static void lcl_implAlign( vcl::Window* _pWindow, WinBits _nAlignmentBit )
+ void lcl_implAlign( vcl::Window* _pWindow, WinBits _nAlignmentBit )
{
WinBits nStyle = _pWindow->GetStyle();
nStyle &= ~(WB_LEFT | WB_RIGHT | WB_CENTER);
@@ -1938,7 +1938,7 @@ VclPtr<SpinField> DbNumericField::createField(
vcl::Window* _pParent, WinBits _n
namespace
{
- static OUString lcl_setFormattedNumeric_nothrow( DoubleNumericField&
_rField, const DbCellControl& _rControl,
+ OUString lcl_setFormattedNumeric_nothrow( DoubleNumericField& _rField,
const DbCellControl& _rControl,
const Reference< XColumn >& _rxField, const Reference<
XNumberFormatter >& _rxFormatter )
{
OUString sValue;
@@ -2079,7 +2079,7 @@ double DbCurrencyField::GetCurrency(const Reference<
css::sdb::XColumn >& _rxFie
namespace
{
- static OUString lcl_setFormattedCurrency_nothrow( LongCurrencyField&
_rField, const DbCurrencyField& _rControl,
+ OUString lcl_setFormattedCurrency_nothrow( LongCurrencyField& _rField,
const DbCurrencyField& _rControl,
const Reference< XColumn >& _rxField, const Reference<
XNumberFormatter >& _rxFormatter )
{
OUString sValue;
@@ -2220,7 +2220,7 @@ void DbDateField::implAdjustGenericFieldSetting( const
Reference< XPropertySet >
namespace
{
- static OUString lcl_setFormattedDate_nothrow( DateField& _rField, const
Reference< XColumn >& _rxField )
+ OUString lcl_setFormattedDate_nothrow( DateField& _rField, const
Reference< XColumn >& _rxField )
{
OUString sDate;
if ( _rxField.is() )
@@ -2328,7 +2328,7 @@ void DbTimeField::implAdjustGenericFieldSetting( const
Reference< XPropertySet >
namespace
{
- static OUString lcl_setFormattedTime_nothrow( TimeField& _rField, const
Reference< XColumn >& _rxField )
+ OUString lcl_setFormattedTime_nothrow( TimeField& _rField, const
Reference< XColumn >& _rxField )
{
OUString sTime;
if ( _rxField.is() )
diff --git a/svx/source/form/fmcontrollayout.cxx
b/svx/source/form/fmcontrollayout.cxx
index 87d1bc2..108b961 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -99,7 +99,7 @@ namespace svxform
}
- static bool lcl_getDocumentDefaultStyleAndFamily( const Reference<
XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName )
+ bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface
>& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName )
{
bool bSuccess = true;
Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY );
@@ -131,7 +131,7 @@ namespace svxform
}
- static void lcl_initializeControlFont( const Reference< XPropertySet
>& _rxModel )
+ void lcl_initializeControlFont( const Reference< XPropertySet >&
_rxModel )
{
try
{
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 20df477..d775aca 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -237,7 +237,7 @@ Reference< XMap > FmFormPageImpl::getControlToShapeMap()
namespace
{
- static void lcl_insertFormObject_throw( const FmFormObj& _object, const
Reference< XMap >& _map )
+ void lcl_insertFormObject_throw( const FmFormObj& _object, const
Reference< XMap >& _map )
{
// the control model
Reference< XControlModel > xControlModel(
_object.GetUnoControlModel(), UNO_QUERY );
@@ -253,7 +253,7 @@ namespace
_map->put( makeAny( xControlModel ), makeAny( xControlShape ) );
}
- static void lcl_removeFormObject_throw( const FmFormObj& _object, const
Reference< XMap >& _map )
+ void lcl_removeFormObject_throw( const FmFormObj& _object, const
Reference< XMap >& _map )
{
// the control model
Reference< XControlModel > xControlModel(
_object.GetUnoControlModel(), UNO_QUERY );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index fbe33f7..a60bdb6 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1752,7 +1752,7 @@ Reference< XForm> FmXFormShell::getInternalForm(const
Reference< XForm>& _xForm)
namespace
{
- static bool lcl_isNavigationRelevant( sal_Int32 _nWhich )
+ bool lcl_isNavigationRelevant( sal_Int32 _nWhich )
{
return ( _nWhich == SID_FM_RECORD_FIRST )
|| ( _nWhich == SID_FM_RECORD_PREV )
diff --git a/svx/source/form/fmtextcontrolshell.cxx
b/svx/source/form/fmtextcontrolshell.cxx
index e5c8aa5..1b1331c 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -482,7 +482,7 @@ namespace svx
}
- static vcl::Window* lcl_getWindow( const Reference< css::awt::XControl
>& _rxControl )
+ vcl::Window* lcl_getWindow( const Reference< css::awt::XControl >&
_rxControl )
{
vcl::Window* pWindow = nullptr;
try
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index f32bfb5..b1a5a75 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -99,7 +99,7 @@ using namespace ::svxform;
namespace
{
- static bool lcl_shouldDisplayError( const Any& _rError )
+ bool lcl_shouldDisplayError( const Any& _rError )
{
SQLException aError;
if ( !( _rError >>= aError ) )
diff --git a/svx/source/form/formcontrolfactory.cxx
b/svx/source/form/formcontrolfactory.cxx
index 85258b8..ecd0278 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -142,7 +142,7 @@ namespace svxform
namespace
{
- static OUString lcl_getUniqueLabel_nothrow( const Reference<
XPropertySet >& _rxControlModel, const OUString& _rBaseLabel )
+ OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >&
_rxControlModel, const OUString& _rBaseLabel )
{
OUString sLabel( _rBaseLabel );
try
@@ -186,7 +186,7 @@ namespace svxform
}
- static Sequence< PropertyValue > lcl_getDataSourceIndirectProperties(
const Reference< XPropertySet >& _rxControlModel,
+ Sequence< PropertyValue > lcl_getDataSourceIndirectProperties( const
Reference< XPropertySet >& _rxControlModel,
const Reference<XComponentContext>& _rContext )
{
OSL_PRECOND( _rxControlModel.is(),
"lcl_getDataSourceIndirectProperties: invalid model!" );
@@ -356,7 +356,7 @@ namespace svxform
};
- static void lcl_initializeCharacterAttributes( const Reference<
XPropertySet >& _rxModel )
+ void lcl_initializeCharacterAttributes( const Reference< XPropertySet
>& _rxModel )
{
try
{
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index d0c93d3..7f41de7 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1221,7 +1221,7 @@ void FormController::disposing()
namespace
{
- static bool lcl_shouldUseDynamicControlBorder( const Reference< XInterface
>& _rxForm, const Any& _rDynamicColorProp )
+ bool lcl_shouldUseDynamicControlBorder( const Reference< XInterface >&
_rxForm, const Any& _rDynamicColorProp )
{
bool bDoUse = false;
if ( !( _rDynamicColorProp >>= bDoUse ) )
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index cee172f..bc7966a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1004,7 +1004,7 @@ namespace sdr { namespace contact {
namespace
{
- static void lcl_resetFlag( bool& rbFlag )
+ void lcl_resetFlag( bool& rbFlag )
{
rbFlag = false;
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 95d12ce..e199513 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -687,7 +687,7 @@ SvxShapeControlPropertyMapping[] =
namespace
{
- static bool lcl_convertPropertyName( const OUString& rApiName, OUString&
rInternalName )
+ bool lcl_convertPropertyName( const OUString& rApiName, OUString&
rInternalName )
{
sal_uInt16 i = 0;
while( SvxShapeControlPropertyMapping[i].mpAPIName )
@@ -720,7 +720,7 @@ namespace
{-1,-1}
};
- static void lcl_mapFormToAPIValue( Any& _rValue, const EnumConversionMap*
_pMap )
+ void lcl_mapFormToAPIValue( Any& _rValue, const EnumConversionMap* _pMap )
{
sal_Int16 nValue = sal_Int16();
OSL_VERIFY( _rValue >>= nValue );
@@ -737,7 +737,7 @@ namespace
}
}
- static void lcl_mapAPIToFormValue( Any& _rValue, const EnumConversionMap*
_pMap )
+ void lcl_mapAPIToFormValue( Any& _rValue, const EnumConversionMap* _pMap )
{
sal_Int32 nValue = 0;
OSL_VERIFY( _rValue >>= nValue );
@@ -754,12 +754,12 @@ namespace
}
}
- static void lcl_convertTextAlignmentToParaAdjustment( Any& rValue )
+ void lcl_convertTextAlignmentToParaAdjustment( Any& rValue )
{
lcl_mapFormToAPIValue( rValue, aMapAdjustToAlign );
}
- static void lcl_convertParaAdjustmentToTextAlignment( Any& rValue )
+ void lcl_convertParaAdjustmentToTextAlignment( Any& rValue )
{
lcl_mapAPIToFormValue( rValue, aMapAdjustToAlign );
}
commit eea3f508c35f8f391825761ab6e1f3fbfb2fd0c1
Author: Wastack <btom...@gmail.com>
Date: Thu Mar 31 08:45:27 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I87f2ed75888b51ec9e0cb75566bf7c2351b479b4
Reviewed-on: https://gerrit.libreoffice.org/23675
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index ed6f304..9e64c12 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -140,7 +140,7 @@ public:
}
};
-static void fillStruct(
+void fillStruct(
const Reference< XInvocation2 > &inv,
typelib_CompoundTypeDescription *pCompType,
PyObject *initializer,
diff --git a/reportdesign/source/ui/report/propbrw.cxx
b/reportdesign/source/ui/report/propbrw.cxx
index c6d3297..bd4bcf6 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -70,7 +70,7 @@ using namespace ::comphelper;
namespace
{
- static bool lcl_shouldEnableHelpSection( const Reference<
XComponentContext >& _rxContext )
+ bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >&
_rxContext )
{
::utl::OConfigurationTreeRoot aConfiguration(
::utl::OConfigurationTreeRoot::createWithComponentContext(
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index fe9107d..3c6eb9c 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -529,7 +529,7 @@ namespace
using namespace ::osl;
class RscIoError { };
- static inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl,
const OString& i_sPath)
+ inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const
OString& i_sPath)
{
OUString sRelUrl, sAbsUrl;
if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath,
RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None)
@@ -539,7 +539,7 @@ namespace
return sAbsUrl;
};
- static inline OString lcl_getSystemPath(const OUString& i_sUrl)
+ inline OString lcl_getSystemPath(const OUString& i_sUrl)
{
OUString sSys;
if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) !=
FileBase::E_None)
@@ -548,7 +548,7 @@ namespace
return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252);
};
- static inline OString lcl_getTempFile(OUString& sTempDirUrl)
+ inline OString lcl_getTempFile(OUString& sTempDirUrl)
{
// get a temp file name for the rc file
OUString sTempUrl;
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 7260fbc..df0d1a2 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -994,7 +994,7 @@ sal_Bool SAL_CALL IMPL_RTL_STRNAME( toBoolean )( const
IMPL_RTL_STRCODE* pStr )
/* ----------------------------------------------------------------------- */
namespace {
- template<typename T, typename U> static inline T IMPL_RTL_STRNAME( toInt
)( const IMPL_RTL_STRCODE* pStr,
+ template<typename T, typename U> inline T IMPL_RTL_STRNAME( toInt )( const
IMPL_RTL_STRCODE* pStr,
sal_Int16
nRadix )
{
static_assert(std::numeric_limits<T>::is_signed, "is signed");
@@ -1084,7 +1084,7 @@ sal_Int64 SAL_CALL IMPL_RTL_STRNAME( toInt64 )( const
IMPL_RTL_STRCODE* pStr,
/* ----------------------------------------------------------------------- */
namespace {
- template <typename T> static inline T IMPL_RTL_STRNAME( toUInt )( const
IMPL_RTL_STRCODE* pStr,
+ template <typename T> inline T IMPL_RTL_STRNAME( toUInt )( const
IMPL_RTL_STRCODE* pStr,
sal_Int16 nRadix )
{
static_assert(!std::numeric_limits<T>::is_signed, "is not signed");
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index 11c5bf5..476e881 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -444,7 +444,7 @@ const sal_uInt16* ImplGetReplaceString( sal_Unicode c )
}
// Writes 0--2 characters to dest:
-static int ImplConvertUnicodeCharToChar(
+int ImplConvertUnicodeCharToChar(
const ImplByteConvertData* pConvertData, sal_Unicode c, char * dest )
{
const ImplUniCharTabData* pToCharExTab;
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index d8fe313..c8b813c 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -76,7 +76,7 @@ public:
private:
};
-static void doTest(util::Duration const & rid, char const*const pis,
+void doTest(util::Duration const & rid, char const*const pis,
char const*const i_pos = nullptr)
{
char const*const pos((i_pos) ? i_pos : pis);
@@ -100,7 +100,7 @@ static void doTest(util::Duration const & rid, char
const*const pis,
CPPUNIT_ASSERT(buf.makeStringAndClear().equalsAscii(pos));
}
-static void doTestDurationF(char const*const pis)
+void doTestDurationF(char const*const pis)
{
util::Duration od;
bool bSuccess = Converter::convertDuration(od,
@@ -144,7 +144,7 @@ void ConverterTest::testDuration()
}
-static bool eqDateTime(const util::DateTime& a, const util::DateTime& b) {
+bool eqDateTime(const util::DateTime& a, const util::DateTime& b) {
return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day
&& a.Hours == b.Hours && a.Minutes == b.Minutes
&& a.Seconds == b.Seconds
@@ -152,7 +152,7 @@ static bool eqDateTime(const util::DateTime& a, const
util::DateTime& b) {
&& a.IsUTC == b.IsUTC;
}
-static void doTest(util::DateTime const & rdt, char const*const pis,
+void doTest(util::DateTime const & rdt, char const*const pis,
char const*const i_pos = nullptr)
{
char const*const pos((i_pos) ? i_pos : pis);
@@ -170,7 +170,7 @@ static void doTest(util::DateTime const & rdt, char
const*const pis,
buf.makeStringAndClear());
}
-static void doTestDateTimeF(char const*const pis)
+void doTestDateTimeF(char const*const pis)
{
util::DateTime odt;
bool bSuccess = Converter::parseDateTime(odt, nullptr,
@@ -247,7 +247,7 @@ void ConverterTest::testDateTime()
SAL_INFO("sax.cppunit","\nSAX CONVERTER TEST END");
}
-static void doTestTime(util::DateTime const & rdt, char const*const pis,
+void doTestTime(util::DateTime const & rdt, char const*const pis,
char const*const i_pos = nullptr)
{
char const*const pos((i_pos) ? i_pos : pis);
@@ -265,7 +265,7 @@ static void doTestTime(util::DateTime const & rdt, char
const*const pis,
buf.makeStringAndClear());
}
-static void doTestTimeF(char const*const pis)
+void doTestTimeF(char const*const pis)
{
util::DateTime odt;
bool bSuccess = Converter::parseTimeOrDateTime(odt, nullptr,
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index db75efe..a58a77a 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -855,7 +855,7 @@ inline sal_Int32 calcXMLByteLength( const sal_Unicode
*pStr, sal_Int32 nStrLen,
/** returns position of first ascii 10 within the string, -1 when no 10 in
string.
*/
-static inline sal_Int32 getFirstLineBreak( const OUString & str ) throw ()
+inline sal_Int32 getFirstLineBreak( const OUString & str ) throw ()
{
const sal_Unicode *pSource = str.getStr();
sal_Int32 nLen = str.getLength();
@@ -991,7 +991,7 @@ sal_Int32 SAXWriter::getIndentPrefixLength( sal_Int32
nFirstLineBreakOccurrence
return nLength;
}
-static inline bool isFirstCharWhitespace( const sal_Unicode *p ) throw()
+inline bool isFirstCharWhitespace( const sal_Unicode *p ) throw()
{
return *p == ' ';
}
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index 5da5e08..bba0b95 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -103,7 +103,7 @@ bool equalsWithoutFormatImpl( const _T& left, const _T&
right )
return false;
}
-static void commitToColumn( const ScCellValue& rCell, ScColumn& rColumn, SCROW
nRow )
+void commitToColumn( const ScCellValue& rCell, ScColumn& rColumn, SCROW nRow )
{
switch (rCell.meType)
{
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index e234bf0..7d618a5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -223,24 +223,24 @@ using std::deque;
typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&);
-static SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData)
+SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData)
{
return rData.toAbs(rPos).Col();
}
-static SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData)
+SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData)
{
return rData.toAbs(rPos).Row();
}
-static SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData)
+SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData)
{
return rData.toAbs(rPos).Tab();
}
/** Check if both references span the same range in selected dimension.
*/
-static bool
+bool
lcl_checkRangeDimension(
const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const
SingleDoubleRefProvider& rRef2,
const DimensionSelector aWhich)
@@ -249,7 +249,7 @@ lcl_checkRangeDimension(
aWhich(rPos, rRef1.Ref2) == aWhich(rPos, rRef2.Ref2);
}
-static bool
+bool
lcl_checkRangeDimensions(
const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const
SingleDoubleRefProvider& rRef2,
bool& bCol, bool& bRow, bool& bTab)
@@ -272,7 +272,7 @@ lcl_checkRangeDimensions(
/** Check if references in given reference list can possibly
form a range. To do that, two of their dimensions must be the same.
*/
-static bool
+bool
lcl_checkRangeDimensions(
const ScAddress& rPos,
const deque<formula::FormulaToken*>::const_iterator& rBegin,
@@ -342,7 +342,7 @@ public:
}
};
-static bool
+bool
lcl_checkIfAdjacent(
const ScAddress& rPos, const deque<formula::FormulaToken*>& rReferences,
const DimensionSelector aWhich)
{
@@ -355,7 +355,7 @@ lcl_checkIfAdjacent(
return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos,
aWhich));
}
-static void
+void
lcl_fillRangeFromRefList(
const ScAddress& aPos, const deque<formula::FormulaToken*>& rReferences,
ScRange& rRange)
{
@@ -367,7 +367,7 @@ lcl_fillRangeFromRefList(
rRange.aEnd = aEnd.toAbs(aPos);
}
-static bool
+bool
lcl_refListFormsOneRange(
const ScAddress& rPos, deque<formula::FormulaToken*>& rReferences,
ScRange& rRange)
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8f262b7..0a5ed78 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4135,7 +4135,7 @@ private:
/** returns -1 when the matrix value is smaller than the query value, 0 when
they are equal, and 1 when the matrix value is larger than the query
value. */
-static sal_Int32 lcl_CompareMatrix2Query(
+sal_Int32 lcl_CompareMatrix2Query(
SCSIZE i, const VectorMatrixAccessor& rMat, const ScQueryEntry& rEntry)
{
if (rMat.IsEmpty(i))
@@ -4173,7 +4173,7 @@ static sal_Int32 lcl_CompareMatrix2Query(
/** returns the last item with the identical value as the original item
value. */
-static void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat,
+void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat,
SCSIZE nMatCount, bool bReverse)
{
if (rMat.IsValue(rIndex))
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index 19a6e0e..585276e 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -168,7 +168,7 @@ void XclExpObjList::Save( XclExpStream& rStrm )
namespace {
-static bool IsVmlObject( const XclObj *rObj )
+bool IsVmlObject( const XclObj *rObj )
{
switch( rObj->GetObjType() )
{
@@ -179,7 +179,7 @@ static bool IsVmlObject( const XclObj *rObj )
}
}
-static sal_Int32 GetVmlObjectCount( XclExpObjList& rList )
+sal_Int32 GetVmlObjectCount( XclExpObjList& rList )
{
sal_Int32 nNumVml = 0;
@@ -232,7 +232,7 @@ bool IsValidObject( const XclObj& rObj )
return true;
}
-static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream&
rStrm, sal_Int32& nDrawingMLCount )
+void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm,
sal_Int32& nDrawingMLCount )
{
std::vector<XclObj*> aList;
aList.reserve(rList.size());
@@ -277,7 +277,7 @@ static void SaveDrawingMLObjects( XclExpObjList& rList,
XclExpXmlStream& rStrm,
rStrm.PopStream();
}
-static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm,
sal_Int32& nVmlCount )
+void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32&
nVmlCount )
{
if( GetVmlObjectCount( rList ) == 0 )
return;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 5c8f09f..6b08f37 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -231,7 +231,7 @@ const OUString
FrameworkHelper::msConfigurationControllerService("com.sun.star.d
//----- helper ----------------------------------------------------------------
namespace
{
- static ::std::shared_ptr< ViewShell > lcl_getViewShell( const Reference<
XResource >& i_rViewShellWrapper )
+ ::std::shared_ptr< ViewShell > lcl_getViewShell( const Reference<
XResource >& i_rViewShellWrapper )
{
::std::shared_ptr< ViewShell > pViewShell;
if ( !i_rViewShellWrapper.is() )
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 0a0283b..789f587 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -48,11 +48,11 @@ using namespace ::com::sun::star::uno;
namespace {
-static OUString GetPathToImpressConfigurationRoot()
+OUString GetPathToImpressConfigurationRoot()
{
return OUString("/org.openoffice.Office.Impress/");
}
-static OUString GetPathToSetNode()
+OUString GetPathToSetNode()
{
return OUString("MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages");
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 822a851..a178dc4 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -137,7 +137,7 @@ using namespace ::com::sun::star::document;
namespace
{
// lp#527938, debian#602953, fdo#33266, i#105408
- static bool lcl_isBaseAvailable()
+ bool lcl_isBaseAvailable()
{
try
{
@@ -153,7 +153,7 @@ namespace
return false;
}
}
- static void lcl_tryLoadBibliography()
+ void lcl_tryLoadBibliography()
{
// lp#527938, debian#602953, fdo#33266, i#105408
// make sure we actually can instanciate services from base first
@@ -898,7 +898,7 @@ namespace
return _pFallback;
}
- static OUString lcl_getBasicIDEServiceName()
+ OUString lcl_getBasicIDEServiceName()
{
return OUString( "com.sun.star.script.BasicIDE");
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index ec2078c..e33fd46 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1997,7 +1997,7 @@ void FileDialogHelper_Impl::saveConfig()
namespace
{
- static OUString getInitPath( const OUString& _rFallback, const sal_Int32
_nFallbackToken )
+ OUString getInitPath( const OUString& _rFallback, const sal_Int32
_nFallbackToken )
{
SfxApplication *pSfxApp = SfxGetpApp();
OUString sPath = pSfxApp->GetLastDir_Impl();
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 44b153f..c00ed82 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -123,7 +123,7 @@ using namespace css::system;
namespace {
-static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
+sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
{
// This is a temporary hardcoded solution must be removed when
// dialogs do not need parameters in SidSet representation any more
@@ -147,7 +147,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
}
-static sal_Int8 getStoreModeFromSlotName( const OUString& aSlotName )
+sal_Int8 getStoreModeFromSlotName( const OUString& aSlotName )
{
sal_Int8 nResult = 0;
if ( aSlotName == "ExportTo" )
@@ -172,14 +172,14 @@ static sal_Int8 getStoreModeFromSlotName( const OUString&
aSlotName )
}
-static SfxFilterFlags getMustFlags( sal_Int8 nStoreMode )
+SfxFilterFlags getMustFlags( sal_Int8 nStoreMode )
{
return ( SfxFilterFlags::EXPORT
| ( ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode &
WIDEEXPORT_REQUESTED ) ) ? SfxFilterFlags::NONE : SfxFilterFlags::IMPORT ) );
}
-static SfxFilterFlags getDontFlags( sal_Int8 nStoreMode )
+SfxFilterFlags getDontFlags( sal_Int8 nStoreMode )
{
return ( SfxFilterFlags::INTERNAL
| SfxFilterFlags::NOTINFILEDLG
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a8dd86d..6a04de2 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1452,7 +1452,7 @@ ErrCode SfxObjectShell::CallBasic( const OUString& rMacro,
namespace
{
- static bool lcl_isScriptAccessAllowed_nothrow( const Reference< XInterface
>& _rxScriptContext )
+ bool lcl_isScriptAccessAllowed_nothrow( const Reference< XInterface >&
_rxScriptContext )
{
try
{
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a3c1049..6f69630 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -635,7 +635,7 @@ bool SfxObjectShell::PrepareClose
#if HAVE_FEATURE_SCRIPTING
namespace
{
- static BasicManager* lcl_getBasicManagerForDocument( const SfxObjectShell&
_rDocument )
+ BasicManager* lcl_getBasicManagerForDocument( const SfxObjectShell&
_rDocument )
{
if ( !_rDocument.Get_Impl()->m_bNoBasicCapabilities )
{
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index eca1a4b..2b6659a 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -36,7 +36,7 @@ namespace
}
GError*& getRef() { return m_pError; }
};
- static inline GDBusProxy* lcl_GetPackageKitProxy(const OUString&
sInterface)
+ inline GDBusProxy* lcl_GetPackageKitProxy(const OUString& sInterface)
{
const OString sFullInterface =
OUStringToOString("org.freedesktop.PackageKit." + sInterface,
RTL_TEXTENCODING_ASCII_US);
GDBusProxy* proxy = nullptr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
