From d815c54054cb33d30031b2157ae3d720edc63484 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 9 Mar 2011 13:39:30 +0100 Subject: masterfix DEV300: #i10000# drafts removed --- .../bf_xmloff/source/forms/formcellbinding.hxx | 72 ++++++++++++++-------- .../source/forms/xmloff_elementexport.cxx | 7 ++- .../source/forms/xmloff_formcellbinding.cxx | 12 ++-- 3 files changed, 60 insertions(+), 31 deletions(-) diff --git a/binfilter/bf_xmloff/source/forms/formcellbinding.hxx b/binfilter/bf_xmloff/source/forms/formcellbinding.hxx index c42b87554..41f6371f8 100644 --- a/binfilter/bf_xmloff/source/forms/formcellbinding.hxx +++ b/binfilter/bf_xmloff/source/forms/formcellbinding.hxx @@ -40,11 +40,13 @@ #ifndef _COM_SUN_STAR_TABLE_CELLRANGEADDRESS_HPP_ #include #endif -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XVALUEBINDING_HPP_ -#include +#ifndef _COM_SUN_STAR_FORM_BINDING_XVALUEBINDING_HPP_ +//#include +#include #endif -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XLISTENTRYSOURCE_HPP_ -#include +#ifndef _COM_SUN_STAR_FORM_XLISTENTRYSOURCE_HPP_ +#include +//#include #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include @@ -97,15 +99,19 @@ namespace xmloff @precond isCellBindingAllowed returns */ - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding > - createCellBindingFromStringAddress( +// ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding > + ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + createCellBindingFromStringAddress( + const ::rtl::OUString& _rAddress, bool _bUseIntegerBinding ) const; /** gets a cell range list source binding for the given address */ - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > + ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + + // ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -118,8 +124,10 @@ namespace xmloff @see isCellBinding */ ::rtl::OUString getStringAddressFromCellBinding( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding - ) const; +// const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + + ) const; /** creates a string representation for the given list source's range address @@ -132,18 +140,24 @@ namespace xmloff @see isCellRangeListSource */ ::rtl::OUString getStringAddressFromCellListSource( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource - ) const; + // const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + + ) const; /** returns the current binding of our control model, if any. */ - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding > - getCurrentBinding( ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + //::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding > + + getCurrentBinding( ) const; /** returns the current external list source of the control model, if any */ - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > - getCurrentListSource( ) const; + //::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource > + ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + + getCurrentListSource( ) const; /** sets a new binding for our control model @precond @@ -151,8 +165,10 @@ namespace xmloff returning ) */ void setBinding( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding - ); +// const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + + ); /** sets a list source for our control model @precond @@ -160,8 +176,10 @@ namespace xmloff returning ) */ void setListSource( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource - ); +// const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + + ); /** checks whether it's possible to bind the control model to a spreadsheet cell */ @@ -188,21 +206,27 @@ namespace xmloff /** checks whether a given binding is a spreadsheet cell binding */ bool isCellBinding( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding + //const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding + + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; /** checks whether a given binding is a spreadsheet cell binding, exchanging integer values */ bool isCellIntegerBinding( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding - ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + //const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XValueBinding >& _rxBinding + + ) const; /** checks whether a given list source is a spreadsheet cell list source */ bool isCellRangeListSource( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource - ) const; +// const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::form::XListEntrySource >& _rxSource + const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + + ) const; protected: /** creates an address object from a string representation of a cell address diff --git a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx index afa2061e4..5cd4a3f37 100644 --- a/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx +++ b/binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx @@ -83,8 +83,11 @@ #include "formcellbinding.hxx" #endif +#include + #ifndef _DRAFTS_COM_SUN_STAR_FORM_XLISTENTRYSINK_HPP_ -#include +//#include +#include #endif #include @@ -106,7 +109,7 @@ namespace xmloff using namespace ::com::sun::star::script; using namespace ::com::sun::star::io; using namespace ::com::sun::star::table; - using namespace ::drafts::com::sun::star::form; + using namespace ::com::sun::star::form::binding; //===================================================================== //= OElementExport diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx index 57d6f70cc..928a8b3fa 100644 --- a/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx +++ b/binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx @@ -29,11 +29,13 @@ #include "formcellbinding.hxx" #endif -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XBINDABLEVALUE_HPP_ -#include +#ifndef _COM_SUN_STAR_FORM_BINDING_XBINDABLEVALUE_HPP_ +//#include +#include #endif -#ifndef _DRAFTS_COM_SUN_STAR_FORM_XLISTENTRYSINK_HPP_ -#include +#ifndef _COM_SUN_STAR_FORM_BINDING_XLISTENTRYSINK_HPP_ +//#include +#include #endif #ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESUPPLIER_HPP_ #include @@ -76,7 +78,7 @@ namespace xmloff using namespace ::com::sun::star::table; using namespace ::com::sun::star::form; using namespace ::com::sun::star::lang; - using namespace ::drafts::com::sun::star::form; + using namespace ::com::sun::star::form::binding; namespace { -- cgit v1.2.3