From 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- forms/Library_frm.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 126bc5f339f2..2b4361fde1ca 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From b85c34978356eb01311f197f00f4dd5f808e3664 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- forms/Library_frm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 2b4361fde1ca..809bef707b6e 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,frm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,frm)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ -- cgit From 5032dc0fc339ba6b200e80a5482cc86e00662a0b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- forms/Library_frm.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 809bef707b6e..e86803163839 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,frm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,frm)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ -- cgit From 37a2fa5d5a58628d317a2305965863dfe50f140e Mon Sep 17 00:00:00 2001 From: Anurag Jain Date: Mon, 1 Oct 2012 14:10:03 +0200 Subject: fdo#51304: Remove the author of some java source files This patch remove some '@author' for Java souce files, and removes some commented code founded when removing the '@author'. Change-Id: Ic4fcd028a9cdbd85c693d93bcd48e41f36386d22 --- forms/qa/integration/forms/BooleanValidator.java | 4 ---- forms/qa/integration/forms/CellBinding.java | 4 ---- forms/qa/integration/forms/ImageComparison.java | 4 ---- forms/qa/integration/forms/SpreadsheetDocument.java | 4 ---- forms/qa/integration/forms/SpreadsheetView.java | 4 ---- forms/qa/org/openoffice/complex/forms/tools/ResultSet.java | 4 ---- forms/qa/org/openoffice/xforms/Instance.java | 4 ---- forms/qa/org/openoffice/xforms/Model.java | 4 ---- forms/qa/org/openoffice/xforms/XMLDocument.java | 4 ---- 9 files changed, 36 deletions(-) (limited to 'forms') diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java index 5b03398ed2f0..d69ee588390d 100644 --- a/forms/qa/integration/forms/BooleanValidator.java +++ b/forms/qa/integration/forms/BooleanValidator.java @@ -24,10 +24,6 @@ package integration.forms; -/** - * - * @author fs93730 - */ public class BooleanValidator extends integration.forms.ControlValidator { private boolean m_preventChecked; diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index ea77d0f5a528..7dc9408c011e 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -38,10 +38,6 @@ import com.sun.star.sheet.XCellRangeFormula; import com.sun.star.table.CellRangeAddress; import com.sun.star.text.XTextRange; -/** - * - * @author fs93730 - */ public class CellBinding extends complexlib.ComplexTestCase { /** the test document our form layer lives in */ diff --git a/forms/qa/integration/forms/ImageComparison.java b/forms/qa/integration/forms/ImageComparison.java index 119039775938..f604fd3e7832 100644 --- a/forms/qa/integration/forms/ImageComparison.java +++ b/forms/qa/integration/forms/ImageComparison.java @@ -24,10 +24,6 @@ package integration.forms; -/** - * - * @author fs93730 - */ public final class ImageComparison implements com.sun.star.awt.XImageConsumer { diff --git a/forms/qa/integration/forms/SpreadsheetDocument.java b/forms/qa/integration/forms/SpreadsheetDocument.java index 8947064dfdee..cd653a773231 100644 --- a/forms/qa/integration/forms/SpreadsheetDocument.java +++ b/forms/qa/integration/forms/SpreadsheetDocument.java @@ -29,10 +29,6 @@ import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; import com.sun.star.beans.NamedValue; -/** - * - * @author fs93730 - */ public class SpreadsheetDocument extends DocumentHelper { /** Creates a new blank spreadsheet document */ diff --git a/forms/qa/integration/forms/SpreadsheetView.java b/forms/qa/integration/forms/SpreadsheetView.java index c4337ea188b0..fd958d5d478f 100644 --- a/forms/qa/integration/forms/SpreadsheetView.java +++ b/forms/qa/integration/forms/SpreadsheetView.java @@ -31,10 +31,6 @@ import com.sun.star.container.*; import integration.forms.DocumentHelper; -/** - * - * @author fs93730 - */ public class SpreadsheetView extends integration.forms.DocumentViewHelper { diff --git a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java index df5a2ff5bf58..6bfc7700c26a 100644 --- a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java +++ b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java @@ -37,10 +37,6 @@ import com.sun.star.util.Date; import com.sun.star.util.DateTime; import com.sun.star.util.Time; -/** - * - * @author frank.schoenheit@sun.com - */ public class ResultSet implements XResultSet, XRow { private final XResultSet m_resultSet; diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java index 5e4e04741995..ec99b551296d 100644 --- a/forms/qa/org/openoffice/xforms/Instance.java +++ b/forms/qa/org/openoffice/xforms/Instance.java @@ -11,10 +11,6 @@ import com.sun.star.xml.dom.XNode; import com.sun.star.xml.dom.XNodeList; import java.util.NoSuchElementException; -/** - * - * @author fs93730 - */ public class Instance { private Model m_model; diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java index dba329f5e3f9..b96eb9e1d5cb 100644 --- a/forms/qa/org/openoffice/xforms/Model.java +++ b/forms/qa/org/openoffice/xforms/Model.java @@ -29,10 +29,6 @@ import com.sun.star.xforms.XFormsUIHelper1; import com.sun.star.xforms.XModel; import com.sun.star.xml.dom.XNode; -/** encapsulates an XForms model - * - * @author fs93730 - */ public class Model { private XModel m_model; diff --git a/forms/qa/org/openoffice/xforms/XMLDocument.java b/forms/qa/org/openoffice/xforms/XMLDocument.java index c5c153586842..e71e75540c11 100644 --- a/forms/qa/org/openoffice/xforms/XMLDocument.java +++ b/forms/qa/org/openoffice/xforms/XMLDocument.java @@ -35,10 +35,6 @@ import com.sun.star.xforms.XFormsUIHelper1; import com.sun.star.xforms.XModel; import integration.forms.DocumentType; -/** - * - * @author fs93730 - */ public class XMLDocument extends integration.forms.DocumentHelper { private XFormsSupplier m_formsSupplier; -- cgit From 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sat, 29 Sep 2012 14:47:11 +0200 Subject: Replace usage of rtl_*Memory with equivalent from string.h Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159 Reviewed-on: https://gerrit.libreoffice.org/734 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- forms/source/component/Columns.cxx | 5 +++-- forms/source/component/imgprod.cxx | 2 +- forms/source/richtext/richtextmodel.cxx | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'forms') diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 7f8b95877eae..77372ae6d20c 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include + #include "Columns.hxx" #include "property.hrc" #include "property.hxx" @@ -49,7 +51,6 @@ #include "services.hxx" #include "frm_resource.hrc" #include -#include //......................................................................... namespace frm @@ -138,7 +139,7 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence& _rIdenti sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast(this); diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index be2843044899..49e539bc4012 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -90,7 +90,7 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun { const sal_uInt32 nOldLength = maSeq.getLength(); maSeq.realloc( nOldLength + nRead ); - rtl_copyMemory( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() ); + memcpy( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() ); } } while( nBytesToRead == nRead ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 141b2f0df325..33aba9509c65 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -589,7 +589,7 @@ namespace frm { Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() ); if ( ( _rId.getLength() == aEditEngineAccessId.getLength() ) - && ( 0 == rtl_compareMemory( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) ) + && ( 0 == memcmp( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) ) ) return reinterpret_cast< sal_Int64 >( m_pEngine.get() ); -- cgit From e40a86ca748ff7cd742250f1fb989eeeeb4d80b3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 10:37:33 +0300 Subject: Use prefix Change-Id: Id6ef3325df8dc8d193a7745370134ef47792893a --- forms/source/misc/services.cxx | 2 +- forms/util/frm.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'forms') diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 9f1785fab7dd..de7cf7907e2f 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -319,7 +319,7 @@ void SAL_CALL createRegistryInfo_FORMS() } //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { if (!_pServiceManager || !_pImplName) return NULL; diff --git a/forms/util/frm.component b/forms/util/frm.component index c727e805940a..fcb705097604 100644 --- a/forms/util/frm.component +++ b/forms/util/frm.component @@ -26,7 +26,7 @@ * **********************************************************************--> - -- cgit From c25cb8a641723ab098980bb842caf75c0dc9b059 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 2 Oct 2012 15:03:12 +0200 Subject: fdo#46808, Adapt task::InteractionHandler UNO service to new style Since we don't need to expose XInitialisation, we can make the new-style service implement XInteractionHandler2. Change-Id: Ib27beed1c12df17592c6472d6f58c233d2c41558 --- forms/source/xforms/submission/replace.cxx | 6 +++--- forms/source/xforms/submission/submission.hxx | 4 ++-- forms/source/xforms/submission/submission_get.cxx | 10 +++++----- forms/source/xforms/submission/submission_get.hxx | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'forms') diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 9d487cc3c9e9..902ba9cffaf5 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -41,6 +41,7 @@ #include #include #include +#include #include using namespace com::sun::star::uno; @@ -129,9 +130,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( _xHandler.is() ) pHelper->m_aInteractionHandler = _xHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY); - OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); + pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( + InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = Reference< XProgressHandler >(pProgressHelper); diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 37e0e07d7a58..eb921bc74d98 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -123,7 +123,7 @@ protected: CSS::uno::Reference< CSS::xml::xpath::XXPathObject > m_aXPathObject; CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment; CSS::uno::Reference< CSS::io::XInputStream > m_aResultStream; - CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; + CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; rtl::OUString m_aEncoding; ::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler @@ -142,7 +142,7 @@ public: CSubmission(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : m_aURLObj(aURL) , m_aFragment(aFragment) - , m_aFactory(::comphelper::getProcessServiceFactory()) + , m_xContext(::comphelper::getProcessComponentContext()) {} virtual ~CSubmission() {} diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 9ae7b6803cc9..156972404302 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -39,6 +39,7 @@ #include #include #include +#include using namespace CSS::uno; using namespace CSS::ucb; @@ -72,9 +73,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< if( aInteractionHandler.is() ) pHelper->m_aInteractionHandler = aInteractionHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY); - OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); + pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( + CSS::task::InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); @@ -98,8 +98,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< aUTF8QueryURL.append(aQueryString.makeStringAndClear()); } OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8); - ucbhelper::Content aContent(aQueryURL, aEnvironment, comphelper::getComponentContext(m_aFactory)); - CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(comphelper::getComponentContext(m_aFactory)), UNO_QUERY_THROW ); + ucbhelper::Content aContent(aQueryURL, aEnvironment, m_xContext); + CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(m_xContext), UNO_QUERY_THROW ); aContent.openStream(aPipe); // get reply try { diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index fe7cde8ba984..2e5e6038edcb 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -20,14 +20,14 @@ #ifndef __SUBMISSION_GET_HXX #define __SUBMISSION_GET_HXX -#include +#include #include "submission.hxx" class CSubmissionGet : public CSubmission { private: - CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; + CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; public: CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler); -- cgit From dd11a1e57a2565560803dc3fef5fccc9e7157105 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 14:36:34 +0200 Subject: Fixes/improvements on previous commit * UUIInteractionHandler still needs to implement XInitialization. * Moved ambiguating InteractionHandler typedef out of the way. * Removed InteractionHandler.createDefault, as it was originally stated that "it is strongly recommended that [the "Parent"] property is supplied." * Added back documentation about Parent and Context. * Simplified some call-sites to directly use XInteractionHandler2. Change-Id: I1029b8f3cf079171c75920cafaaa44b5bbada883 --- forms/source/xforms/submission/replace.cxx | 4 ++-- forms/source/xforms/submission/submission_get.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'forms') diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 902ba9cffaf5..cb53a0bf7eb3 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -130,8 +130,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( _xHandler.is() ) pHelper->m_aInteractionHandler = _xHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = Reference< XProgressHandler >(pProgressHelper); diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 156972404302..9a141a1bf459 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -73,8 +73,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< if( aInteractionHandler.is() ) pHelper->m_aInteractionHandler = aInteractionHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - CSS::task::InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + CSS::task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); -- cgit From f7a24eff2d40ca30c6f299ab6534393c5c146b95 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 12 Oct 2012 13:26:46 +0200 Subject: 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 --- forms/source/xforms/binding.cxx | 18 +++++++++--------- forms/source/xforms/model.cxx | 2 +- forms/source/xforms/model_ui.cxx | 18 +++++++++--------- forms/source/xforms/submission.cxx | 2 +- forms/source/xforms/xmlhelper.cxx | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'forms') 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, +static void lcl_addListenerToNode( Reference xNode, Reference xListener ) { Reference xTarget( xNode, UNO_QUERY ); @@ -548,7 +548,7 @@ void lcl_addListenerToNode( Reference xNode, } } -void lcl_removeListenerFromNode( Reference xNode, +static void lcl_removeListenerFromNode( Reference xNode, Reference xListener ) { Reference 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 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 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 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, OUStringBuffer& rBuffer ) +static void lcl_getString( const Reference& xNode, OUStringBuffer& rBuffer ) { if( xNode->getNodeType() == NodeType_TEXT_NODE || xNode->getNodeType() == NodeType_ATTRIBUTE_NODE ) @@ -1150,7 +1150,7 @@ void lcl_getString( const Reference& xNode, OUStringBuffer& rBuffer ) } } -OUString lcl_getString( const Reference& xNode ) +static OUString lcl_getString( const Reference& 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& xTunnel ) +static Model* lcl_getModel( const Reference& 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 ) { 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 ) { 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, 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 lcl_getModels( +static Reference lcl_getModels( const Reference& xComponent ) { Reference 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& xNodes ) +static OUString lcl_serializeForDisplay( const Reference& xNodes ) { ::rtl::OUString sResult; @@ -879,7 +879,7 @@ OUString lcl_serializeForDisplay( const Reference& xNodes ) return sResult; } -OUString lcl_serializeForDisplay( const Reference& xResult ) +static OUString lcl_serializeForDisplay( const Reference& 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; -- cgit