summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-04 17:57:31 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 13:43:35 +0100
commit50c26300e5b5ae9671f18a9e449516604d16105f (patch)
treee4f0cf83c41bbd70bbe6021f85b8e97815134f42 /forms
parente78706a8bf35d8471982e36c4543f2db8a35f1c2 (diff)
Remove lots of dead code
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/propertybaghelper.cxx11
-rw-r--r--forms/source/xforms/model.cxx59
-rw-r--r--forms/source/xforms/submission/serialization_app_xml.cxx11
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.cxx16
-rw-r--r--forms/source/xforms/submission/submission_post.cxx10
5 files changed, 0 insertions, 107 deletions
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 508c05ac5ca1..ef09d4841148 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -94,7 +94,6 @@ namespace frm
,m_pPropertyArrayHelper( NULL )
,m_bDisposed( false )
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::PropertyBagHelper" );
}
//--------------------------------------------------------------------
@@ -106,14 +105,12 @@ namespace frm
//--------------------------------------------------------------------
void PropertyBagHelper::dispose()
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::dispose" );
m_bDisposed = true;
}
//--------------------------------------------------------------------
void PropertyBagHelper::impl_nts_checkDisposed_throw() const
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_nts_checkDisposed_throw" );
if ( m_bDisposed )
throw DisposedException();
}
@@ -121,14 +118,12 @@ namespace frm
//--------------------------------------------------------------------
void PropertyBagHelper::impl_nts_invalidatePropertySetInfo()
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_nts_invalidatePropertySetInfo" );
delete m_pPropertyArrayHelper, m_pPropertyArrayHelper = NULL;
}
//--------------------------------------------------------------------
sal_Int32 PropertyBagHelper::impl_findFreeHandle( const ::rtl::OUString& _rPropertyName )
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_findFreeHandle" );
::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() );
// check the preferred handle
@@ -168,8 +163,6 @@ namespace frm
//--------------------------------------------------------------------
::comphelper::OPropertyArrayAggregationHelper& PropertyBagHelper::impl_ts_getArrayHelper() const
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::impl_ts_getArrayHelper" );
- //::osl::MutexGuard aGuard( m_rContext.getMutex() );
OPropertyArrayAggregationHelper* p = m_pPropertyArrayHelper;
if ( !p )
{
@@ -204,7 +197,6 @@ namespace frm
//--------------------------------------------------------------------
void PropertyBagHelper::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::addProperty" );
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
@@ -232,7 +224,6 @@ namespace frm
//--------------------------------------------------------------------
void PropertyBagHelper::removeProperty( const ::rtl::OUString& _rName )
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::removeProperty" );
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
@@ -281,7 +272,6 @@ namespace frm
//--------------------------------------------------------------------
Sequence< PropertyValue > PropertyBagHelper::getPropertyValues()
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::getPropertyValues" );
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
@@ -324,7 +314,6 @@ namespace frm
//--------------------------------------------------------------------
void PropertyBagHelper::setPropertyValues( const Sequence< PropertyValue >& _rProps )
{
- // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "PropertyBagHelper::setPropertyValues" );
::osl::ClearableMutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 877baab5e1c6..26074f2a1c6f 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -234,60 +234,12 @@ void Model::dbg_assertInvariant() const
{
OSL_ENSURE( mpInstances != NULL, "no instances found" );
OSL_ENSURE( mxInstances.is(), "No instance container!" );
- // OSL_ENSURE( mxInstances->hasElements(), "no instance!" );
OSL_ENSURE( mpBindings != NULL, "no bindings element" );
OSL_ENSURE( mxBindings.is(), "No Bindings container" );
OSL_ENSURE( mpSubmissions != NULL, "no submissions element" );
OSL_ENSURE( mxSubmissions.is(), "No Submission container" );
-
-
-
- /*
- // check bindings, and things that have to do with our binding
- std::vector<MIP*> aAllMIPs; // check MIP map
- sal_Int32 nCount = mpBindings->countItems();
- for( sal_Int32 i = 0; i < nCount; i++ )
- {
- Binding* pBind = Binding::getBinding(
- mpBindings->Collection<XPropertySet_t>::getItem( i ) );
-
- // examine and check binding
- OSL_ENSURE( pBind != NULL, "invalid binding found" );
-
- OSL_ENSURE( Model::getModel( pBind->getModel() ) == this,
- "our binding doesn't know us.");
- // check this binding's MIP against MIP map
- MIP* pMIP = const_cast<MIP*>( pBind->_getMIP() );
- sal_Int32 nFound = 0;
- if( pMIP != NULL )
- {
- aAllMIPs.push_back( pMIP );
- for( MIPs_t::const_iterator aIter = maMIPs.begin();
- aIter != maMIPs.end();
- aIter++ )
- {
- if( pMIP == aIter->second )
- nFound++;
- }
- }
- OSL_ENSURE( ( pMIP == NULL ) == ( nFound == 0 ), "MIP-map wrong" );
- }
-
- // check MIP map for left-over MIPs
- for( MIPs_t::const_iterator aIter = maMIPs.begin();
- aIter != maMIPs.end();
- aIter++ )
- {
- MIP* pMIP = aIter->second;
- std::vector<MIP*>::iterator aFound =
- std::find( aAllMIPs.begin(), aAllMIPs.end(), pMIP );
- if( aFound != aAllMIPs.end() )
- aAllMIPs.erase( aFound );
- }
- OSL_ENSURE( aAllMIPs.empty(), "lonely MIPs found!" );
- */
}
#endif
@@ -325,8 +277,6 @@ void Model::removeMIPs( void* pTag )
MIP Model::queryMIP( const XNode_t& xNode ) const
{
- // OSL_ENSURE( xNode.is(), "no node" );
-
// travel up inheritance chain and inherit MIPs
MIP aRet;
for( XNode_t xCurrent = xNode;
@@ -717,15 +667,6 @@ Model::XSet_t Model::getSubmissions()
return mxSubmissions;
}
-
-
-//
-// implementation of XFormsUIHelper1 interface
-// can be found in file model_ui.cxx
-//
-
-
-
//
// implement XPropertySet & friends
//
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index c3e2ab545668..f7262c527045 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -96,17 +96,6 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X
}
}
-/*
-void
-CSerializationAppXML::serialize_nodeset()
-{
- CSS::uno::Reference< CSS::xml::dom::XNodeList > aNodeList = m_aXPathObject->getNodeList();
- for (sal_Int32 i=0; i<aNodeList->getLength(); i++)
- serialize_node(aNodeList->item(i));
- m_aPipe->closeOutput();
-}
-*/
-
void
CSerializationAppXML::serialize()
{
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index e5ab54533e61..b0f498ff1b96 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -170,23 +170,7 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
if (aChild.is() && aChild->getNodeType() == NodeType_ELEMENT_NODE)
serialize_node(aChild);
}
-
- // siblings...
-// Reference< XNode > aSibling = aNode->getNextSibling();
-// if (aSibling.is())
-// serialize_node(aSibling);
-
-}
-
-/*
-void CSerializationURLEncoded::serialize_nodeset()
-{
- Reference< XNodeList > aNodeList = m_aXPathObject->getNodeList();
- for (sal_Int32 i=0; i<aNodeList->getLength(); i++)
- serialize_node(aNodeList->item(i));
- m_aPipe->closeOutput();
}
-*/
void CSerializationURLEncoded::serialize()
{
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index c76d492873d9..114b2518afd1 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -66,7 +66,6 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment);
// use post command
-
OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post"));
PostCommandArgument2 aPostArgument;
aPostArgument.Source = apSerialization->getInputStream();
@@ -78,26 +77,17 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
aCommandArgument <<= aPostArgument;
aContent.executeCommand( aCommandName, aCommandArgument);
- // wait for command to finish
- // pProgressHelper->m_cFinished.wait();
-
- // CSS::uno::Reference< XOutputStream > xOut(aSink, UNO_QUERY_THROW);
- // xOut->closeOutput();
-
try {
- // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW);
m_aResultStream = aSink->getInputStream();
} catch (Exception&) {
OSL_ENSURE(sal_False, "Cannot open reply stream from content");
}
} catch (Exception&)
{
- // XXX
OSL_ENSURE(sal_False, "Exception during UCB operatration.");
return UNKNOWN_ERROR;
}
-
return SUCCESS;
}