diff options
author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /forms | |
parent | Use isFuzzy() instead of getFuzzy() (diff) | |
parent | tubes: use new .ui format for contacts dialog (diff) | |
download | core-e5ce011c3f32f53ef073aec5485450b2588b656a.tar.gz core-e5ce011c3f32f53ef073aec5485450b2588b656a.zip |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'forms')
23 files changed, 40 insertions, 75 deletions
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; 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 <string.h> + #include "Columns.hxx" #include "property.hrc" #include "property.hxx" @@ -49,7 +51,6 @@ #include "services.hxx" #include "frm_resource.hrc" #include <tools/debug.hxx> -#include <rtl/memory.h> //......................................................................... namespace frm @@ -138,7 +139,7 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _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<sal_Int64>(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/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/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() ); 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/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 9d487cc3c9e9..cb53a0bf7eb3 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include <ucbhelper/content.hxx> 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.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.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..9a141a1bf459 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -39,6 +39,7 @@ #include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/io/Pipe.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> 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.set( + CSS::task::InteractionHandler::createWithParent(m_xContext, 0), 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 <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #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); 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; 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 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="frm" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.form.ONavigationBarControl"> <service name="com.sun.star.form.control.NavigationToolBar"/> |