summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx4
-rw-r--r--stoc/source/implementationregistration/implreg.cxx34
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx6
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx2
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx2
-rw-r--r--svgio/qa/cppunit/SvgImportTest.cxx2
-rw-r--r--svtools/source/control/calendar.cxx2
-rw-r--r--svtools/source/table/gridtablerenderer.cxx6
-rw-r--r--svtools/source/uno/unoiface.cxx2
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx6
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx8
-rw-r--r--svx/source/fmcomp/gridcell.cxx12
-rw-r--r--svx/source/form/fmcontrollayout.cxx4
-rw-r--r--svx/source/form/fmpgeimp.cxx4
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmtools.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx6
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx10
23 files changed, 62 insertions, 62 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index ac7e4c2d32f5..d70d9a7b2e70 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 c95159bb7a7f..45d699f59131 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 0e6577364fe2..290198c6451c 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 2ce250ba17e2..6153062a0336 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 b5966bb23f32..13b5f3b92759 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 75533986ff63..861e73f102de 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 eaf874143a5e..3092c8d3284a 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 046d905e5036..bf61830eae99 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 56ab8f54dd48..58010872b18a 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 3c935ab01bd0..93f3e75ef3f7 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 df5a473b5a7a..595106ee2f7c 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 d3b5d7bc30f1..03c57d340dd9 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 22c47fa580db..6891b3707b68 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 30df2f2f7ce8..8f9861e6fa2f 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 87d1bc2dd052..108b9615ed64 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 20df477fff51..d775aca5aa2c 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 fbe33f7335a1..a60bdb6894a7 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 e5c8aa54459a..1b1331cdefe9 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 f32bfb5e8ff8..b1a5a75e921c 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 85258b8ade19..ecd0278768a3 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 d0c93d3b7de1..7f41de76e9a3 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 cee172fad6a2..bc7966a72ffc 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 95d12ce6abf2..e1995131bfdc 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 );
}