diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 13:26:46 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 13:34:47 +0200 |
commit | f7a24eff2d40ca30c6f299ab6534393c5c146b95 (patch) | |
tree | 41639f5f6d1f02968d888051e7aeaedbb397d272 /forms | |
parent | 2c3759735f53c06ebd75a344cc10a47f20f32f09 (diff) |
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/xforms/binding.cxx | 18 | ||||
-rw-r--r-- | forms/source/xforms/model.cxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/model_ui.cxx | 18 | ||||
-rw-r--r-- | forms/source/xforms/submission.cxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/xmlhelper.cxx | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index c9d47c5bcfb0..9f8c8bd3f47e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -527,7 +527,7 @@ Model* Binding::getModelImpl( const Model_t& xModel ) const return pModel; } -void lcl_addListenerToNode( Reference<XNode> xNode, +static void lcl_addListenerToNode( Reference<XNode> xNode, Reference<XEventListener> xListener ) { Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); @@ -548,7 +548,7 @@ void lcl_addListenerToNode( Reference<XNode> xNode, } } -void lcl_removeListenerFromNode( Reference<XNode> xNode, +static void lcl_removeListenerFromNode( Reference<XNode> xNode, Reference<XEventListener> xListener ) { Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); @@ -691,7 +691,7 @@ void Binding::bind( bool bForceRebind ) // helper for Binding::valueModified -void lcl_modified( const Binding::XModifyListener_t xListener, +static void lcl_modified( const Binding::XModifyListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -699,7 +699,7 @@ void lcl_modified( const Binding::XModifyListener_t xListener, } // helper for Binding::valueModified -void lcl_listentry( const Binding::XListEntryListener_t xListener, +static void lcl_listentry( const Binding::XListEntryListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -708,7 +708,7 @@ void lcl_listentry( const Binding::XListEntryListener_t xListener, } // helper for Binding::valueModified -void lcl_validate( const Binding::XValidityConstraintListener_t xListener, +static void lcl_validate( const Binding::XValidityConstraintListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -886,7 +886,7 @@ void Binding::clear() } -void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, +static void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, Binding::XNameContainer_t& xTo ) { OSL_ENSURE( xFrom.is(), "no source" ); @@ -913,7 +913,7 @@ void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, * @param bFromSource true: use elements from source * false: use only elements from target */ -void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, +static void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, Binding::XNameContainer_t& xTo, bool bOverwrite ) { @@ -1132,7 +1132,7 @@ sal_Int32 Binding::getListEntryCount() return maBindingExpression.getNodeList().size(); } -void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) +static void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) { if( xNode->getNodeType() == NodeType_TEXT_NODE || xNode->getNodeType() == NodeType_ATTRIBUTE_NODE ) @@ -1150,7 +1150,7 @@ void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) } } -OUString lcl_getString( const Reference<XNode>& xNode ) +static OUString lcl_getString( const Reference<XNode>& xNode ) { OUStringBuffer aBuffer; lcl_getString( xNode, aBuffer ); diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 31c7169723cd..53e7239f6d4a 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -144,7 +144,7 @@ Model::~Model() throw() mpSubmissions = NULL; } -Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel ) +static Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel ) { Model* pModel = NULL; if( xTunnel.is() ) diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index f1e4d53a3c0e..2b162514b286 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -132,7 +132,7 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) } -void lcl_OutPosition( OUStringBuffer& rBuffer, +static void lcl_OutPosition( OUStringBuffer& rBuffer, const Reference<XNode>& xNode ) { OSL_ENSURE( xNode->getParentNode().is(), "need parent" ); @@ -167,7 +167,7 @@ void lcl_OutPosition( OUStringBuffer& rBuffer, } } -void lcl_OutName( OUStringBuffer& rBuffer, +static void lcl_OutName( OUStringBuffer& rBuffer, const Reference<XNode>& xNode ) { rBuffer.insert( 0, xNode->getNodeName() ); @@ -179,7 +179,7 @@ void lcl_OutName( OUStringBuffer& rBuffer, } } -void lcl_OutInstance( OUStringBuffer& rBuffer, +static void lcl_OutInstance( OUStringBuffer& rBuffer, const Reference<XNode>& xNode, Model* pModel ) { @@ -275,7 +275,7 @@ OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode ) return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() ); } -bool lcl_isWhitespace( const OUString& rString ) +static bool lcl_isWhitespace( const OUString& rString ) { sal_Int32 nLength = rString.getLength(); const sal_Unicode* pStr = rString.getStr(); @@ -442,7 +442,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName, return xInstance; } -sal_Int32 lcl_findProp( const PropertyValue* pValues, +static sal_Int32 lcl_findProp( const PropertyValue* pValues, sal_Int32 nLength, const rtl::OUString& rName ) { @@ -519,7 +519,7 @@ void Model::removeInstance( const rtl::OUString& sName ) mpInstances->removeItem( mpInstances->getItem( nPos ) ); } -Reference<XNameContainer> lcl_getModels( +static Reference<XNameContainer> lcl_getModels( const Reference<com::sun::star::frame::XModel>& xComponent ) { Reference<XNameContainer> xRet; @@ -769,7 +769,7 @@ void Model::removeBindingForNode( const XNode_t& ) // determine whether suitable binding is still used } -OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) +static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) { ::rtl::OUString sResult; OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid argument!" ); @@ -791,7 +791,7 @@ OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) return sResult; } -OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) +static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) { ::rtl::OUString sResult; @@ -879,7 +879,7 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) return sResult; } -OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult ) +static OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult ) { // error handling first if( ! xResult.is() ) diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index e5d740126793..39190284f4a6 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -488,7 +488,7 @@ sal_Int64 SAL_CALL Submission::getSomething( } -OUString lcl_message( const OUString& rID, const OUString& rText ) +static OUString lcl_message( const OUString& rID, const OUString& rText ) { OUStringBuffer aMessage; aMessage.append( OUSTRING("XForms submission '") ); diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index 025bebf59cc8..5458cd177382 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -43,7 +43,7 @@ using com::sun::star::xml::dom::XDocumentBuilder; // 2: NameChar // 4: NCNameStartChar // 8: NCNameChar -inline sal_uInt8 lcl_getCharClass( sal_Unicode c ) +static inline sal_uInt8 lcl_getCharClass( sal_Unicode c ) { sal_uInt8 nClass = 0; |