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 | |
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')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 8 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 12 | ||||
-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 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 10 |
11 files changed, 27 insertions, 27 deletions
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 ); } |