diff options
author | Wastack <btomi96@gmail.com> | 2016-03-31 08:46:49 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 06:46:17 +0000 |
commit | cb495d71063d60da46215a2510736eccd910fa7a (patch) | |
tree | 3179b5a73b9ca9e0e45618bfaa09c9718c0290f6 /svx/source/form | |
parent | eea3f508c35f8f391825761ab6e1f3fbfb2fd0c1 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/form')
-rw-r--r-- | svx/source/form/fmcontrollayout.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmpgeimp.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmtools.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontrolfactory.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 2 |
7 files changed, 11 insertions, 11 deletions
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 ) ) |