summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/pushbuttonnavigation.cxx4
-rw-r--r--filter/source/svg/svgreader.cxx4
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/propertybaghelper.cxx2
-rw-r--r--forms/source/misc/InterfaceContainer.cxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx12
-rw-r--r--forms/source/richtext/rtattributehandler.cxx2
-rw-r--r--forms/source/runtime/formoperations.cxx6
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx2
-rw-r--r--forms/source/solar/control/navtoolbar.cxx4
-rw-r--r--forms/source/xforms/datatypes.cxx4
-rw-r--r--fpicker/source/office/iodlg.cxx2
14 files changed, 25 insertions, 25 deletions
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 496ccd0ed6e6..396239d3ca6b 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -1046,7 +1046,7 @@ namespace pcr
namespace
{
- static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck )
+ bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck )
{
sal_Int32 nTextLen = _rText.getLength();
sal_Int32 nCheckLen = _rCheck.getLength();
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 99f1e13c06f8..1664f8c24a13 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -611,7 +611,7 @@ namespace pcr
namespace
{
- static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows,
+ sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows,
const css::awt::Point& _rRelativePosition )
{
sal_Int32 nAccumulated = 0;
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 095d142c15a0..e4c75605fdfb 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -54,7 +54,7 @@ namespace pcr
nullptr
};
- static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL )
+ sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL )
{
const sal_Char** pLookup = pNavigationURLs;
while ( *pLookup )
@@ -66,7 +66,7 @@ namespace pcr
return -1;
}
- static const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex )
+ const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex )
{
const sal_Char** pLookup = pNavigationURLs;
while ( _nButtonTypeIndex-- && *pLookup++ )
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 2deff7583718..8feb4bf5187e 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1373,7 +1373,7 @@ struct AnnotatingVisitor
};
/// Annotate svg styles with unique references to state pool
-static void annotateStyles( StatePool& rStatePool,
+void annotateStyles( StatePool& rStatePool,
StateMap& rStateMap,
const State& rInitialState,
uno::Reference<xml::dom::XElement>& rElem,
@@ -1943,7 +1943,7 @@ struct ShapeWritingVisitor
};
/// Write out shapes from DOM tree
-static void writeShapes( StatePool& rStatePool,
+void writeShapes( StatePool& rStatePool,
StateMap& rStateMap,
const uno::Reference<xml::dom::XElement>& rElem,
const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl,
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 4245ff995aa9..e44e90eb29e1 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -565,7 +565,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
namespace
{
- static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut )
+ void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut )
{
sal_Int32 nCurLen = _rOut.getLength();
_rOut.append( _nNumber );
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 0c026771e300..b0774a37a929 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -63,7 +63,7 @@ namespace frm
namespace
{
- static ::comphelper::IPropertyInfoService& lcl_getPropertyInfos()
+ ::comphelper::IPropertyInfoService& lcl_getPropertyInfos()
{
static ConcreteInfoService s_aPropInfos;
return s_aPropInfos;
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index fc04dc5d26b7..9dde69cdaa90 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -71,7 +71,7 @@ using namespace ::com::sun::star::util;
namespace
{
- static void lcl_throwIllegalArgumentException()
+ void lcl_throwIllegalArgumentException()
{
throw IllegalArgumentException();
}
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index e3bfef6572e3..c535f5a100c3 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -77,7 +77,7 @@ namespace frm
namespace
{
- static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
+ void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag )
{
bool bFlagValue = false;
@@ -86,7 +86,7 @@ namespace frm
}
- static void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false )
+ void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false )
{
bool bFlagValue = false;
if ( _rValue >>= bFlagValue )
@@ -101,14 +101,14 @@ namespace frm
}
- static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
+ void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false )
{
implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert );
}
- static void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false )
+ void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false )
{
WinBits nBits = _pWindow->GetStyle();
implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert );
@@ -116,7 +116,7 @@ namespace frm
}
- static WinBits getWinBits( const Reference< XControlModel >& _rxModel )
+ WinBits getWinBits( const Reference< XControlModel >& _rxModel )
{
WinBits nBits = 0;
try
@@ -431,7 +431,7 @@ namespace frm
namespace
{
- static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool )
+ SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool )
{
// HACK HACK HACK
// unfortunately, some of our applications have some conflicting slots,
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index b4793cbeb94a..37037fc182a2 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -96,7 +96,7 @@ namespace frm
namespace
{
- static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId )
+ WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId )
{
WhichId nWhich = 0;
switch ( _nAttributeId )
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 33a2fa1c8720..4f9884f78baf 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -407,7 +407,7 @@ namespace frm
namespace
{
- static bool lcl_needConfirmCommit( sal_Int32 _nFeature )
+ bool lcl_needConfirmCommit( sal_Int32 _nFeature )
{
return ( ( _nFeature == FormFeature::ReloadForm )
|| ( _nFeature == FormFeature::RemoveFilterAndSort )
@@ -419,11 +419,11 @@ namespace frm
|| ( _nFeature == FormFeature::InteractiveFilter )
);
}
- static bool lcl_requiresArguments( sal_Int32 _nFeature )
+ bool lcl_requiresArguments( sal_Int32 _nFeature )
{
return ( _nFeature == FormFeature::MoveAbsolute );
}
- static bool lcl_isExecutableFeature( sal_Int32 _nFeature )
+ bool lcl_isExecutableFeature( sal_Int32 _nFeature )
{
return ( _nFeature != FormFeature::TotalRecords );
}
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 6c182cb2f158..cc7be7a83ecb 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -85,7 +85,7 @@ namespace frm
namespace
{
- static WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel )
+ WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel )
{
WinBits nBits = 0;
try
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 8b767e439362..79b75cab1e04 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -47,13 +47,13 @@ namespace frm
namespace
{
- static bool isArtificialItem( sal_Int16 _nFeatureId )
+ bool isArtificialItem( sal_Int16 _nFeatureId )
{
return ( _nFeatureId == LID_RECORD_LABEL )
|| ( _nFeatureId == LID_RECORD_FILLER );
}
- static OUString getLabelString( sal_uInt16 _nResId )
+ OUString getLabelString( sal_uInt16 _nResId )
{
OUString sLabel( " " );
sLabel += FRM_RES_STRING( _nResId );
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 016243a293a3..8d1c2bc7febe 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -191,7 +191,7 @@ namespace xforms
namespace
{
- static void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
+ void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW
@@ -200,7 +200,7 @@ namespace xforms
// if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity
}
- static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText )
+ bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3d86696bf9bb..6d42b49d4ece 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -270,7 +270,7 @@ namespace
}
#endif
- static OUString lcl_ensureFinalSlash( const OUString& _rDir )
+ OUString lcl_ensureFinalSlash( const OUString& _rDir )
{
INetURLObject aWorkPathObj( _rDir, INetProtocol::File );
aWorkPathObj.setFinalSlash();