summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/xforms/XFormsBindContext.cxx8
-rw-r--r--xmloff/source/xforms/XFormsBindContext.hxx6
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.cxx8
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.hxx6
-rw-r--r--xmloff/source/xforms/XFormsModelContext.cxx9
-rw-r--r--xmloff/source/xforms/XFormsModelContext.hxx5
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.cxx12
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.hxx3
-rw-r--r--xmloff/source/xforms/xformsapi.cxx24
-rw-r--r--xmloff/source/xforms/xformsapi.hxx6
10 files changed, 38 insertions, 49 deletions
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index eee251b22b9c..452156c65e85 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -30,7 +30,7 @@
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/xforms/XModel.hpp>
+#include <com/sun/star/xforms/XModel2.hpp>
#include <tools/debug.hxx>
@@ -42,7 +42,7 @@ using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::UNO_QUERY_THROW;
using com::sun::star::container::XNameContainer;
using com::sun::star::xml::sax::XAttributeList;
-using com::sun::star::xforms::XModel;
+using com::sun::star::xforms::XModel2;
using namespace xmloff::token;
@@ -69,9 +69,9 @@ XFormsBindContext::XFormsBindContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XPropertySet>& xModel ) :
+ const Reference<XModel2>& xModel ) :
TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
- mxModel( xModel, UNO_QUERY_THROW ),
+ mxModel( xModel ),
mxBinding( NULL )
{
// attach binding to model
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 0de4cdb2ee65..d376c60f7db3 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -31,7 +31,7 @@
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
- namespace xforms { class XModel; }
+ namespace xforms { class XModel2; }
} } }
namespace rtl { class OUString; }
class SvXMLImport;
@@ -41,7 +41,7 @@ class SvXMLImportContext;
/** import the xforms:binding element */
class XFormsBindContext : public TokenContext
{
- const com::sun::star::uno::Reference<com::sun::star::xforms::XModel> mxModel;
+ const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxBinding;
public:
@@ -49,7 +49,7 @@ public:
XFormsBindContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
+ const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
virtual ~XFormsBindContext();
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index e004bf83e54d..abfa9326cdc4 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/xml/dom/XDocument.hpp>
-#include <com/sun/star/xforms/XModel.hpp>
+#include <com/sun/star/xforms/XModel2.hpp>
#include <tools/debug.hxx>
#include <xmloff/xmlnmspe.hxx>
@@ -43,7 +43,7 @@ using com::sun::star::uno::Reference;
using com::sun::star::uno::makeAny;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::Sequence;
-using com::sun::star::xforms::XModel;
+using com::sun::star::xforms::XModel2;
using com::sun::star::beans::XPropertySet;
using com::sun::star::beans::PropertyValue;
using com::sun::star::xml::sax::XAttributeList;
@@ -64,9 +64,9 @@ XFormsInstanceContext::XFormsInstanceContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- Reference<XPropertySet> xModel ) :
+ const Reference<XModel2> & xModel ) :
TokenContext( rImport, nPrefix, rLocalName, aAttributes, aEmptyMap ),
- mxModel( Reference<XModel>( xModel, UNO_QUERY ) )
+ mxModel( xModel )
{
DBG_ASSERT( mxModel.is(), "need model" );
}
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index 631c8f9c80cf..30b50c2176e5 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace xml { namespace dom { class XDocument; } }
namespace beans { class XPropertySet; }
- namespace xforms { class XModel; }
+ namespace xforms { class XModel2; }
} } }
namespace rtl { class OUString; }
class SvXMLImport;
@@ -42,7 +42,7 @@ class SvXMLImportContext;
/** import the xforms:instance element */
class XFormsInstanceContext : public TokenContext
{
- com::sun::star::uno::Reference<com::sun::star::xforms::XModel> mxModel;
+ com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> mxInstance;
rtl::OUString msId;
rtl::OUString msURL;
@@ -52,7 +52,7 @@ public:
XFormsInstanceContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
- com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xModel );
+ const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel );
virtual ~XFormsInstanceContext();
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 3a47de572501..0cccc425188b 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/xforms/XModel.hpp>
+#include <com/sun/star/xforms/XModel2.hpp>
using rtl::OUString;
@@ -78,7 +78,7 @@ XFormsModelContext::~XFormsModelContext()
}
-Reference<XPropertySet> XFormsModelContext::getModel()
+Reference<css::xforms::XModel2> XFormsModelContext::getModel()
{
return mxModel;
}
@@ -126,10 +126,7 @@ SvXMLImportContext* XFormsModelContext::HandleChild(
break;
case XML_SCHEMA:
pContext = new SchemaContext(
- GetImport(), nPrefix, rLocalName,
- Reference<com::sun::star::xforms::XModel>( mxModel,
- UNO_QUERY_THROW )
- ->getDataTypeRepository() );
+ GetImport(), nPrefix, rLocalName, mxModel->getDataTypeRepository() );
break;
default:
OSL_FAIL( "Boooo!" );
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index acbb99d8e43e..9339bc59eccd 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -22,6 +22,7 @@
#include "TokenContext.hxx"
#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/xforms/XModel2.hpp>
//
@@ -39,7 +40,7 @@ class SvXMLImportContext;
/** import the xforms:model element */
class XFormsModelContext : public TokenContext
{
- com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxModel;
+ com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
public:
@@ -48,7 +49,7 @@ public:
const ::rtl::OUString& rLName );
virtual ~XFormsModelContext();
- com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> getModel();
+ com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel();
//
// implement SvXMLImportContext & TokenContext methods:
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 7ad50a6a7bdf..23e470cdf619 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -32,7 +32,7 @@
#include <sax/tools/converter.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/xforms/XModel.hpp>
+#include <com/sun/star/xforms/XModel2.hpp>
#include <tools/debug.hxx>
@@ -40,7 +40,7 @@ using rtl::OUString;
using com::sun::star::beans::XPropertySet;
using com::sun::star::container::XNameContainer;
using com::sun::star::xml::sax::XAttributeList;
-using com::sun::star::xforms::XModel;
+using com::sun::star::xforms::XModel2;
using namespace com::sun::star::uno;
using namespace xmloff::token;
@@ -72,17 +72,15 @@ XFormsSubmissionContext::XFormsSubmissionContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XPropertySet>& xModel ) :
+ const Reference<XModel2>& xModel ) :
TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
mxSubmission()
{
// register submission with model
DBG_ASSERT( xModel.is(), "need model" );
- Reference<XModel> xXModel( xModel, UNO_QUERY );
- DBG_ASSERT( xXModel.is(), "need XModel" );
- mxSubmission = xXModel->createSubmission().get();
+ mxSubmission = xModel->createSubmission().get();
DBG_ASSERT( mxSubmission.is(), "can't create submission" );
- xXModel->getSubmissions()->insert( makeAny( mxSubmission ) );
+ xModel->getSubmissions()->insert( makeAny( mxSubmission ) );
}
XFormsSubmissionContext::~XFormsSubmissionContext()
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 6636d7bd6765..0c56d8bec171 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -31,6 +31,7 @@
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
namespace beans { class XPropertySet; }
+ namespace xforms { class XModel2; }
} } }
namespace rtl { class OUString; }
class SvXMLImport;
@@ -47,7 +48,7 @@ public:
XFormsSubmissionContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
+ const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
virtual ~XFormsSubmissionContext();
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 7a6a6066088e..b73af0ab43ca 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -26,7 +26,8 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
-#include <com/sun/star/xforms/XModel.hpp>
+#include <com/sun/star/xforms/Model.hpp>
+#include <com/sun/star/xforms/XModel2.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
@@ -48,8 +49,9 @@ using com::sun::star::container::XNameAccess;
using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::xforms::XFormsSupplier;
using com::sun::star::xforms::XDataTypeRepository;
+using com::sun::star::xforms::Model;
+using com::sun::star::xforms::XModel2;
using com::sun::star::container::XNameContainer;
-using comphelper::getProcessServiceFactory;
using com::sun::star::uno::makeAny;
using com::sun::star::uno::Any;
using com::sun::star::uno::Exception;
@@ -57,26 +59,16 @@ using com::sun::star::uno::Exception;
using namespace com::sun::star;
using namespace xmloff::token;
-static Reference<XPropertySet> lcl_createPropertySet( const OUString& rServiceName )
+Reference<XModel2> xforms_createXFormsModel()
{
- Reference<XMultiServiceFactory> xFactory = getProcessServiceFactory();
- DBG_ASSERT( xFactory.is(), "can't get service factory" );
-
- Reference<XPropertySet> xModel( xFactory->createInstance( rServiceName ),
- UNO_QUERY_THROW );
- DBG_ASSERT( xModel.is(), "can't create model" );
+ Reference<XModel2> xModel = Model::create( comphelper::getProcessComponentContext() );
return xModel;
}
-Reference<XPropertySet> xforms_createXFormsModel()
-{
- return lcl_createPropertySet( "com.sun.star.xforms.Model" );
-}
-
void xforms_addXFormsModel(
const Reference<frame::XModel>& xDocument,
- const Reference<XPropertySet>& xModel )
+ const Reference<xforms::XModel2>& xModel )
{
bool bSuccess = false;
try
@@ -129,7 +121,7 @@ static Reference<XPropertySet> lcl_findXFormsBindingOrSubmission(
sal_Int32 nNames = aNames.getLength();
for( sal_Int32 n = 0; (n < nNames) && !xRet.is(); n++ )
{
- Reference<xforms::XModel> xModel(
+ Reference<xforms::XModel2> xModel(
xForms->getByName( pNames[n] ), UNO_QUERY );
if( xModel.is() )
{
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index b9e0e10ab646..75115b90c1e0 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -31,15 +31,15 @@ namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
namespace frame { class XModel; }
namespace uno { template<class A> class Reference; }
- namespace xforms { class XDataTypeRepository; }
+ namespace xforms { class XDataTypeRepository; class XModel2; }
} } }
class SvXMLNamespaceMap;
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_createXFormsModel();
+com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> xforms_createXFormsModel();
void xforms_addXFormsModel(
const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xDocument,
- const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
+ const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const rtl::OUString& );
generated by cgit (git 2.34.1) at 2025-04-27 16:00:11 +0000