fdo#62475 removed pointless comments

Change-Id: I13e7eedaa5f0f116bd01834fc6db576c39350163
Reviewed-on: https://gerrit.libreoffice.org/5348
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
Jelle van der Waa 2013-08-11 15:22:59 +02:00 committed by Tor Lillqvist
parent 9499df9f8c
commit 4eb1232fbc
23 changed files with 125 additions and 703 deletions

View File

@ -25,7 +25,6 @@
namespace xmlscript
{
//==============================================================================
template< typename T >
inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a )
{
@ -38,7 +37,6 @@ inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a )
}
}
//==============================================================================
template< typename T >
inline T extract_throw( ::com::sun::star::uno::Any const & a )
{

View File

@ -31,11 +31,8 @@
namespace xmlscript
{
/*##############################################################################
IMPORTING
##############################################################################*/
// IMPORTING
/** Creates a document handler to be used for SAX1 parser that can handle
namespaces. Namespace URI are mapped to integer ids for performance.

View File

@ -17,15 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <cppuhelper/implementationentry.hxx>
using namespace ::rtl;
using namespace ::com::sun::star::uno;
// =============================================================================
namespace xmlscript
{
Sequence< OUString > SAL_CALL getSupportedServiceNames_DocumentHandlerImpl();
@ -58,8 +54,6 @@ namespace xmlscript
Reference< XComponentContext > const & xContext )
SAL_THROW( (Exception) );
// -----------------------------------------------------------------------------
static const struct ::cppu::ImplementationEntry s_entries [] =
{
{
@ -91,8 +85,6 @@ namespace xmlscript
};
}
// =============================================================================
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlscript_component_getFactory(

View File

@ -22,7 +22,6 @@
#include <cppuhelper/implbase1.hxx>
#include <xmlscript/xml_helper.hxx>
using namespace osl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@ -32,7 +31,6 @@ using ::rtl::ByteSequence;
namespace xmlscript
{
//==================================================================================================
class BSeqInputStream
: public ::cppu::WeakImplHelper1< io::XInputStream >
{
@ -61,7 +59,7 @@ public:
virtual void SAL_CALL closeInput()
throw (io::NotConnectedException, io::IOException, RuntimeException);
};
//__________________________________________________________________________________________________
sal_Int32 BSeqInputStream::readBytes(
Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
@ -75,34 +73,31 @@ sal_Int32 BSeqInputStream::readBytes(
_nPos += nBytesToRead;
return nBytesToRead;
}
//__________________________________________________________________________________________________
sal_Int32 BSeqInputStream::readSomeBytes(
Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
{
return readBytes( rData, nMaxBytesToRead );
}
//__________________________________________________________________________________________________
void BSeqInputStream::skipBytes(
sal_Int32 /*nBytesToSkip*/ )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
{
}
//__________________________________________________________________________________________________
sal_Int32 BSeqInputStream::available()
throw (io::NotConnectedException, io::IOException, RuntimeException)
{
return (_seq.getLength() - _nPos);
}
//__________________________________________________________________________________________________
void BSeqInputStream::closeInput()
throw (io::NotConnectedException, io::IOException, RuntimeException)
{
}
//##################################################################################################
//==================================================================================================
class BSeqOutputStream
: public ::cppu::WeakImplHelper1< io::XOutputStream >
{
@ -123,7 +118,7 @@ public:
virtual void SAL_CALL closeOutput()
throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException);
};
//__________________________________________________________________________________________________
void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
{
@ -133,27 +128,22 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
(char const *)rData.getConstArray(),
rData.getLength() );
}
//__________________________________________________________________________________________________
void BSeqOutputStream::flush()
throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void BSeqOutputStream::closeOutput()
throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
{
}
//##################################################################################################
//==================================================================================================
Reference< io::XInputStream > SAL_CALL createInputStream( ByteSequence const & rInData )
SAL_THROW(())
{
return new BSeqInputStream( rInData );
}
//==================================================================================================
Reference< io::XOutputStream > SAL_CALL createOutputStream( ByteSequence * pOutData )
SAL_THROW(())
{

View File

@ -19,33 +19,31 @@
#include <xmlscript/xml_helper.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
namespace xmlscript
{
//__________________________________________________________________________________________________
void XMLElement::addAttribute( OUString const & rAttrName, OUString const & rValue )
SAL_THROW(())
{
_attrNames.push_back( rAttrName );
_attrValues.push_back( rValue );
}
//__________________________________________________________________________________________________
void XMLElement::addSubElement( Reference< xml::sax::XAttributeList > const & xElem )
SAL_THROW(())
{
_subElems.push_back( xElem );
}
//__________________________________________________________________________________________________
Reference< xml::sax::XAttributeList > XMLElement::getSubElement( sal_Int32 nIndex )
SAL_THROW(())
{
return _subElems[ (size_t)nIndex ];
}
//__________________________________________________________________________________________________
void XMLElement::dumpSubElements( Reference< xml::sax::XDocumentHandler > const & xOut )
{
for ( size_t nPos = 0; nPos < _subElems.size(); ++nPos )
@ -54,7 +52,7 @@ void XMLElement::dumpSubElements( Reference< xml::sax::XDocumentHandler > const
pElem->dump( xOut );
}
}
//__________________________________________________________________________________________________
void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
{
xOut->ignorableWhitespace( OUString() );
@ -66,20 +64,19 @@ void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
}
// XAttributeList
//__________________________________________________________________________________________________
sal_Int16 XMLElement::getLength()
throw (RuntimeException)
{
return static_cast<sal_Int16>(_attrNames.size());
}
//__________________________________________________________________________________________________
OUString XMLElement::getNameByIndex( sal_Int16 nPos )
throw (RuntimeException)
{
OSL_ASSERT( (size_t)nPos < _attrNames.size() );
return _attrNames[ nPos ];
}
//__________________________________________________________________________________________________
OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
throw (RuntimeException)
{
@ -88,21 +85,21 @@ OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
// xxx todo
return OUString();
}
//__________________________________________________________________________________________________
OUString XMLElement::getTypeByName( OUString const & /*rName*/ )
throw (RuntimeException)
{
// xxx todo
return OUString();
}
//__________________________________________________________________________________________________
OUString XMLElement::getValueByIndex( sal_Int16 nPos )
throw (RuntimeException)
{
OSL_ASSERT( (size_t)nPos < _attrNames.size() );
return _attrValues[ nPos ];
}
//__________________________________________________________________________________________________
OUString XMLElement::getValueByName( OUString const & rName )
throw (RuntimeException)
{

View File

@ -80,7 +80,6 @@ typedef ::std::vector< ElementEntry * > t_ElementVector;
class ExtendedAttributes;
//==============================================================================
struct MGuard
{
Mutex * m_pMutex;
@ -91,7 +90,6 @@ struct MGuard
{ if (m_pMutex) m_pMutex->release(); }
};
//==============================================================================
class DocumentHandlerImpl :
public ::cppu::WeakImplHelper3< xml::sax::XDocumentHandler,
xml::input::XNamespaceMapping,
@ -183,7 +181,6 @@ public:
throw (container::NoSuchElementException, RuntimeException);
};
//______________________________________________________________________________
DocumentHandlerImpl::DocumentHandlerImpl(
Reference< xml::input::XRoot > const & xRoot,
bool bSingleThreadedUse )
@ -204,7 +201,6 @@ DocumentHandlerImpl::DocumentHandlerImpl(
m_pMutex = new Mutex();
}
//______________________________________________________________________________
DocumentHandlerImpl::~DocumentHandlerImpl() throw ()
{
if (m_pMutex != 0)
@ -216,7 +212,6 @@ DocumentHandlerImpl::~DocumentHandlerImpl() throw ()
}
}
//______________________________________________________________________________
inline Reference< xml::input::XElement >
DocumentHandlerImpl::getCurrentElement() const
{
@ -227,7 +222,6 @@ DocumentHandlerImpl::getCurrentElement() const
return m_elements.back()->m_xElement;
}
//______________________________________________________________________________
inline sal_Int32 DocumentHandlerImpl::getUidByURI( OUString const & rURI )
{
MGuard guard( m_pMutex );
@ -250,7 +244,6 @@ inline sal_Int32 DocumentHandlerImpl::getUidByURI( OUString const & rURI )
return m_nLastURI_lookup;
}
//______________________________________________________________________________
inline sal_Int32 DocumentHandlerImpl::getUidByPrefix(
OUString const & rPrefix )
{
@ -276,7 +269,6 @@ inline sal_Int32 DocumentHandlerImpl::getUidByPrefix(
return m_nLastPrefix_lookup;
}
//______________________________________________________________________________
inline void DocumentHandlerImpl::pushPrefix(
OUString const & rPrefix, OUString const & rURI )
{
@ -302,7 +294,6 @@ inline void DocumentHandlerImpl::pushPrefix(
m_nLastPrefix_lookup = nUid;
}
//______________________________________________________________________________
inline void DocumentHandlerImpl::popPrefix(
OUString const & rPrefix )
{
@ -322,7 +313,6 @@ inline void DocumentHandlerImpl::popPrefix(
m_aLastPrefix_lookup = m_sXMLNS_PREFIX_UNKNOWN;
}
//______________________________________________________________________________
inline void DocumentHandlerImpl::getElementName(
OUString const & rQName, sal_Int32 * pUid, OUString * pLocalName )
{
@ -332,8 +322,6 @@ inline void DocumentHandlerImpl::getElementName(
nColonPos >= 0 ? rQName.copy( 0, nColonPos ) : OUString() );
}
//==============================================================================
class ExtendedAttributes :
public ::cppu::WeakImplHelper1< xml::input::XAttributes >
{
@ -384,7 +372,6 @@ public:
throw (RuntimeException);
};
//______________________________________________________________________________
inline ExtendedAttributes::ExtendedAttributes(
sal_Int32 nAttributes,
sal_Int32 * pUids, OUString * pPrefixes,
@ -407,7 +394,6 @@ inline ExtendedAttributes::ExtendedAttributes(
}
}
//______________________________________________________________________________
ExtendedAttributes::~ExtendedAttributes() throw ()
{
m_pHandler->release();
@ -419,19 +405,14 @@ ExtendedAttributes::~ExtendedAttributes() throw ()
delete [] m_pValues;
}
//##############################################################################
// XServiceInfo
//______________________________________________________________________________
OUString DocumentHandlerImpl::getImplementationName()
throw (RuntimeException)
{
return getImplementationName_DocumentHandlerImpl();
}
//______________________________________________________________________________
sal_Bool DocumentHandlerImpl::supportsService(
OUString const & servicename )
throw (RuntimeException)
@ -445,7 +426,6 @@ sal_Bool DocumentHandlerImpl::supportsService(
return sal_False;
}
//______________________________________________________________________________
Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
throw (RuntimeException)
{
@ -454,7 +434,6 @@ Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
// XInitialization
//______________________________________________________________________________
void DocumentHandlerImpl::initialize(
Sequence< Any > const & arguments )
throw (Exception)
@ -473,10 +452,8 @@ void DocumentHandlerImpl::initialize(
}
}
// XNamespaceMapping
//______________________________________________________________________________
sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
throw (RuntimeException)
{
@ -485,7 +462,6 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
return uid;
}
//______________________________________________________________________________
OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
throw (container::NoSuchElementException, RuntimeException)
{
@ -500,24 +476,20 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
throw container::NoSuchElementException( "no such xmlns uid!" , static_cast< OWeakObject * >(this) );
}
// XDocumentHandler
//______________________________________________________________________________
void DocumentHandlerImpl::startDocument()
throw (xml::sax::SAXException, RuntimeException)
{
m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) );
}
//______________________________________________________________________________
void DocumentHandlerImpl::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
m_xRoot->endDocument();
}
//______________________________________________________________________________
void DocumentHandlerImpl::startElement(
OUString const & rQElementName,
Reference< xml::sax::XAttributeList > const & xAttribs )
@ -654,7 +626,6 @@ void DocumentHandlerImpl::startElement(
}
}
//______________________________________________________________________________
void DocumentHandlerImpl::endElement(
OUString const & rQElementName )
throw (xml::sax::SAXException, RuntimeException)
@ -698,7 +669,6 @@ void DocumentHandlerImpl::endElement(
xCurrentElement->endElement();
}
//______________________________________________________________________________
void DocumentHandlerImpl::characters( OUString const & rChars )
throw (xml::sax::SAXException, RuntimeException)
{
@ -707,7 +677,6 @@ void DocumentHandlerImpl::characters( OUString const & rChars )
xCurrentElement->characters( rChars );
}
//______________________________________________________________________________
void DocumentHandlerImpl::ignorableWhitespace(
OUString const & rWhitespaces )
throw (xml::sax::SAXException, RuntimeException)
@ -717,7 +686,6 @@ void DocumentHandlerImpl::ignorableWhitespace(
xCurrentElement->ignorableWhitespace( rWhitespaces );
}
//______________________________________________________________________________
void DocumentHandlerImpl::processingInstruction(
OUString const & rTarget, OUString const & rData )
throw (xml::sax::SAXException, RuntimeException)
@ -729,7 +697,6 @@ void DocumentHandlerImpl::processingInstruction(
m_xRoot->processingInstruction( rTarget, rData );
}
//______________________________________________________________________________
void DocumentHandlerImpl::setDocumentLocator(
Reference< xml::sax::XLocator > const & xLocator )
throw (xml::sax::SAXException, RuntimeException)
@ -737,11 +704,8 @@ void DocumentHandlerImpl::setDocumentLocator(
m_xRoot->setDocumentLocator( xLocator );
}
//##############################################################################
// XAttributes
//______________________________________________________________________________
sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
throw (RuntimeException)
{
@ -755,14 +719,12 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
return -1;
}
//______________________________________________________________________________
sal_Int32 ExtendedAttributes::getLength()
throw (RuntimeException)
{
return m_nAttributes;
}
//______________________________________________________________________________
OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
throw (RuntimeException)
{
@ -772,7 +734,6 @@ OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
return OUString();
}
//______________________________________________________________________________
OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
throw (RuntimeException)
{
@ -782,7 +743,6 @@ OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
return OUString();
}
//______________________________________________________________________________
OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
throw (RuntimeException)
{
@ -791,7 +751,6 @@ OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
return OUString(); // unsupported
}
//______________________________________________________________________________
OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
throw (RuntimeException)
{
@ -801,7 +760,6 @@ OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
return OUString();
}
//______________________________________________________________________________
sal_Int32 ExtendedAttributes::getIndexByUidName(
sal_Int32 nUid, OUString const & rLocalName )
throw (RuntimeException)
@ -816,7 +774,6 @@ sal_Int32 ExtendedAttributes::getIndexByUidName(
return -1;
}
//______________________________________________________________________________
sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
throw (RuntimeException)
{
@ -826,7 +783,6 @@ sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
return -1;
}
//______________________________________________________________________________
OUString ExtendedAttributes::getValueByUidName(
sal_Int32 nUid, OUString const & rLocalName )
throw (RuntimeException)
@ -841,11 +797,6 @@ OUString ExtendedAttributes::getValueByUidName(
return OUString();
}
//##############################################################################
//==============================================================================
Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler(
Reference< xml::input::XRoot > const & xRoot,
bool bSingleThreadedUse )
@ -860,7 +811,6 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler(
return Reference< xml::sax::XDocumentHandler >();
}
//------------------------------------------------------------------------------
Reference< XInterface > SAL_CALL create_DocumentHandlerImpl(
SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
SAL_THROW( (Exception) )

View File

@ -104,7 +104,6 @@ inline bool getLongAttr(
class ImportContext;
//==============================================================================
struct DialogImport
: public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
{
@ -196,7 +195,6 @@ public:
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
};
//==============================================================================
class ElementBase
: public ::cppu::WeakImplHelper1< css::xml::input::XElement >
{
@ -243,7 +241,6 @@ public:
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
};
//==============================================================================
class StylesElement
: public ElementBase
{
@ -264,7 +261,6 @@ public:
{}
};
//==============================================================================
class StyleElement
: public ElementBase
{
@ -323,7 +319,6 @@ public:
{}
};
//==============================================================================
class MenuPopupElement
: public ElementBase
{
@ -349,7 +344,6 @@ public:
{}
};
//==============================================================================
class ControlElement
: public ElementBase
{
@ -378,7 +372,6 @@ public:
SAL_THROW(());
};
//==============================================================================
class ImportContext
{
protected:
@ -473,7 +466,6 @@ public:
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
};
//==============================================================================
class ControlImportContext : public ImportContext
{
public:
@ -503,7 +495,6 @@ public:
}
};
//==============================================================================
class WindowElement
: public ControlElement
{
@ -525,7 +516,6 @@ public:
{}
};
//==============================================================================
class EventElement
: public ElementBase
{
@ -542,7 +532,6 @@ public:
{}
};
//==============================================================================
class BulletinBoardElement
: public ControlElement
{
@ -560,7 +549,6 @@ public:
SAL_THROW(());
};
//==============================================================================
class ButtonElement
: public ControlElement
{
@ -582,7 +570,6 @@ public:
{}
};
//==============================================================================
class CheckBoxElement
: public ControlElement
{
@ -604,7 +591,6 @@ public:
{}
};
//==============================================================================
class ComboBoxElement
: public ControlElement
{
@ -627,7 +613,6 @@ public:
{}
};
//==============================================================================
class MenuListElement
: public ControlElement
{
@ -650,7 +635,6 @@ public:
{}
};
//==============================================================================
class RadioElement
: public ControlElement
{
@ -670,7 +654,6 @@ public:
{}
};
//==============================================================================
class RadioGroupElement
: public ControlElement
{
@ -693,7 +676,6 @@ public:
{}
};
//==============================================================================
class TitledBoxElement
: public BulletinBoardElement
{
@ -717,7 +699,6 @@ public:
{}
};
//==============================================================================
class TextElement
: public ControlElement
{
@ -738,7 +719,6 @@ public:
: ControlElement( rLocalName, xAttributes, pParent, pImport )
{}
};
//==============================================================================
class FixedHyperLinkElement
: public ControlElement
{
@ -759,7 +739,7 @@ public:
: ControlElement( rLocalName, xAttributes, pParent, pImport )
{}
};
//==============================================================================
class TextFieldElement
: public ControlElement
{
@ -781,7 +761,6 @@ public:
{}
};
//==============================================================================
class ImageControlElement
: public ControlElement
{
@ -803,7 +782,6 @@ public:
{}
};
//==============================================================================
class FileControlElement
: public ControlElement
{
@ -825,7 +803,6 @@ public:
{}
};
//==============================================================================
class TreeControlElement
: public ControlElement
{
@ -847,7 +824,6 @@ public:
{}
};
//==============================================================================
class CurrencyFieldElement
: public ControlElement
{
@ -869,7 +845,6 @@ public:
{}
};
//==============================================================================
class DateFieldElement
: public ControlElement
{
@ -891,7 +866,6 @@ public:
{}
};
//==============================================================================
class NumericFieldElement
: public ControlElement
{
@ -913,7 +887,6 @@ public:
{}
};
//==============================================================================
class TimeFieldElement
: public ControlElement
{
@ -935,7 +908,6 @@ public:
{}
};
//==============================================================================
class PatternFieldElement
: public ControlElement
{
@ -957,7 +929,6 @@ public:
{}
};
//==============================================================================
class FormattedFieldElement
: public ControlElement
{
@ -979,7 +950,6 @@ public:
{}
};
//==============================================================================
class FixedLineElement
: public ControlElement
{
@ -1001,7 +971,6 @@ public:
{}
};
//==============================================================================
class ScrollBarElement
: public ControlElement
{
@ -1023,8 +992,6 @@ public:
{}
};
//==============================================================================
class SpinButtonElement
: public ControlElement
{
@ -1046,7 +1013,6 @@ public:
{}
};
//==============================================================================
class MultiPage
: public ControlElement
{
@ -1072,7 +1038,6 @@ private:
css::uno::Reference< css::container::XNameContainer > m_xContainer;
};
//==============================================================================
class Frame
: public ControlElement
{
@ -1097,7 +1062,6 @@ private:
css::uno::Reference< css::container::XNameContainer > m_xContainer;
};
//==============================================================================
class Page
: public ControlElement
{
@ -1123,7 +1087,6 @@ private:
css::uno::Reference< css::container::XNameContainer > m_xContainer;
};
class ProgressBarElement
: public ControlElement
{

View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
@ -28,7 +27,6 @@
#include <xmlscript/xml_helper.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@ -37,7 +35,6 @@ using namespace ::com::sun::star::frame;
namespace xmlscript
{
//==================================================================================================
class InputStreamProvider
: public ::cppu::WeakImplHelper1< io::XInputStreamProvider >
{
@ -52,14 +49,12 @@ public:
virtual Reference< io::XInputStream > SAL_CALL createInputStream()
throw (RuntimeException);
};
//__________________________________________________________________________________________________
Reference< io::XInputStream > InputStreamProvider::createInputStream()
throw (RuntimeException)
{
return ::xmlscript::createInputStream( _bytes );
}
//==================================================================================================
Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
Reference< container::XNameContainer > const & xDialogModel,
Reference< XComponentContext > const & xContext,
@ -77,7 +72,6 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
return new InputStreamProvider( aBytes );
}
//==================================================================================================
void SAL_CALL importDialogModel(
Reference< io::XInputStream > const & xInput,
Reference< container::XNameContainer > const & xDialogModel,

View File

@ -60,7 +60,6 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style )
return ret;
}
//__________________________________________________________________________________________________
void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
{
// collect styles
@ -95,7 +94,7 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
addSubElement( pElem );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFrameModel( StyleBag * all_styles )
{
// collect styles
@ -134,7 +133,7 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles )
}
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readPageModel( StyleBag * all_styles )
{
// collect styles
@ -193,7 +192,6 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
readButtonTypeAttr( "PushButtonType", XMLNS_DIALOGS_PREFIX ":button-type" );
readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" );
readImageAlignAttr( "ImageAlign", XMLNS_DIALOGS_PREFIX ":image-align" );
@ -206,7 +204,6 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
readBoolAttr( "FocusOnClick", XMLNS_DIALOGS_PREFIX ":grab-focus" );
readBoolAttr( "MultiLine",XMLNS_DIALOGS_PREFIX ":multiline" );
// State
sal_Int16 nState = 0;
if (readProp( "State" ) >>= nState)
@ -227,7 +224,7 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -284,7 +281,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
}
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -338,7 +335,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
}
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -400,7 +397,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
}
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -451,7 +448,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -481,7 +478,7 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -512,7 +509,7 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -545,7 +542,7 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readEditModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -588,7 +585,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles )
readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -610,7 +607,7 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":src" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFileControlModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -639,7 +636,7 @@ void ElementDescriptor::readFileControlModel( StyleBag * all_styles )
readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readTreeControlModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -667,7 +664,7 @@ void ElementDescriptor::readTreeControlModel( StyleBag * all_styles )
readLongAttr( "RowHeight", XMLNS_DIALOGS_PREFIX ":rowheight" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -708,7 +705,7 @@ void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles )
readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDateFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -748,7 +745,7 @@ void ElementDescriptor::readDateFieldModel( StyleBag * all_styles )
readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -787,7 +784,7 @@ void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles )
readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -825,7 +822,7 @@ void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles )
readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -858,7 +855,7 @@ void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles )
readStringAttr( "LiteralMask", XMLNS_DIALOGS_PREFIX ":literal-mask" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -954,7 +951,6 @@ void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles )
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readFixedLineModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -977,7 +973,6 @@ void ElementDescriptor::readFixedLineModel( StyleBag * all_styles )
readOrientationAttr( "Orientation", XMLNS_DIALOGS_PREFIX ":align" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readProgressBarModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -1001,7 +996,6 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles )
readLongAttr( "ProgressValueMax", XMLNS_DIALOGS_PREFIX ":value-max" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{
@ -1032,7 +1026,6 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
readEvents();
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDialogModel( StyleBag * all_styles )
SAL_THROW( (Exception) )
{

View File

@ -70,7 +70,6 @@ using namespace ::com::sun::star::uno;
namespace xmlscript
{
//__________________________________________________________________________________________________
Reference< xml::sax::XAttributeList > Style::createElement()
{
ElementDescriptor * pStyle = new ElementDescriptor( XMLNS_DIALOGS_PREFIX ":style" );
@ -475,9 +474,6 @@ Reference< xml::sax::XAttributeList > Style::createElement()
return pStyle;
}
//##################################################################################################
//__________________________________________________________________________________________________
void ElementDescriptor::addNumberFormatAttr(
Reference< beans::XPropertySet > const & xFormatProperties )
{
@ -507,7 +503,7 @@ void ElementDescriptor::addNumberFormatAttr(
}
addAttribute( XMLNS_DIALOGS_PREFIX ":format-locale", aStr );
}
//__________________________________________________________________________________________________
Any ElementDescriptor::readProp( OUString const & rPropName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -517,7 +513,6 @@ Any ElementDescriptor::readProp( OUString const & rPropName )
return Any();
}
//______________________________________________________________________________
void ElementDescriptor::readStringAttr(
OUString const & rPropName, OUString const & rAttrName )
{
@ -533,7 +528,6 @@ void ElementDescriptor::readStringAttr(
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readHexLongAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -550,7 +544,6 @@ void ElementDescriptor::readHexLongAttr( OUString const & rPropName, OUString co
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDateFormatAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -605,7 +598,7 @@ void ElementDescriptor::readDateFormatAttr( OUString const & rPropName, OUString
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDateAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -626,7 +619,7 @@ void ElementDescriptor::readDateAttr( OUString const & rPropName, OUString const
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readTimeAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -647,7 +640,7 @@ void ElementDescriptor::readTimeAttr( OUString const & rPropName, OUString const
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readTimeFormatAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -684,7 +677,7 @@ void ElementDescriptor::readTimeFormatAttr( OUString const & rPropName, OUString
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readAlignAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -712,7 +705,7 @@ void ElementDescriptor::readAlignAttr( OUString const & rPropName, OUString cons
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readVerticalAlignAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -742,7 +735,7 @@ void ElementDescriptor::readVerticalAlignAttr( OUString const & rPropName, OUStr
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readImageURLAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -765,7 +758,7 @@ void ElementDescriptor::readImageURLAttr( OUString const & rPropName, OUString c
addAttribute( rAttrName, sURL );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readImageAlignAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -796,7 +789,7 @@ void ElementDescriptor::readImageAlignAttr( OUString const & rPropName, OUString
OSL_FAIL( "### unexpected property type!" );
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readImagePositionAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -852,7 +845,7 @@ void ElementDescriptor::readImagePositionAttr( OUString const & rPropName, OUStr
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readButtonTypeAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -881,7 +874,7 @@ void ElementDescriptor::readButtonTypeAttr( OUString const & rPropName, OUString
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readOrientationAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -904,7 +897,7 @@ void ElementDescriptor::readOrientationAttr( OUString const & rPropName, OUStrin
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readLineEndFormatAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -930,7 +923,7 @@ void ElementDescriptor::readLineEndFormatAttr( OUString const & rPropName, OUStr
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
{
Reference< lang::XMultiServiceFactory > xFac;
@ -989,7 +982,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUString const & rAttrName )
{
if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@ -1022,7 +1015,7 @@ void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUStr
}
}
}
//__________________________________________________________________________________________________
void ElementDescriptor::readScrollableSettings()
{
readLongAttr( "ScrollHeight",
@ -1137,7 +1130,6 @@ struct StringTriple
};
extern StringTriple const * const g_pEventTranslations;
//__________________________________________________________________________________________________
void ElementDescriptor::readEvents()
SAL_THROW( (Exception) )
{
@ -1235,8 +1227,6 @@ void ElementDescriptor::readEvents()
}
}
//##################################################################################################
inline bool equalFont( Style const & style1, Style const & style2 )
{
awt::FontDescriptor const & f1 = style1._descr;
@ -1262,7 +1252,6 @@ inline bool equalFont( Style const & style1, Style const & style2 )
style1._fontEmphasisMark == style2._fontEmphasisMark
);
}
//__________________________________________________________________________________________________
OUString StyleBag::getStyleId( Style const & rStyle )
SAL_THROW(())
{
@ -1341,7 +1330,6 @@ OUString StyleBag::getStyleId( Style const & rStyle )
_styles.push_back( pStyle );
return pStyle->_id;
}
//__________________________________________________________________________________________________
StyleBag::~StyleBag() SAL_THROW(())
{
for ( size_t nPos = 0; nPos < _styles.size(); ++nPos )
@ -1349,7 +1337,6 @@ StyleBag::~StyleBag() SAL_THROW(())
delete _styles[ nPos ];
}
}
//__________________________________________________________________________________________________
void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOut )
{
if (! _styles.empty())
@ -1368,9 +1355,6 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu
}
}
//##################################################################################################
//==================================================================================================
void SAL_CALL exportDialogModel(
Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
Reference< container::XNameContainer > const & xDialogModel,
@ -1396,7 +1380,6 @@ void SAL_CALL exportDialogModel(
xOut->unknown( aDocTypeStr );
xOut->ignorableWhitespace( OUString() );
OUString aWindowName( XMLNS_DIALOGS_PREFIX ":window" );
ElementDescriptor * pWindow = new ElementDescriptor( xProps, xPropState, aWindowName, xDocument );
Reference< xml::sax::XAttributeList > xWindow( pWindow );

View File

@ -70,7 +70,6 @@ Reference< xml::input::XElement > Frame::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void Frame::endElement()
throw (xml::sax::SAXException, RuntimeException)
@ -132,7 +131,6 @@ Reference< xml::input::XElement > MultiPage::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void MultiPage::endElement()
throw (xml::sax::SAXException, RuntimeException)
@ -186,7 +184,6 @@ Reference< xml::input::XElement > Page::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void Page::endElement()
throw (xml::sax::SAXException, RuntimeException)
@ -216,7 +213,6 @@ void Page::endElement()
}
// progessmeter
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ProgressBarElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -235,7 +231,6 @@ Reference< xml::input::XElement > ProgressBarElement::startChildElement(
Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void ProgressBarElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -261,10 +256,7 @@ void ProgressBarElement::endElement()
_events.clear();
}
//##################################################################################################
// scrollbar
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ScrollBarElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -280,7 +272,6 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void ScrollBarElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -315,10 +306,7 @@ void ScrollBarElement::endElement()
_events.clear();
}
//##################################################################################################
// spinbutton
//__________________________________________________________________________________________________
Reference< xml::input::XElement > SpinButtonElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -334,7 +322,7 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void SpinButtonElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -366,10 +354,7 @@ void SpinButtonElement::endElement()
_events.clear();
}
//##################################################################################################
// fixedline
//__________________________________________________________________________________________________
Reference< xml::input::XElement > FixedLineElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -385,7 +370,6 @@ Reference< xml::input::XElement > FixedLineElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void FixedLineElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -410,10 +394,7 @@ void FixedLineElement::endElement()
_events.clear();
}
//##################################################################################################
// patternfield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > PatternFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -429,7 +410,6 @@ Reference< xml::input::XElement > PatternFieldElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void PatternFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -462,10 +442,7 @@ void PatternFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// formattedfield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > FormattedFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -481,7 +458,7 @@ Reference< xml::input::XElement > FormattedFieldElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void FormattedFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -593,10 +570,7 @@ void FormattedFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// timefield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > TimeFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -612,7 +586,6 @@ Reference< xml::input::XElement > TimeFieldElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void TimeFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -651,10 +624,7 @@ void TimeFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// numericfield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > NumericFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -670,7 +640,6 @@ Reference< xml::input::XElement > NumericFieldElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void NumericFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -709,10 +678,7 @@ void NumericFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// datefield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > DateFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -728,7 +694,6 @@ Reference< xml::input::XElement > DateFieldElement::startChildElement(
throw xml::sax::SAXException("expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void DateFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -768,10 +733,7 @@ void DateFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// currencyfield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > CurrencyFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -787,7 +749,6 @@ Reference< xml::input::XElement > CurrencyFieldElement::startChildElement(
throw xml::sax::SAXException( "expected event element!" , Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void CurrencyFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -828,10 +789,7 @@ void CurrencyFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// filecontrol
//__________________________________________________________________________________________________
Reference< xml::input::XElement > FileControlElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -847,7 +805,6 @@ Reference< xml::input::XElement > FileControlElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void FileControlElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -875,10 +832,8 @@ void FileControlElement::endElement()
// vector< event elements > holding event elements holding this (via _pParent)
_events.clear();
}
//##################################################################################################
// treecontrol
//__________________________________________________________________________________________________
Reference< xml::input::XElement > TreeControlElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -894,7 +849,6 @@ Reference< xml::input::XElement > TreeControlElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void TreeControlElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -925,10 +879,7 @@ void TreeControlElement::endElement()
_events.clear();
}
//##################################################################################################
// imagecontrol
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ImageControlElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -944,7 +895,7 @@ Reference< xml::input::XElement > ImageControlElement::startChildElement(
throw xml::sax::SAXException( "expected event element!" , Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void ImageControlElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -971,10 +922,7 @@ void ImageControlElement::endElement()
_events.clear();
}
//##################################################################################################
// textfield
//__________________________________________________________________________________________________
Reference< xml::input::XElement > TextElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -990,7 +938,7 @@ Reference< xml::input::XElement > TextElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void TextElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1021,9 +969,7 @@ void TextElement::endElement()
_events.clear();
}
//##################################################################################################
// FixedHyperLink
//__________________________________________________________________________________________________
Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1039,7 +985,6 @@ Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement(
throw xml::sax::SAXException( "expected event element!" , Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void FixedHyperLinkElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1073,10 +1018,7 @@ void FixedHyperLinkElement::endElement()
_events.clear();
}
//##################################################################################################
// edit
//__________________________________________________________________________________________________
Reference< xml::input::XElement > TextFieldElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1092,7 +1034,6 @@ Reference< xml::input::XElement > TextFieldElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void TextFieldElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1136,10 +1077,7 @@ void TextFieldElement::endElement()
_events.clear();
}
//##################################################################################################
// titledbox
//__________________________________________________________________________________________________
Reference< xml::input::XElement > TitledBoxElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1181,7 +1119,7 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement(
return BulletinBoardElement::startChildElement( nUid, rLocalName, xAttributes );
}
}
//__________________________________________________________________________________________________
void TitledBoxElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1261,10 +1199,7 @@ void TitledBoxElement::endElement()
_radios.clear();
}
//##################################################################################################
// radio
//__________________________________________________________________________________________________
Reference< xml::input::XElement > RadioElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1281,10 +1216,7 @@ Reference< xml::input::XElement > RadioElement::startChildElement(
}
}
//##################################################################################################
// radiogroup
//__________________________________________________________________________________________________
Reference< xml::input::XElement > RadioGroupElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1309,7 +1241,6 @@ Reference< xml::input::XElement > RadioGroupElement::startChildElement(
throw xml::sax::SAXException( "expected radio element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void RadioGroupElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1364,10 +1295,7 @@ void RadioGroupElement::endElement()
_radios.clear();
}
//##################################################################################################
// menupopup
//__________________________________________________________________________________________________
Reference< xml::input::XElement > MenuPopupElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1399,7 +1327,6 @@ Reference< xml::input::XElement > MenuPopupElement::startChildElement(
throw xml::sax::SAXException("expected menuitem!" , Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
Sequence< OUString > MenuPopupElement::getItemValues()
{
Sequence< OUString > aRet( _itemValues.size() );
@ -1410,7 +1337,6 @@ Sequence< OUString > MenuPopupElement::getItemValues()
}
return aRet;
}
//__________________________________________________________________________________________________
Sequence< sal_Int16 > MenuPopupElement::getSelectedItems()
{
Sequence< sal_Int16 > aRet( _itemSelected.size() );
@ -1422,10 +1348,7 @@ Sequence< sal_Int16 > MenuPopupElement::getSelectedItems()
return aRet;
}
//##################################################################################################
// menulist
//__________________________________________________________________________________________________
Reference< xml::input::XElement > MenuListElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1451,7 +1374,7 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
throw xml::sax::SAXException( "expected event or menupopup element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void MenuListElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1493,10 +1416,7 @@ void MenuListElement::endElement()
_events.clear();
}
//##################################################################################################
// combobox
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ComboBoxElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1522,7 +1442,6 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
throw xml::sax::SAXException( "expected event or menupopup element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void ComboBoxElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1564,10 +1483,7 @@ void ComboBoxElement::endElement()
_events.clear();
}
//##################################################################################################
// checkbox
//__________________________________________________________________________________________________
Reference< xml::input::XElement > CheckBoxElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1583,7 +1499,6 @@ Reference< xml::input::XElement > CheckBoxElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void CheckBoxElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1610,7 +1525,6 @@ void CheckBoxElement::endElement()
ctx.importImagePositionProperty( "ImagePosition", "image-position", _xAttributes );
ctx.importBooleanProperty( "MultiLine", "multiline", _xAttributes );
sal_Bool bTriState = sal_False;
if (getBoolAttr( &bTriState, "tristate", _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
{
@ -1635,10 +1549,7 @@ void CheckBoxElement::endElement()
_events.clear();
}
//##################################################################################################
// button
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ButtonElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1654,7 +1565,7 @@ Reference< xml::input::XElement > ButtonElement::startChildElement(
throw xml::sax::SAXException( "expected event element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void ButtonElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1702,10 +1613,7 @@ void ButtonElement::endElement()
_events.clear();
}
//##################################################################################################
// bulletinboard
//__________________________________________________________________________________________________
Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1846,7 +1754,7 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
throw xml::sax::SAXException( "expected styles, bulletinboard or bulletinboard element, not: " + rLocalName, Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
BulletinBoardElement::BulletinBoardElement(
OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes,
@ -1866,10 +1774,7 @@ BulletinBoardElement::BulletinBoardElement(
}
}
//##################################################################################################
// style
//__________________________________________________________________________________________________
Reference< xml::input::XElement > StyleElement::startChildElement(
sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
Reference< xml::input::XAttributes > const & /*xAttributes*/ )
@ -1877,7 +1782,7 @@ Reference< xml::input::XElement > StyleElement::startChildElement(
{
throw xml::sax::SAXException( "unexpected sub elements of style!", Reference< XInterface >(), Any() );
}
//__________________________________________________________________________________________________
void StyleElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -1893,10 +1798,7 @@ void StyleElement::endElement()
}
}
//##################################################################################################
// styles
//__________________________________________________________________________________________________
Reference< xml::input::XElement > StylesElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1917,10 +1819,7 @@ Reference< xml::input::XElement > StylesElement::startChildElement(
}
}
//##################################################################################################
// window
//__________________________________________________________________________________________________
Reference< xml::input::XElement > WindowElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1950,7 +1849,7 @@ Reference< xml::input::XElement > WindowElement::startChildElement(
throw xml::sax::SAXException( "expected styles ot bulletinboard element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void WindowElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{

View File

@ -63,13 +63,12 @@ using namespace ::com::sun::star::frame;
namespace xmlscript
{
//__________________________________________________________________________________________________
void EventElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
static_cast< ControlElement * >( _pParent )->_events.push_back( this );
}
//__________________________________________________________________________________________________
ControlElement::ControlElement(
OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes,
@ -91,7 +90,6 @@ ControlElement::ControlElement(
}
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ControlElement::getStyle(
Reference< xml::input::XAttributes > const & xAttributes )
{
@ -102,7 +100,7 @@ Reference< xml::input::XElement > ControlElement::getStyle(
}
return Reference< xml::input::XElement >();
}
//__________________________________________________________________________________________________
OUString ControlElement::getControlId(
Reference< xml::input::XAttributes > const & xAttributes )
{
@ -125,10 +123,6 @@ OUString ControlElement::getControlModelName(
return aModel;
}
//##################################################################################################
//__________________________________________________________________________________________________
bool StyleElement::importTextColorStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -151,7 +145,7 @@ bool StyleElement::importTextColorStyle(
}
return false;
}
//__________________________________________________________________________________________________
bool StyleElement::importTextLineColorStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -174,7 +168,7 @@ bool StyleElement::importTextLineColorStyle(
}
return false;
}
//__________________________________________________________________________________________________
bool StyleElement::importFillColorStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -197,7 +191,7 @@ bool StyleElement::importFillColorStyle(
}
return false;
}
//__________________________________________________________________________________________________
bool StyleElement::importBackgroundColorStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -221,7 +215,6 @@ bool StyleElement::importBackgroundColorStyle(
return false;
}
//__________________________________________________________________________________________________
bool StyleElement::importBorderStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -258,7 +251,6 @@ bool StyleElement::importBorderStyle(
return false;
}
//______________________________________________________________________________
bool StyleElement::importVisualEffectStyle(
Reference<beans::XPropertySet> const & xProps )
{
@ -297,7 +289,6 @@ bool StyleElement::importVisualEffectStyle(
return false;
}
//__________________________________________________________________________________________________
void StyleElement::setFontProperties(
Reference< beans::XPropertySet > const & xProps )
{
@ -305,7 +296,7 @@ void StyleElement::setFontProperties(
xProps->setPropertyValue("FontEmphasisMark", makeAny( _fontEmphasisMark ) );
xProps->setPropertyValue("FontRelief", makeAny( _fontRelief ) );
}
//__________________________________________________________________________________________________
bool StyleElement::importFontStyle(
Reference< beans::XPropertySet > const & xProps )
{
@ -683,7 +674,6 @@ bool StyleElement::importFontStyle(
bFontImport = true;
}
// ==================================================
if (bFontImport)
{
_hasValue |= 0x8;
@ -693,9 +683,6 @@ bool StyleElement::importFontStyle(
return bFontImport;
}
//##################################################################################################
//__________________________________________________________________________________________________
bool ImportContext::importStringProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -710,7 +697,7 @@ bool ImportContext::importStringProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importDoubleProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -726,7 +713,6 @@ bool ImportContext::importDoubleProperty(
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importBooleanProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -740,7 +726,7 @@ bool ImportContext::importBooleanProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importLongProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -755,7 +741,7 @@ bool ImportContext::importLongProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importLongProperty(
sal_Int32 nOffset,
OUString const & rPropName, OUString const & rAttrName,
@ -771,7 +757,7 @@ bool ImportContext::importLongProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importHexLongProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -786,7 +772,7 @@ bool ImportContext::importHexLongProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importShortProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -801,7 +787,7 @@ bool ImportContext::importShortProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importAlignProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -838,7 +824,7 @@ bool ImportContext::importAlignProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importVerticalAlignProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -872,7 +858,7 @@ bool ImportContext::importVerticalAlignProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importImageURLProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -919,8 +905,8 @@ bool ImportContext::importImageURLProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importDataAwareProperty(
bool ImportContext::importDataAwareProperty(
OUString const & rPropName,
Reference<xml::input::XAttributes> const & xAttributes )
{
@ -981,7 +967,7 @@ bool ImportContext::importImageURLProperty(
}
return bRes;
}
//__________________________________________________________________________________________________
bool ImportContext::importImageAlignProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1018,7 +1004,7 @@ bool ImportContext::importImageAlignProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importImagePositionProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1091,7 +1077,7 @@ bool ImportContext::importImagePositionProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importButtonTypeProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1128,7 +1114,7 @@ bool ImportContext::importButtonTypeProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importDateFormatProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1197,7 +1183,7 @@ bool ImportContext::importDateFormatProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importTimeProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1214,7 +1200,7 @@ bool ImportContext::importTimeProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importDateProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1231,7 +1217,7 @@ bool ImportContext::importDateProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importTimeFormatProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1276,7 +1262,7 @@ bool ImportContext::importTimeFormatProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importOrientationProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1305,7 +1291,7 @@ bool ImportContext::importOrientationProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importLineEndFormatProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1338,7 +1324,7 @@ bool ImportContext::importLineEndFormatProperty(
}
return false;
}
//__________________________________________________________________________________________________
bool ImportContext::importSelectionTypeProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1377,7 +1363,6 @@ bool ImportContext::importSelectionTypeProperty(
return false;
}
//==================================================================================================
struct StringTriple
{
char const * first;
@ -1426,7 +1411,6 @@ static StringTriple const s_aEventTranslations[] =
extern StringTriple const * const g_pEventTranslations;
StringTriple const * const g_pEventTranslations = s_aEventTranslations;
//__________________________________________________________________________________________________
void ImportContext::importEvents(
::std::vector< Reference< xml::input::XElement > > const & rEvents )
{
@ -1550,7 +1534,6 @@ void ImportContext::importEvents(
}
}
}
//__________________________________________________________________________________________________
void ImportContext::importScollableSettings(
Reference< xml::input::XAttributes > const & _xAttributes )
{
@ -1627,57 +1610,54 @@ void ImportContext::importDefaults(
importStringProperty( "HelpURL", "help-url", xAttributes );
}
//##################################################################################################
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ElementBase::getParent()
throw (RuntimeException)
{
return static_cast< xml::input::XElement * >( _pParent );
}
//__________________________________________________________________________________________________
OUString ElementBase::getLocalName()
throw (RuntimeException)
{
return _aLocalName;
}
//__________________________________________________________________________________________________
sal_Int32 ElementBase::getUid()
throw (RuntimeException)
{
return _nUid;
}
//__________________________________________________________________________________________________
Reference< xml::input::XAttributes > ElementBase::getAttributes()
throw (RuntimeException)
{
return _xAttributes;
}
//__________________________________________________________________________________________________
void ElementBase::ignorableWhitespace(
OUString const & /*rWhitespaces*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// not used
}
//__________________________________________________________________________________________________
void ElementBase::characters( OUString const & /*rChars*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// not used, all characters ignored
}
//__________________________________________________________________________________________________
void ElementBase::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
}
//______________________________________________________________________________
void ElementBase::processingInstruction(
OUString const & /*Target*/, OUString const & /*Data*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ElementBase::startChildElement(
sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
Reference< xml::input::XAttributes > const & /*xAttributes*/ )
@ -1686,7 +1666,6 @@ Reference< xml::input::XElement > ElementBase::startChildElement(
throw xml::sax::SAXException( "unexpected element!", Reference< XInterface >(), Any() );
}
//__________________________________________________________________________________________________
ElementBase::ElementBase(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes,
@ -1705,7 +1684,6 @@ ElementBase::ElementBase(
_pParent->acquire();
}
}
//__________________________________________________________________________________________________
ElementBase::~ElementBase()
SAL_THROW(())
{
@ -1723,12 +1701,8 @@ ElementBase::~ElementBase()
#endif
}
//##################################################################################################
// XRoot
//
//______________________________________________________________________________
void DialogImport::startDocument(
Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
throw (xml::sax::SAXException, RuntimeException)
@ -1736,27 +1710,27 @@ void DialogImport::startDocument(
XMLNS_DIALOGS_UID = xNamespaceMapping->getUidByUri( XMLNS_DIALOGS_URI );
XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI );
}
//__________________________________________________________________________________________________
void DialogImport::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
// ignored
}
//__________________________________________________________________________________________________
void DialogImport::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// ignored for now: xxx todo
}
//__________________________________________________________________________________________________
void DialogImport::setDocumentLocator(
Reference< xml::sax::XLocator > const & /*xLocator*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// ignored for now: xxx todo
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > DialogImport::startRootElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -1776,7 +1750,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement(
throw xml::sax::SAXException( "illegal root element (expected window) given: " + rLocalName, Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
DialogImport::~DialogImport()
SAL_THROW(())
{
@ -1784,7 +1758,7 @@ DialogImport::~DialogImport()
SAL_INFO("xmlscript.xmldlg", "DialogImport::~DialogImport()." );
#endif
}
//__________________________________________________________________________________________________
Reference< util::XNumberFormatsSupplier > const & DialogImport::getNumberFormatsSupplier()
{
if (! _xSupplier.is())
@ -1800,7 +1774,6 @@ Reference< util::XNumberFormatsSupplier > const & DialogImport::getNumberFormats
return _xSupplier;
}
//__________________________________________________________________________________________________
void DialogImport::addStyle(
OUString const & rStyleId,
Reference< xml::input::XElement > const & xStyle )
@ -1809,7 +1782,7 @@ void DialogImport::addStyle(
(*_pStyleNames).push_back( rStyleId );
(*_pStyles).push_back( xStyle );
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > DialogImport::getStyle(
OUString const & rStyleId ) const
SAL_THROW(())

View File

@ -31,15 +31,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
//.........................................................................
namespace xmlscript
{
//.........................................................................
// =============================================================================
// component operations
// =============================================================================
OUString getImplementationName_XMLBasicExporter()
{
@ -56,8 +51,6 @@ namespace xmlscript
return *pImplName;
}
// -----------------------------------------------------------------------------
Sequence< OUString > getSupportedServiceNames_XMLBasicExporter()
{
static Sequence< OUString >* pNames = 0;
@ -74,8 +67,6 @@ namespace xmlscript
return *pNames;
}
// -----------------------------------------------------------------------------
OUString getImplementationName_XMLOasisBasicExporter()
{
static OUString* pImplName = 0;
@ -91,8 +82,6 @@ namespace xmlscript
return *pImplName;
}
// -----------------------------------------------------------------------------
Sequence< OUString > getSupportedServiceNames_XMLOasisBasicExporter()
{
static Sequence< OUString >* pNames = 0;
@ -109,10 +98,7 @@ namespace xmlscript
return *pNames;
}
// =============================================================================
// XMLBasicExporterBase
// =============================================================================
XMLBasicExporterBase::XMLBasicExporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis )
:m_xContext( rxContext )
@ -120,15 +106,11 @@ namespace xmlscript
{
}
// -----------------------------------------------------------------------------
XMLBasicExporterBase::~XMLBasicExporterBase()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException)
{
@ -141,9 +123,7 @@ namespace xmlscript
return pNames != pEnd;
}
// -----------------------------------------------------------------------------
// XInitialization
// -----------------------------------------------------------------------------
void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
{
@ -164,9 +144,7 @@ namespace xmlscript
}
}
// -----------------------------------------------------------------------------
// XExporter
// -----------------------------------------------------------------------------
void XMLBasicExporterBase::setSourceDocument( const Reference< XComponent >& rxDoc )
throw (IllegalArgumentException, RuntimeException)
@ -181,9 +159,7 @@ namespace xmlscript
}
}
// -----------------------------------------------------------------------------
// XFilter
// -----------------------------------------------------------------------------
sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /*aDescriptor*/ )
throw (RuntimeException)
@ -420,8 +396,6 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
return bReturn;
}
// -----------------------------------------------------------------------------
void XMLBasicExporterBase::cancel()
throw (RuntimeException)
{
@ -430,74 +404,53 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
// cancel export
}
// =============================================================================
// XMLBasicExporter
// =============================================================================
XMLBasicExporter::XMLBasicExporter( const Reference< XComponentContext >& rxContext )
:XMLBasicExporterBase( rxContext, sal_False )
{
}
// -----------------------------------------------------------------------------
XMLBasicExporter::~XMLBasicExporter()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
OUString XMLBasicExporter::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_XMLBasicExporter();
}
// -----------------------------------------------------------------------------
Sequence< OUString > XMLBasicExporter::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_XMLBasicExporter();
}
// =============================================================================
// XMLOasisBasicExporter
// =============================================================================
XMLOasisBasicExporter::XMLOasisBasicExporter( const Reference< XComponentContext >& rxContext )
:XMLBasicExporterBase( rxContext, sal_True )
{
}
// -----------------------------------------------------------------------------
XMLOasisBasicExporter::~XMLOasisBasicExporter()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
OUString XMLOasisBasicExporter::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_XMLOasisBasicExporter();
}
// -----------------------------------------------------------------------------
Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_XMLOasisBasicExporter();
}
// =============================================================================
// component operations
// =============================================================================
Reference< XInterface > SAL_CALL create_XMLBasicExporter(
Reference< XComponentContext > const & xContext )
@ -506,8 +459,6 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
return static_cast< lang::XTypeProvider * >( new XMLBasicExporter( xContext ) );
}
// -----------------------------------------------------------------------------
Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter(
Reference< XComponentContext > const & xContext )
SAL_THROW(())
@ -515,10 +466,6 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
return static_cast< lang::XTypeProvider * >( new XMLOasisBasicExporter( xContext ) );
}
// -----------------------------------------------------------------------------
//.........................................................................
} // namespace xmlscript
//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -29,15 +29,10 @@
#include <cppuhelper/implbase3.hxx>
#include <osl/mutex.hxx>
//.........................................................................
namespace xmlscript
{
//.........................................................................
// =============================================================================
// class XMLBasicExporterBase
// =============================================================================
typedef ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,
@ -77,10 +72,7 @@ namespace xmlscript
throw (::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class XMLBasicExporter
// =============================================================================
class XMLBasicExporter : public XMLBasicExporterBase
{
@ -96,10 +88,7 @@ namespace xmlscript
throw (::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class XMLOasisBasicExporter
// =============================================================================
class XMLOasisBasicExporter : public XMLBasicExporterBase
{
@ -115,9 +104,7 @@ namespace xmlscript
throw (::com::sun::star::uno::RuntimeException);
};
//.........................................................................
} // namespace xmlscript
//.........................................................................
#endif // XMLSCRIPT_XMLBAS_EXPORT_HXX

View File

@ -30,15 +30,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
//.........................................................................
namespace xmlscript
{
//.........................................................................
// =============================================================================
// BasicElementBase
// =============================================================================
BasicElementBase::BasicElementBase( const OUString& rLocalName,
const Reference< xml::input::XAttributes >& xAttributes,
@ -54,8 +49,6 @@ namespace xmlscript
m_pParent->acquire();
}
// -----------------------------------------------------------------------------
BasicElementBase::~BasicElementBase()
{
if ( m_pImport )
@ -64,8 +57,6 @@ namespace xmlscript
m_pParent->release();
}
// -----------------------------------------------------------------------------
bool BasicElementBase::getBoolAttr( sal_Bool* pRet, const OUString& rAttrName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
sal_Int32 nUid )
@ -94,9 +85,7 @@ namespace xmlscript
return false;
}
// -----------------------------------------------------------------------------
// XElement
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicElementBase::getParent()
throw (RuntimeException)
@ -104,16 +93,12 @@ namespace xmlscript
return static_cast< xml::input::XElement* >( m_pParent );
}
// -----------------------------------------------------------------------------
OUString BasicElementBase::getLocalName()
throw (RuntimeException)
{
return m_aLocalName;
}
// -----------------------------------------------------------------------------
sal_Int32 BasicElementBase::getUid()
throw (RuntimeException)
{
@ -123,16 +108,12 @@ namespace xmlscript
return nId;
}
// -----------------------------------------------------------------------------
Reference< xml::input::XAttributes > BasicElementBase::getAttributes()
throw (RuntimeException)
{
return m_xAttributes;
}
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicElementBase::startChildElement(
sal_Int32 /*nUid*/, const OUString& /*rLocalName*/,
const Reference< xml::input::XAttributes >& /*xAttributes*/ )
@ -141,39 +122,28 @@ namespace xmlscript
throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
}
// -----------------------------------------------------------------------------
void BasicElementBase::characters( const OUString& /*rChars*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// not used, all characters ignored
}
// -----------------------------------------------------------------------------
void BasicElementBase::ignorableWhitespace( const OUString& /*rWhitespaces*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
// -----------------------------------------------------------------------------
void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
// -----------------------------------------------------------------------------
void BasicElementBase::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
}
// =============================================================================
// BasicLibrariesElement
// =============================================================================
BasicLibrariesElement::BasicLibrariesElement( const OUString& rLocalName,
const Reference< xml::input::XAttributes >& xAttributes,
@ -184,9 +154,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
{
}
// -----------------------------------------------------------------------------
// XElement
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicLibrariesElement::startChildElement(
sal_Int32 nUid, const OUString& rLocalName,
@ -274,17 +242,12 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
return xElement;
}
// -----------------------------------------------------------------------------
void BasicLibrariesElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
}
// =============================================================================
// BasicEmbeddedLibraryElement
// =============================================================================
BasicEmbeddedLibraryElement::BasicEmbeddedLibraryElement( const OUString& rLocalName,
const Reference< xml::input::XAttributes >& xAttributes,
@ -307,9 +270,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
}
// -----------------------------------------------------------------------------
// XElement
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicEmbeddedLibraryElement::startChildElement(
sal_Int32 nUid, const OUString& rLocalName,
@ -340,8 +301,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
return xElement;
}
// -----------------------------------------------------------------------------
void BasicEmbeddedLibraryElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -349,10 +308,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
m_xLibContainer->setLibraryReadOnly( m_aLibName, m_bReadOnly );
}
// =============================================================================
// BasicModuleElement
// =============================================================================
BasicModuleElement::BasicModuleElement( const OUString& rLocalName,
const Reference< xml::input::XAttributes >& xAttributes,
@ -364,9 +320,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
{
}
// -----------------------------------------------------------------------------
// XElement
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicModuleElement::startChildElement(
sal_Int32 nUid, const OUString& rLocalName,
@ -399,17 +353,12 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
return xElement;
}
// -----------------------------------------------------------------------------
void BasicModuleElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
}
// =============================================================================
// BasicSourceCodeElement
// =============================================================================
BasicSourceCodeElement::BasicSourceCodeElement( const OUString& rLocalName,
const Reference< xml::input::XAttributes >& xAttributes,
@ -421,9 +370,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
{
}
// -----------------------------------------------------------------------------
// XElement
// -----------------------------------------------------------------------------
void BasicSourceCodeElement::characters( const OUString& rChars )
throw (xml::sax::SAXException, RuntimeException)
@ -431,8 +378,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
m_aBuffer.append( rChars );
}
// -----------------------------------------------------------------------------
void BasicSourceCodeElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -459,10 +404,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
}
// =============================================================================
// BasicImport
// =============================================================================
BasicImport::BasicImport( const Reference< frame::XModel >& rxModel, sal_Bool bOasis )
:m_xModel( rxModel )
@ -470,15 +412,11 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
{
}
// -----------------------------------------------------------------------------
BasicImport::~BasicImport()
{
}
// -----------------------------------------------------------------------------
// XRoot
// -----------------------------------------------------------------------------
void BasicImport::startDocument( const Reference< xml::input::XNamespaceMapping >& xNamespaceMapping )
throw (xml::sax::SAXException, RuntimeException)
@ -495,29 +433,21 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
}
}
// -----------------------------------------------------------------------------
void BasicImport::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
}
// -----------------------------------------------------------------------------
void BasicImport::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
// -----------------------------------------------------------------------------
void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*xLocator*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
// -----------------------------------------------------------------------------
Reference< xml::input::XElement > BasicImport::startRootElement( sal_Int32 nUid, const OUString& rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
throw (xml::sax::SAXException, RuntimeException)
@ -560,10 +490,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return xElement;
}
// =============================================================================
// component operations
// =============================================================================
OUString getImplementationName_XMLBasicImporter()
{
@ -580,8 +507,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return *pImplName;
}
// -----------------------------------------------------------------------------
Sequence< OUString > getSupportedServiceNames_XMLBasicImporter()
{
static Sequence< OUString >* pNames = 0;
@ -598,8 +523,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return *pNames;
}
// -----------------------------------------------------------------------------
OUString getImplementationName_XMLOasisBasicImporter()
{
static OUString* pImplName = 0;
@ -615,8 +538,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return *pImplName;
}
// -----------------------------------------------------------------------------
Sequence< OUString > getSupportedServiceNames_XMLOasisBasicImporter()
{
static Sequence< OUString >* pNames = 0;
@ -633,10 +554,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return *pNames;
}
// =============================================================================
// XMLBasicImporterBase
// =============================================================================
XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis )
:m_xContext( rxContext )
@ -644,15 +562,11 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
{
}
// -----------------------------------------------------------------------------
XMLBasicImporterBase::~XMLBasicImporterBase()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException)
{
@ -665,9 +579,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return pNames != pEnd;
}
// -----------------------------------------------------------------------------
// XImporter
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::setTargetDocument( const Reference< XComponent >& rxDoc )
throw (IllegalArgumentException, RuntimeException)
@ -694,9 +606,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
}
}
// -----------------------------------------------------------------------------
// XDocumentHandler
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::startDocument()
throw (xml::sax::SAXException, RuntimeException)
@ -707,8 +617,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->startDocument();
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
@ -718,8 +626,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->endDocument();
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::startElement( const OUString& aName,
const Reference< xml::sax::XAttributeList >& xAttribs )
throw (xml::sax::SAXException, RuntimeException)
@ -730,8 +636,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->startElement( aName, xAttribs );
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::endElement( const OUString& aName )
throw (xml::sax::SAXException, RuntimeException)
{
@ -741,8 +645,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->endElement( aName );
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::characters( const OUString& aChars )
throw (xml::sax::SAXException, RuntimeException)
{
@ -752,8 +654,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->characters( aChars );
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::ignorableWhitespace( const OUString& aWhitespaces )
throw (xml::sax::SAXException, RuntimeException)
{
@ -763,8 +663,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->ignorableWhitespace( aWhitespaces );
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::processingInstruction( const OUString& aTarget,
const OUString& aData )
throw (xml::sax::SAXException, RuntimeException)
@ -775,8 +673,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->processingInstruction( aTarget, aData );
}
// -----------------------------------------------------------------------------
void XMLBasicImporterBase::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator )
throw (xml::sax::SAXException, RuntimeException)
{
@ -786,74 +682,53 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
m_xHandler->setDocumentLocator( xLocator );
}
// =============================================================================
// XMLBasicImporter
// =============================================================================
XMLBasicImporter::XMLBasicImporter( const Reference< XComponentContext >& rxContext )
:XMLBasicImporterBase( rxContext, sal_False )
{
}
// -----------------------------------------------------------------------------
XMLBasicImporter::~XMLBasicImporter()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
OUString XMLBasicImporter::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_XMLBasicImporter();
}
// -----------------------------------------------------------------------------
Sequence< OUString > XMLBasicImporter::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_XMLBasicImporter();
}
// =============================================================================
// XMLOasisBasicImporter
// =============================================================================
XMLOasisBasicImporter::XMLOasisBasicImporter( const Reference< XComponentContext >& rxContext )
:XMLBasicImporterBase( rxContext, sal_True )
{
}
// -----------------------------------------------------------------------------
XMLOasisBasicImporter::~XMLOasisBasicImporter()
{
}
// -----------------------------------------------------------------------------
// XServiceInfo
// -----------------------------------------------------------------------------
OUString XMLOasisBasicImporter::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_XMLOasisBasicImporter();
}
// -----------------------------------------------------------------------------
Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_XMLOasisBasicImporter();
}
// =============================================================================
// component operations
// =============================================================================
Reference< XInterface > SAL_CALL create_XMLBasicImporter(
Reference< XComponentContext > const & xContext )
@ -862,8 +737,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return static_cast< lang::XTypeProvider * >( new XMLBasicImporter( xContext ) );
}
// -----------------------------------------------------------------------------
Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter(
Reference< XComponentContext > const & xContext )
SAL_THROW(())
@ -871,10 +744,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
return static_cast< lang::XTypeProvider * >( new XMLOasisBasicImporter( xContext ) );
}
// -----------------------------------------------------------------------------
//.........................................................................
} // namespace xmlscript
//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -31,15 +31,10 @@
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
//.........................................................................
namespace xmlscript
{
//.........................................................................
// =============================================================================
// class BasicElementBase
// =============================================================================
class BasicImport;
@ -89,10 +84,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class BasicLibrariesElement
// =============================================================================
class BasicLibrariesElement : public BasicElementBase
{
@ -114,10 +106,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class BasicEmbeddedLibraryElement
// =============================================================================
class BasicEmbeddedLibraryElement : public BasicElementBase
{
@ -143,10 +132,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class BasicModuleElement
// =============================================================================
class BasicModuleElement : public BasicElementBase
{
@ -170,10 +156,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class BasicSourceCodeElement
// =============================================================================
class BasicSourceCodeElement : public BasicElementBase
{
@ -196,10 +179,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class BasicImport
// =============================================================================
typedef ::cppu::WeakImplHelper1<
::com::sun::star::xml::input::XRoot > BasicImport_BASE;
@ -239,10 +219,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class XMLBasicImporterBase
// =============================================================================
typedef ::cppu::WeakImplHelper2<
::com::sun::star::lang::XServiceInfo,
@ -290,10 +267,7 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class XMLBasicImporter
// =============================================================================
class XMLBasicImporter : public XMLBasicImporterBase
{
@ -309,10 +283,7 @@ namespace xmlscript
throw (::com::sun::star::uno::RuntimeException);
};
// =============================================================================
// class XMLOasisBasicImporter
// =============================================================================
class XMLOasisBasicImporter : public XMLBasicImporterBase
{
@ -328,9 +299,7 @@ namespace xmlscript
throw (::com::sun::star::uno::RuntimeException);
};
//.........................................................................
} // namespace xmlscript
//.........................................................................
#endif // XMLSCRIPT_XMLBAS_IMPORT_HXX

View File

@ -32,7 +32,6 @@
#include <vector>
using namespace ::rtl;
using namespace ::std;
using namespace ::com::sun::star;
@ -102,10 +101,8 @@ inline bool getLongAttr(
return false;
}
//==================================================================================================
// Library import
//==================================================================================================
struct LibraryImport
: public ::cppu::WeakImplHelper1< xml::input::XRoot >
{
@ -149,7 +146,6 @@ public:
throw (xml::sax::SAXException, RuntimeException);
};
//==================================================================================================
class LibElementBase
: public ::cppu::WeakImplHelper1< xml::input::XElement >
{
@ -194,8 +190,6 @@ public:
throw (xml::sax::SAXException, RuntimeException);
};
//==================================================================================================
class LibrariesElement : public LibElementBase
{
friend class LibraryElement;
@ -220,8 +214,6 @@ public:
{}
};
//==================================================================================================
class LibraryElement : public LibElementBase
{
protected:

View File

@ -17,25 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <xmlscript/xmllib_imexp.hxx>
#include <xmlscript/xml_helper.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star;
namespace xmlscript
{
const char aTrueStr[] = "true";
const char aFalseStr[] = "false";
//##################################################################################################
//==================================================================================================
void
SAL_CALL exportLibraryContainer(
Reference< xml::sax::XWriter > const & xOut,
@ -50,7 +43,6 @@ SAL_CALL exportLibraryContainer(
xOut->unknown( aDocTypeStr );
xOut->ignorableWhitespace( OUString() );
OUString aLibrariesName( XMLNS_LIBRARY_PREFIX ":libraries" );
XMLElement* pLibsElement = new XMLElement( aLibrariesName );
Reference< xml::sax::XAttributeList > xAttributes( pLibsElement );
@ -58,7 +50,6 @@ SAL_CALL exportLibraryContainer(
pLibsElement->addAttribute( "xmlns:" XMLNS_LIBRARY_PREFIX, XMLNS_LIBRARY_URI );
pLibsElement->addAttribute( "xmlns:" XMLNS_XLINK_PREFIX, XMLNS_XLINK_URI );
xOut->ignorableWhitespace( OUString() );
xOut->startElement( aLibrariesName, xAttributes );
@ -77,7 +68,6 @@ SAL_CALL exportLibraryContainer(
pLibElement->addAttribute( XMLNS_LIBRARY_PREFIX ":name", rLib.aName );
if( !rLib.aStorageURL.isEmpty() )
{
pLibElement->addAttribute( XMLNS_XLINK_PREFIX ":href", rLib.aStorageURL );
@ -100,8 +90,6 @@ SAL_CALL exportLibraryContainer(
xOut->endDocument();
}
//==================================================================================================
void
SAL_CALL exportLibrary(
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut,
@ -116,7 +104,6 @@ SAL_CALL exportLibrary(
xOut->unknown( aDocTypeStr );
xOut->ignorableWhitespace( OUString() );
OUString aLibraryName( XMLNS_LIBRARY_PREFIX ":library" );
XMLElement* pLibElement = new XMLElement( aLibraryName );
Reference< xml::sax::XAttributeList > xAttributes( pLibElement );

View File

@ -23,58 +23,52 @@
namespace xmlscript
{
//##################################################################################################
//__________________________________________________________________________________________________
Reference< xml::input::XElement > LibElementBase::getParent()
throw (RuntimeException)
{
return static_cast< xml::input::XElement * >( _pParent );
}
//__________________________________________________________________________________________________
OUString LibElementBase::getLocalName()
throw (RuntimeException)
{
return _aLocalName;
}
//__________________________________________________________________________________________________
sal_Int32 LibElementBase::getUid()
throw (RuntimeException)
{
return _pImport->XMLNS_LIBRARY_UID;
}
//__________________________________________________________________________________________________
Reference< xml::input::XAttributes > LibElementBase::getAttributes()
throw (RuntimeException)
{
return _xAttributes;
}
//__________________________________________________________________________________________________
void LibElementBase::ignorableWhitespace(
OUString const & /*rWhitespaces*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void LibElementBase::characters( OUString const & /*rChars*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// not used, all characters ignored
}
//__________________________________________________________________________________________________
void LibElementBase::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void LibElementBase::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > LibElementBase::startChildElement(
sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
Reference< xml::input::XAttributes > const & /*xAttributes*/ )
@ -83,7 +77,6 @@ Reference< xml::input::XElement > LibElementBase::startChildElement(
throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
}
//__________________________________________________________________________________________________
LibElementBase::LibElementBase(
OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes,
@ -101,7 +94,7 @@ LibElementBase::LibElementBase(
_pParent->acquire();
}
}
//__________________________________________________________________________________________________
LibElementBase::~LibElementBase()
SAL_THROW(())
{
@ -118,11 +111,8 @@ LibElementBase::~LibElementBase()
#endif
}
//##################################################################################################
// XRoot
//______________________________________________________________________________
void LibraryImport::startDocument(
Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
throw (xml::sax::SAXException, RuntimeException)
@ -130,24 +120,24 @@ void LibraryImport::startDocument(
XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI );
XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri( XMLNS_XLINK_URI );
}
//__________________________________________________________________________________________________
void LibraryImport::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void LibraryImport::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void LibraryImport::setDocumentLocator(
Reference< xml::sax::XLocator > const & /*xLocator*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > LibraryImport::startRootElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -178,7 +168,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement(
throw xml::sax::SAXException( "illegal root element (expected libraries) given: " + rLocalName, Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
LibraryImport::~LibraryImport()
SAL_THROW(())
{
@ -187,11 +177,7 @@ LibraryImport::~LibraryImport()
#endif
}
//##################################################################################################
// libraries
//__________________________________________________________________________________________________
Reference< xml::input::XElement > LibrariesElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -221,7 +207,7 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement(
throw xml::sax::SAXException( "expected styles ot bulletinboard element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void LibrariesElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -236,7 +222,6 @@ void LibrariesElement::endElement()
}
// library
//__________________________________________________________________________________________________
Reference< xml::input::XElement > LibraryElement::startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -260,7 +245,7 @@ Reference< xml::input::XElement > LibraryElement::startChildElement(
throw xml::sax::SAXException( "expected styles ot bulletinboard element!", Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
void LibraryElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
@ -276,9 +261,6 @@ void LibraryElement::endElement()
pLib->aElementNames = aElementNames;
}
//##################################################################################################
Reference< ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
SAL_THROW( (Exception) )
@ -287,8 +269,6 @@ SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
static_cast< xml::input::XRoot * >( new LibraryImport( pLibArray ) ) );
}
//##################################################################################################
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibrary( LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) )
@ -297,9 +277,6 @@ SAL_CALL importLibrary( LibDescriptor& rLib )
static_cast< xml::input::XRoot * >( new LibraryImport( &rLib ) ) );
}
//##################################################################################################
LibDescriptorArray::LibDescriptorArray( sal_Int32 nLibCount )
{
mnLibCount = nLibCount;

View File

@ -41,10 +41,8 @@ using namespace ::com::sun::star::uno;
namespace xmlscript
{
//==================================================================================================
// Script module import
//==================================================================================================
struct ModuleImport
: public ::cppu::WeakImplHelper1< xml::input::XRoot >
{
@ -81,7 +79,6 @@ public:
throw (xml::sax::SAXException, RuntimeException);
};
//==================================================================================================
class ModuleElement
: public ::cppu::WeakImplHelper1< xml::input::XElement >
{
@ -127,8 +124,6 @@ public:
throw (xml::sax::SAXException, RuntimeException);
};
//==================================================================================================
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -17,19 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <xmlscript/xmlmod_imexp.hxx>
#include <xmlscript/xml_helper.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star;
namespace xmlscript
{
//==================================================================================================
void
SAL_CALL exportScriptModule(
Reference< xml::sax::XWriter > const & xOut,

View File

@ -23,58 +23,52 @@
namespace xmlscript
{
//##################################################################################################
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ModuleElement::getParent()
throw (RuntimeException)
{
return static_cast< xml::input::XElement * >( _pParent );
}
//__________________________________________________________________________________________________
OUString ModuleElement::getLocalName()
throw (RuntimeException)
{
return _aLocalName;
}
//__________________________________________________________________________________________________
sal_Int32 ModuleElement::getUid()
throw (RuntimeException)
{
return _pImport->XMLNS_SCRIPT_UID;
}
//__________________________________________________________________________________________________
Reference< xml::input::XAttributes > ModuleElement::getAttributes()
throw (RuntimeException)
{
return _xAttributes;
}
//__________________________________________________________________________________________________
void ModuleElement::ignorableWhitespace(
OUString const & /*rWhitespaces*/ )
throw (xml::sax::SAXException, RuntimeException)
{
// not used
}
//__________________________________________________________________________________________________
void ModuleElement::characters( OUString const & rChars )
throw (xml::sax::SAXException, RuntimeException)
{
_StrBuffer.append( rChars );
}
//__________________________________________________________________________________________________
void ModuleElement::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void ModuleElement::endElement()
throw (xml::sax::SAXException, RuntimeException)
{
_pImport->mrModuleDesc.aCode = _StrBuffer.makeStringAndClear();
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ModuleElement::startChildElement(
sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
Reference< xml::input::XAttributes > const & /*xAttributes*/ )
@ -83,7 +77,6 @@ Reference< xml::input::XElement > ModuleElement::startChildElement(
throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
}
//__________________________________________________________________________________________________
ModuleElement::ModuleElement(
OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes,
@ -101,7 +94,7 @@ ModuleElement::ModuleElement(
_pParent->acquire();
}
}
//__________________________________________________________________________________________________
ModuleElement::~ModuleElement()
SAL_THROW(())
{
@ -118,11 +111,8 @@ ModuleElement::~ModuleElement()
#endif
}
//##################################################################################################
// XRoot
//______________________________________________________________________________
void ModuleImport::startDocument(
Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
throw (xml::sax::SAXException, RuntimeException)
@ -132,25 +122,24 @@ void ModuleImport::startDocument(
XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri( XMLNS_XLINK_URI );
}
//__________________________________________________________________________________________________
void ModuleImport::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
// ignored
}
//__________________________________________________________________________________________________
void ModuleImport::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
void ModuleImport::setDocumentLocator(
Reference< xml::sax::XLocator > const & /*xLocator*/ )
throw (xml::sax::SAXException, RuntimeException)
{
}
//__________________________________________________________________________________________________
Reference< xml::input::XElement > ModuleImport::startRootElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
@ -174,7 +163,6 @@ Reference< xml::input::XElement > ModuleImport::startRootElement(
throw xml::sax::SAXException("illegal root element (expected module) given: " + rLocalName, Reference< XInterface >(), Any() );
}
}
//__________________________________________________________________________________________________
ModuleImport::~ModuleImport()
SAL_THROW(())
{
@ -183,8 +171,6 @@ ModuleImport::~ModuleImport()
#endif
}
//##################################################################################################
Reference< xml::sax::XDocumentHandler >
SAL_CALL importScriptModule( ModuleDescriptor& rMod )
SAL_THROW( (Exception) )

View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <stdio.h>
#include "osl/file.h"
@ -49,15 +48,11 @@
#include <com/sun/star/registry/XImplementationRegistration.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
Reference< XComponentContext > createInitialComponentContext(
OUString const & inst_dir )
{
@ -84,9 +79,6 @@ Reference< XComponentContext > createInitialComponentContext(
return xContext;
}
// -----------------------------------------------------------------------
Reference< container::XNameContainer > importFile(
char const * fname,
Reference< XComponentContext > const & xContext )
@ -144,8 +136,6 @@ void exportToFile(
::fclose( f );
}
class MyApp : public Application
{
public:
@ -154,8 +144,6 @@ public:
MyApp aMyApp;
// -----------------------------------------------------------------------
void MyApp::Main()
{
if (GetCommandLineParamCount() < 2)