[Libreoffice-commits] .: xmlscript/inc xmlscript/source xmlscript/test
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 15:13:37 PDT 2012
xmlscript/inc/xmlscript/xml_helper.hxx | 22
xmlscript/inc/xmlscript/xmllib_imexp.hxx | 6
xmlscript/inc/xmlscript/xmlmod_imexp.hxx | 8
xmlscript/source/inc/misc.hxx | 5
xmlscript/source/xml_helper/xml_impctx.cxx | 31
xmlscript/source/xmldlg_imexp/exp_share.hxx | 60 -
xmlscript/source/xmldlg_imexp/imp_share.hxx | 234 +--
xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 18
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 1120 ++++++-------------
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 520 +++-----
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1234 +++++----------------
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 500 ++------
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 163 +-
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 194 +--
xmlscript/source/xmllib_imexp/imp_share.hxx | 8
xmlscript/source/xmllib_imexp/xmllib_export.cxx | 61 -
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 79 -
xmlscript/source/xmlmod_imexp/imp_share.hxx | 3
xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 19
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 34
xmlscript/test/imexp.cxx | 14
21 files changed, 1457 insertions(+), 2876 deletions(-)
New commits:
commit c75af8578d921040e1baf8414edd7239969bcd45
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sat Sep 1 12:44:39 2012 -0300
kill RTL_CONSTASCII_USTRINGPARAM in xmlscript
Plus rtl::OUString cleanup
Only on rebased files
Change-Id: Icddaa20742cc45f08e5a48790447fcf8865f4bd6
Reviewed-on: https://gerrit.libreoffice.org/527
Reviewed-by: Olivier Hallot <olivier.hallot at alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot at alta.org.br>
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 1c7ee37..5d3c747 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -42,7 +42,7 @@ class XMLSCRIPT_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
{
public:
- inline XMLElement( ::rtl::OUString const & name )
+ inline XMLElement( OUString const & name )
SAL_THROW(())
: _name( name )
{}
@@ -67,7 +67,7 @@ public:
@param rAttrName qname of attribute
@param rValue value string of element
*/
- void SAL_CALL addAttribute( ::rtl::OUString const & rAttrName, ::rtl::OUString const & rValue )
+ void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue )
SAL_THROW(());
/** Gets the tag name (qname) of element.
@@ -75,7 +75,7 @@ public:
@return
qname of element
*/
- inline ::rtl::OUString SAL_CALL getName() SAL_THROW(())
+ inline OUString SAL_CALL getName() SAL_THROW(())
{ return _name; }
/** Dumps out element (and all sub elements).
@@ -94,22 +94,22 @@ public:
// XAttributeList
virtual sal_Int16 SAL_CALL getLength()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByName( ::rtl::OUString const & rName )
+ virtual OUString SAL_CALL getTypeByName( OUString const & rName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByName( ::rtl::OUString const & rName )
+ virtual OUString SAL_CALL getValueByName( OUString const & rName )
throw (::com::sun::star::uno::RuntimeException);
protected:
- ::rtl::OUString _name;
+ OUString _name;
- ::std::vector< ::rtl::OUString > _attrNames;
- ::std::vector< ::rtl::OUString > _attrValues;
+ ::std::vector< OUString > _attrNames;
+ ::std::vector< OUString > _attrValues;
::std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > > _subElems;
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index 5a5d305..6470e6c 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -35,12 +35,12 @@ namespace xmlscript
// functionality from xmlscript
struct XMLSCRIPT_DLLPUBLIC LibDescriptor
{
- ::rtl::OUString aName;
- ::rtl::OUString aStorageURL;
+ OUString aName;
+ OUString aStorageURL;
sal_Bool bLink;
sal_Bool bReadOnly;
sal_Bool bPasswordProtected;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aElementNames;
+ ::com::sun::star::uno::Sequence< OUString > aElementNames;
sal_Bool bPreload;
};
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 58fdd91..ed3368a 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -34,10 +34,10 @@ namespace xmlscript
// functionality from xmlscript
struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor
{
- ::rtl::OUString aName;
- ::rtl::OUString aLanguage;
- ::rtl::OUString aCode;
- ::rtl::OUString aModuleType; // VBA
+ OUString aName;
+ OUString aLanguage;
+ OUString aCode;
+ OUString aModuleType; // VBA
};
XMLSCRIPT_DLLPUBLIC void
diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index 6c04f4b..459e53e 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -22,9 +22,6 @@
#include "com/sun/star/uno/Any.hxx"
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
-
namespace xmlscript
{
@@ -35,7 +32,7 @@ inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a )
if (! (a >>= *p))
{
throw ::com::sun::star::uno::RuntimeException(
- OUSTR("expected ") + ::getCppuType( p ).getTypeName(),
+ "expected " + ::getCppuType( p ).getTypeName(),
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface>() );
}
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 6fe71cb..252c35e 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -45,15 +45,13 @@ const sal_Int32 UID_UNKNOWN = -1;
Sequence< OUString > getSupportedServiceNames_DocumentHandlerImpl()
{
- OUString name( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.xml.input.SaxDocumentHandler") );
+ OUString name( "com.sun.star.xml.input.SaxDocumentHandler" );
return Sequence< OUString >( &name, 1 );
}
OUString getImplementationName_DocumentHandlerImpl()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.xml.input.SaxDocumentHandler") );
+ return OUString( "com.sun.star.comp.xml.input.SaxDocumentHandler" );
}
typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap;
@@ -191,14 +189,12 @@ DocumentHandlerImpl::DocumentHandlerImpl(
bool bSingleThreadedUse )
: m_xRoot( xRoot ),
m_uid_count( 0 ),
- m_sXMLNS_PREFIX_UNKNOWN(
- RTL_CONSTASCII_USTRINGPARAM("<<< unknown prefix >>>") ),
- m_sXMLNS( RTL_CONSTASCII_USTRINGPARAM("xmlns") ),
+ m_sXMLNS_PREFIX_UNKNOWN( "<<< unknown prefix >>>" ),
+ m_sXMLNS( "xmlns" ),
m_nLastURI_lookup( UID_UNKNOWN ),
- m_aLastURI_lookup( RTL_CONSTASCII_USTRINGPARAM("<<< unknown URI >>>") ),
+ m_aLastURI_lookup( "<<< unknown URI >>>" ),
m_nLastPrefix_lookup( UID_UNKNOWN ),
- m_aLastPrefix_lookup(
- RTL_CONSTASCII_USTRINGPARAM("<<< unknown URI >>>") ),
+ m_aLastPrefix_lookup( "<<< unknown URI >>>" ),
m_nSkipElements( 0 ),
m_pMutex( 0 )
{
@@ -473,10 +469,7 @@ void DocumentHandlerImpl::initialize(
}
else
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "missing root instance!") ),
- Reference< XInterface >() );
+ throw RuntimeException( "missing root instance!", Reference< XInterface >() );
}
}
@@ -504,9 +497,7 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
if (iPos->second == Uid)
return iPos->first;
}
- throw container::NoSuchElementException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no such xmlns uid!") ),
- static_cast< OWeakObject * >(this) );
+ throw container::NoSuchElementException( "no such xmlns uid!" , static_cast< OWeakObject * >(this) );
}
@@ -516,8 +507,7 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
void DocumentHandlerImpl::startDocument()
throw (xml::sax::SAXException, RuntimeException)
{
- m_xRoot->startDocument(
- static_cast< xml::input::XNamespaceMapping * >( this ) );
+ m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) );
}
//______________________________________________________________________________
@@ -606,8 +596,7 @@ void DocumentHandlerImpl::startElement(
{
OUString const & rQAttributeName = pQNames[ nPos ];
OSL_ENSURE(
- rQAttributeName.compareToAscii(
- RTL_CONSTASCII_STRINGPARAM("xmlns:") ) != 0,
+ rQAttributeName.compareToAscii( "xmlns:" ) != 0,
"### unexpected xmlns!" );
// collect attribute's uid and current prefix
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 902f6a6..f2cbd45 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -53,7 +53,7 @@ struct Style
short _all;
short _set;
- ::rtl::OUString _id;
+ OUString _id;
inline Style( short all_ ) SAL_THROW(())
: _fontRelief( css::awt::FontRelief::NONE )
@@ -71,7 +71,7 @@ class StyleBag
public:
~StyleBag() SAL_THROW(());
- ::rtl::OUString getStyleId( Style const & rStyle ) SAL_THROW(());
+ OUString getStyleId( Style const & rStyle ) SAL_THROW(());
void dump( css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >
const & xOut );
@@ -88,7 +88,7 @@ public:
inline ElementDescriptor(
css::uno::Reference< css::beans::XPropertySet > const & xProps,
css::uno::Reference< css::beans::XPropertyState > const & xPropState,
- ::rtl::OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument )
+ OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument )
SAL_THROW(())
: XMLElement( name )
, _xProps( xProps )
@@ -96,65 +96,65 @@ public:
, _xDocument( xDocument )
{}
inline ElementDescriptor(
- ::rtl::OUString const & name )
+ OUString const & name )
SAL_THROW(())
: XMLElement( name )
{}
template<typename T>
inline void read(
- ::rtl::OUString const & propName, ::rtl::OUString const & attrName,
+ OUString const & propName, OUString const & attrName,
bool forceAttribute = false );
template<typename T>
- inline bool readProp( T * ret, ::rtl::OUString const & rPropName );
- css::uno::Any readProp( ::rtl::OUString const & rPropName );
+ inline bool readProp( T * ret, OUString const & rPropName );
+ css::uno::Any readProp( OUString const & rPropName );
void readDefaults( bool supportPrintable = true, bool supportVisible = true );
void readStringAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
inline void readDoubleAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ OUString const & rPropName, OUString const & rAttrName )
{ read<double>( rPropName, rAttrName ); }
inline void readLongAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
bool forceAttribute = false )
{ read<sal_Int32>( rPropName, rAttrName, forceAttribute ); }
void readHexLongAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
inline void readShortAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ OUString const & rPropName, OUString const & rAttrName )
{ read<sal_Int32>( rPropName, rAttrName ); }
inline void readBoolAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ OUString const & rPropName, OUString const & rAttrName )
{ read<sal_Bool>( rPropName, rAttrName ); }
void readAlignAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readVerticalAlignAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readImageURLAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readImageAlignAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readImagePositionAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readDateFormatAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readTimeFormatAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readOrientationAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readButtonTypeAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readLineEndFormatAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readSelectionTypeAttr(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ OUString const & rPropName, OUString const & rAttrName );
void readDataAwareAttr(
- ::rtl::OUString const & rAttrName );
+ OUString const & rAttrName );
inline void addBoolAttr(
- ::rtl::OUString const & rAttrName, sal_Bool bValue )
- { addAttribute( rAttrName, ::rtl::OUString::valueOf(bValue) ); }
+ OUString const & rAttrName, sal_Bool bValue )
+ { addAttribute( rAttrName, OUString::valueOf(bValue) ); }
void addNumberFormatAttr(
css::uno::Reference< css::beans::XPropertySet >
const & xFormatProperties );
@@ -218,7 +218,7 @@ public:
template<typename T>
inline void ElementDescriptor::read(
- ::rtl::OUString const & propName, ::rtl::OUString const & attrName,
+ OUString const & propName, OUString const & attrName,
bool forceAttribute )
{
if (forceAttribute ||
@@ -228,7 +228,7 @@ inline void ElementDescriptor::read(
css::uno::Any a( _xProps->getPropertyValue( propName ) );
T v = T();
if (a >>= v)
- addAttribute( attrName, ::rtl::OUString::valueOf(v) );
+ addAttribute( attrName, OUString::valueOf(v) );
else
OSL_FAIL( "### unexpected property type!" );
}
@@ -236,7 +236,7 @@ inline void ElementDescriptor::read(
template<typename T>
inline bool ElementDescriptor::readProp(
- T * ret, ::rtl::OUString const & rPropName )
+ T * ret, OUString const & rPropName )
{
_xProps->getPropertyValue( rPropName ) >>= *ret;
return css::beans::PropertyState_DEFAULT_VALUE !=
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index d986afd..3f306b7 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -43,7 +43,7 @@ namespace css = ::com::sun::star;
namespace xmlscript
{
-inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW(())
+inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(())
{
sal_Int32 nVal;
if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x')
@@ -54,11 +54,11 @@ inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW(())
}
inline bool getBoolAttr(
- sal_Bool * pRet, ::rtl::OUString const & rAttrName,
+ sal_Bool * pRet, OUString const & rAttrName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
sal_Int32 nUid )
{
- ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
+ OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
if (!aValue.isEmpty())
{
if ( aValue == "true" )
@@ -74,7 +74,7 @@ inline bool getBoolAttr(
else
{
throw css::xml::sax::SAXException(
- rAttrName + OUSTR(": no boolean value (true|false)!"),
+ rAttrName + ": no boolean value (true|false)!",
css::uno::Reference<css::uno::XInterface>(), css::uno::Any() );
}
}
@@ -82,7 +82,7 @@ inline bool getBoolAttr(
}
inline bool getStringAttr(
- ::rtl::OUString * pRet, ::rtl::OUString const & rAttrName,
+ OUString * pRet, OUString const & rAttrName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
sal_Int32 nUid )
{
@@ -91,11 +91,11 @@ inline bool getStringAttr(
}
inline bool getLongAttr(
- sal_Int32 * pRet, ::rtl::OUString const & rAttrName,
+ sal_Int32 * pRet, OUString const & rAttrName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
sal_Int32 nUid )
{
- ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
+ OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
if (!aValue.isEmpty())
{
*pRet = toInt32( aValue );
@@ -116,7 +116,7 @@ struct DialogImport
css::uno::Reference< css::uno::XComponentContext > _xContext;
css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier;
- ::boost::shared_ptr< ::std::vector< ::rtl::OUString > > _pStyleNames;
+ ::boost::shared_ptr< ::std::vector< OUString > > _pStyleNames;
::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles;
css::uno::Reference< css::container::XNameContainer > _xDialogModel;
@@ -128,18 +128,18 @@ struct DialogImport
public:
inline bool isEventElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName )
+ sal_Int32 nUid, OUString const & rLocalName )
{
return ((XMLNS_SCRIPT_UID == nUid && (rLocalName == "event" || rLocalName == "listener-event" )) ||
(XMLNS_DIALOGS_UID == nUid && rLocalName == "event" ));
}
void addStyle(
- ::rtl::OUString const & rStyleId,
+ OUString const & rStyleId,
css::uno::Reference< css::xml::input::XElement > const & xStyle )
SAL_THROW(());
css::uno::Reference< css::xml::input::XElement > getStyle(
- ::rtl::OUString const & rStyleId ) const
+ OUString const & rStyleId ) const
SAL_THROW(());
inline css::uno::Reference< css::uno::XComponentContext >
@@ -151,7 +151,7 @@ public:
css::uno::Reference<css::uno::XComponentContext> const & xContext,
css::uno::Reference<css::container::XNameContainer>
const & xDialogModel,
- ::boost::shared_ptr< ::std::vector< ::rtl::OUString > >& pStyleNames,
+ ::boost::shared_ptr< ::std::vector< OUString > >& pStyleNames,
::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles,
css::uno::Reference<css::frame::XModel> const & xDoc )
SAL_THROW(())
@@ -186,14 +186,14 @@ public:
virtual void SAL_CALL endDocument()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL processingInstruction(
- ::rtl::OUString const & rTarget, ::rtl::OUString const & rData )
+ OUString const & rTarget, OUString const & rData )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL setDocumentLocator(
css::uno::Reference< css::xml::sax::XLocator > const & xLocator )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startRootElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
};
@@ -207,12 +207,12 @@ protected:
ElementBase * _pParent;
sal_Int32 _nUid;
- ::rtl::OUString _aLocalName;
+ OUString _aLocalName;
css::uno::Reference< css::xml::input::XAttributes > _xAttributes;
public:
ElementBase(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(());
@@ -222,25 +222,25 @@ public:
// XElement
virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLocalName()
+ virtual OUString SAL_CALL getLocalName()
throw (css::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getUid()
throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::xml::input::XAttributes >
SAL_CALL getAttributes() throw (css::uno::RuntimeException);
virtual void SAL_CALL ignorableWhitespace(
- ::rtl::OUString const & rWhitespaces )
+ OUString const & rWhitespaces )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
- virtual void SAL_CALL characters( ::rtl::OUString const & rChars )
+ virtual void SAL_CALL characters( OUString const & rChars )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL processingInstruction(
- ::rtl::OUString const & Target, ::rtl::OUString const & Data )
+ OUString const & Target, OUString const & Data )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
};
@@ -252,12 +252,12 @@ class StylesElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline StylesElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -290,7 +290,7 @@ class StyleElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
@@ -312,7 +312,7 @@ public:
css::uno::Reference< css::beans::XPropertySet > const & xProps );
inline StyleElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -329,20 +329,20 @@ public:
class MenuPopupElement
: public ElementBase
{
- ::std::vector< ::rtl::OUString > _itemValues;
+ ::std::vector< OUString > _itemValues;
::std::vector< sal_Int16 > _itemSelected;
public:
- css::uno::Sequence< ::rtl::OUString > getItemValues();
+ css::uno::Sequence< OUString > getItemValues();
css::uno::Sequence< sal_Int16 > getSelectedItems();
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline MenuPopupElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -362,10 +362,10 @@ protected:
::std::vector< css::uno::Reference< css::xml::input::XElement > > _events;
- ::rtl::OUString getControlId(
+ OUString getControlId(
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
- ::rtl::OUString getControlModelName(
- rtl::OUString const& rDefaultModel,
+ OUString getControlModelName(
+ OUString const& rDefaultModel,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
css::uno::Reference< css::xml::input::XElement > getStyle(
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
@@ -374,7 +374,7 @@ public:
SAL_THROW(()) { return &_events; }
ControlElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(());
@@ -386,13 +386,13 @@ class ImportContext
protected:
DialogImport * _pImport;
css::uno::Reference< css::beans::XPropertySet > _xControlModel;
- ::rtl::OUString _aId;
+ OUString _aId;
public:
inline ImportContext(
DialogImport * pImport,
css::uno::Reference< css::beans::XPropertySet > const & xControlModel_,
- ::rtl::OUString const & id )
+ OUString const & id )
: _pImport( pImport ),
_xControlModel( xControlModel_ ),
_aId( id )
@@ -410,61 +410,61 @@ public:
const & rEvents );
bool importStringProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importDoubleProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importBooleanProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importShortProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importLongProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importLongProperty(
sal_Int32 nOffset,
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importHexLongProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importAlignProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importVerticalAlignProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
- bool importImageURLProperty( rtl::OUString const & rPropName, rtl::OUString const & rAttrName,
+ bool importImageURLProperty( OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes );
bool importImageAlignProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importImagePositionProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importDateFormatProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importTimeFormatProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importOrientationProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importButtonTypeProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importLineEndFormatProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importSelectionTypeProperty(
- ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ OUString const & rPropName, OUString const & rAttrName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
bool importDataAwareProperty(
- ::rtl::OUString const & rPropName,
+ OUString const & rPropName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
};
@@ -474,7 +474,7 @@ class ControlImportContext : public ImportContext
public:
inline ControlImportContext(
DialogImport * pImport,
- ::rtl::OUString const & rId, ::rtl::OUString const & rControlName )
+ OUString const & rId, OUString const & rControlName )
: ImportContext(
pImport,
css::uno::Reference< css::beans::XPropertySet >(
@@ -483,7 +483,7 @@ public:
{}
inline ControlImportContext(
DialogImport * pImport,
- const css::uno::Reference< css::beans::XPropertySet >& xProps, ::rtl::OUString const & rControlName )
+ const css::uno::Reference< css::beans::XPropertySet >& xProps, OUString const & rControlName )
: ImportContext(
pImport,
xProps,
@@ -505,14 +505,14 @@ class WindowElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline WindowElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -529,7 +529,7 @@ public:
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline EventElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -544,12 +544,12 @@ class BulletinBoardElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
BulletinBoardElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(());
@@ -562,14 +562,14 @@ class ButtonElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline ButtonElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -584,14 +584,14 @@ class CheckBoxElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline CheckBoxElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -607,14 +607,14 @@ class ComboBoxElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline ComboBoxElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -630,14 +630,14 @@ class MenuListElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline MenuListElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -652,12 +652,12 @@ class RadioElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline RadioElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -673,14 +673,14 @@ class RadioGroupElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline RadioGroupElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -692,19 +692,19 @@ public:
class TitledBoxElement
: public BulletinBoardElement
{
- ::rtl::OUString _label;
+ OUString _label;
::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios;
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline TitledBoxElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -719,14 +719,14 @@ class TextElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline TextElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -740,14 +740,14 @@ class FixedHyperLinkElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline FixedHyperLinkElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -761,14 +761,14 @@ class TextFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline TextFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -783,14 +783,14 @@ class ImageControlElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline ImageControlElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -805,14 +805,14 @@ class FileControlElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline FileControlElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -827,14 +827,14 @@ class TreeControlElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline TreeControlElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -849,14 +849,14 @@ class CurrencyFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline CurrencyFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -871,14 +871,14 @@ class DateFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline DateFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -893,14 +893,14 @@ class NumericFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline NumericFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -915,14 +915,14 @@ class TimeFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline TimeFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -937,14 +937,14 @@ class PatternFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline PatternFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -959,14 +959,14 @@ class FormattedFieldElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline FormattedFieldElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -981,14 +981,14 @@ class FixedLineElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline FixedLineElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -1003,14 +1003,14 @@ class ScrollBarElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline ScrollBarElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -1026,14 +1026,14 @@ class SpinButtonElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline SpinButtonElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -1048,20 +1048,20 @@ class MultiPage
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline MultiPage(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
: ControlElement( rLocalName, xAttributes, pParent, pImport )
{
- m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ), css::uno::UNO_QUERY );
+ m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoMultiPageModel" ), css::uno::UNO_QUERY );
}
private:
css::uno::Reference< css::container::XNameContainer > m_xContainer;
@@ -1071,18 +1071,18 @@ private:
class Frame
: public ControlElement
{
- ::rtl::OUString _label;
+ OUString _label;
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline Frame(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
@@ -1099,20 +1099,20 @@ class Page
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline Page(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
: ControlElement( rLocalName, xAttributes, pParent, pImport )
{
- m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoPageModel") ) ), css::uno::UNO_QUERY );
+ m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoPageModel" ), css::uno::UNO_QUERY );
}
private:
css::uno::Reference< css::container::XNameContainer > m_xContainer;
@@ -1125,14 +1125,14 @@ class ProgressBarElement
public:
virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement(
- sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ sal_Int32 nUid, OUString const & rLocalName,
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
inline ProgressBarElement(
- ::rtl::OUString const & rLocalName,
+ OUString const & rLocalName,
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
ElementBase * pParent, DialogImport * pImport )
SAL_THROW(())
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index 7f84f74..b01b6dc 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -68,18 +68,16 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
if (! xSMgr.is())
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no service manager available!") ),
+ throw RuntimeException("no service manager available!",
Reference< XInterface >() );
}
Reference< xml::sax::XExtendedDocumentHandler > xHandler( xSMgr->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") ), xContext ), UNO_QUERY );
+ "com.sun.star.xml.sax.Writer", xContext ), UNO_QUERY );
OSL_ASSERT( xHandler.is() );
if (! xHandler.is())
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("could not create sax-writer component!") ),
+ throw RuntimeException("could not create sax-writer component!",
Reference< XInterface >() );
}
@@ -103,18 +101,16 @@ void SAL_CALL importDialogModel(
Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
if (! xSMgr.is())
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("no service manager available!") ),
+ throw RuntimeException("no service manager available!",
Reference< XInterface >() );
}
Reference< xml::sax::XParser > xParser( xSMgr->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ), xContext ), UNO_QUERY );
+ "com.sun.star.xml.sax.Parser", xContext ), UNO_QUERY );
OSL_ASSERT( xParser.is() );
if (! xParser.is())
{
- throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("could not create sax-parser component!") ),
+ throw RuntimeException("could not create sax-parser component!",
Reference< XInterface >() );
}
@@ -123,7 +119,7 @@ void SAL_CALL importDialogModel(
xml::sax::InputSource source;
source.aInputStream = xInput;
- source.sSystemId = OUString( RTL_CONSTASCII_USTRINGPARAM("virtual file") );
+ source.sSystemId = "virtual file";
xParser->parseStream( source );
}
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 042ca8e..a8c026e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -40,10 +40,10 @@ namespace xmlscript
static inline bool readBorderProps(
ElementDescriptor * element, Style & style )
{
- if (element->readProp( &style._border, OUSTR("Border") )) {
+ if (element->readProp( &style._border, "Border" )) {
if (style._border == BORDER_SIMPLE /* simple */)
{
- if (element->readProp( &style._borderColor, OUSTR("BorderColor") ))
+ if (element->readProp( &style._borderColor, "BorderColor" ))
style._border = BORDER_SIMPLE_COLOR;
}
return true;
@@ -54,11 +54,11 @@ static inline bool readBorderProps(
static inline bool readFontProps( ElementDescriptor * element, Style & style )
{
bool ret = element->readProp(
- &style._descr, OUSTR("FontDescriptor") );
+ &style._descr, "FontDescriptor" );
ret |= element->readProp(
- &style._fontEmphasisMark, OUSTR("FontEmphasisMark") );
+ &style._fontEmphasisMark, "FontEmphasisMark" );
ret |= element->readProp(
- &style._fontRelief, OUSTR("FontRelief") );
+ &style._fontRelief, "FontRelief" );
return ret;
}
@@ -67,34 +67,32 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id" , all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiPageValue") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- Any aDecorationAny( _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Decoration") ) ) );
+ readLongAttr( "MultiPageValue", XMLNS_DIALOGS_PREFIX ":value" );
+ Any aDecorationAny( _xProps->getPropertyValue( "Decoration" ) );
bool bDecoration = sal_True;
if ( (aDecorationAny >>= bDecoration) && !bDecoration )
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtabs") ), OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":withtabs", "false" );
readEvents();
uno::Reference< container::XNameContainer > xPagesContainer( _xProps, uno::UNO_QUERY );
if ( xPagesContainer.is() && xPagesContainer->getElementNames().getLength() )
{
- ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+ ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
pElem->readBullitinBoard( all_styles );
addSubElement( pElem );
}
@@ -105,36 +103,32 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles )
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
OUString aTitle;
- if ( readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
+ if ( readProp( "Label" ) >>= aTitle)
{
- ElementDescriptor * title = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ), _xDocument );
- title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
- aTitle );
+ ElementDescriptor * title = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument );
+ title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle );
addSubElement( title );
}
uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY );
if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() )
{
- ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+ ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
pElem->readBullitinBoard( all_styles );
addSubElement( pElem );
}
@@ -145,30 +139,27 @@ void ElementDescriptor::readPageModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- rtl::OUString aTitle;
- readStringAttr(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
+ OUString aTitle;
+ readStringAttr( "Title", XMLNS_DIALOGS_PREFIX ":title" );
uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY );
if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() )
{
- ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+ ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument );
pElem->readBullitinBoard( all_styles );
addSubElement( pElem );
}
@@ -180,66 +171,54 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultButton") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":default") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
- readButtonTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("PushButtonType") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":button-type") ) );
- readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
-
-
- readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
- readImageAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-align") ) );
- if (extract_throw<bool>( _xProps->getPropertyValue( OUSTR("Repeat") ) ))
- readLongAttr( OUSTR("RepeatDelay"),
- OUSTR(XMLNS_DIALOGS_PREFIX ":repeat"), true /* force */ );
- if (extract_throw<bool>( _xProps->getPropertyValue( OUSTR("Toggle") ) ))
- addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":toggled"), OUSTR("1") );
- readBoolAttr( OUSTR("FocusOnClick"),
- OUSTR(XMLNS_DIALOGS_PREFIX ":grab-focus") );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readBoolAttr( "DefaultButton", XMLNS_DIALOGS_PREFIX ":default" );
+ readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
+ 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" );
+
+ if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) ))
+ readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ );
+
+ if (extract_throw<bool>( _xProps->getPropertyValue( "Toggle" ) ))
+ addAttribute( XMLNS_DIALOGS_PREFIX ":toggled", "1" );
+
+ readBoolAttr( "FocusOnClick", XMLNS_DIALOGS_PREFIX ":grab-focus" );
+ readBoolAttr( "MultiLine",XMLNS_DIALOGS_PREFIX ":multiline" );
// State
sal_Int16 nState = 0;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
+ if (readProp( "State" ) >>= nState)
{
switch (nState)
{
case 0:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "false" );
break;
case 1:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" );
break;
default:
OSL_FAIL( "### unexpected radio state!" );
@@ -255,57 +234,46 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
- if (readProp( OUSTR("VisualEffect") ) >>= aStyle._visualEffect)
+ if (readProp( "VisualEffect" ) >>= aStyle._visualEffect)
aStyle._set |= 0x40;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
- readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
- readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
+ readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
+ readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" );
+ readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
sal_Bool bTriState = sal_False;
- if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TriState") ) ) >>= bTriState) && bTriState)
+ if ((readProp( "TriState" ) >>= bTriState) && bTriState)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tristate") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":tristate", "true" );
}
sal_Int16 nState = 0;
- if (_xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
+ if (_xProps->getPropertyValue( "State" ) >>= nState)
{
switch (nState)
{
case 0:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "false" );
break;
case 1:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" );
break;
case 2: // tristate=true exported, checked omitted => dont know!
OSL_ENSURE( bTriState, "### detected tristate value, but TriState is not set!" );
@@ -323,11 +291,11 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readBorderProps( this, aStyle ))
aStyle._set |= 0x4;
@@ -335,51 +303,35 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Autocomplete") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":autocomplete") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":readonly") ) );
- readBoolAttr( OUSTR("HideInactiveSelection"),
- OUSTR(XMLNS_DIALOGS_PREFIX ":hide-inactive-selection") );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Dropdown") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spin") ) );
- readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MaxTextLen") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) );
- readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":value" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readBoolAttr( "Autocomplete", XMLNS_DIALOGS_PREFIX ":autocomplete" );
+ readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" );
+ readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" );
+ readBoolAttr( "Dropdown", XMLNS_DIALOGS_PREFIX ":spin" );
+ readShortAttr( "MaxTextLen", XMLNS_DIALOGS_PREFIX ":maxlength" );
+ readShortAttr( "LineCount", XMLNS_DIALOGS_PREFIX ":linecount" );
// Cell Range, Ref Cell etc.
- readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
- readDataAwareAttr( OUSTR( XMLNS_DIALOGS_PREFIX ":source-cell-range") );
+ readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
+ readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":source-cell-range" );
// string item list
Sequence< OUString > itemValues;
- if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
- itemValues.getLength() > 0)
+ if ((readProp( "StringItemList" ) >>= itemValues) && itemValues.getLength() > 0)
{
- ElementDescriptor * popup = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ), _xDocument );
+ ElementDescriptor * popup = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument );
OUString const * pItemValues = itemValues.getConstArray();
for ( sal_Int32 nPos = 0; nPos < itemValues.getLength(); ++nPos )
{
- ElementDescriptor * item = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ), _xDocument );
- item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
- pItemValues[ nPos ] );
+ ElementDescriptor * item = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument );
+ item->addAttribute( XMLNS_DIALOGS_PREFIX ":value", pItemValues[ nPos ] );
popup->addSubElement( item );
}
@@ -393,11 +345,11 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readBorderProps( this, aStyle ))
aStyle._set |= 0x4;
@@ -405,57 +357,43 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiSelection") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiselection") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":readonly") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Dropdown") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spin") ) );
- readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
- readDataAwareAttr( OUSTR( XMLNS_DIALOGS_PREFIX ":source-cell-range") );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readBoolAttr( "MultiSelection", XMLNS_DIALOGS_PREFIX ":multiselection" );
+ readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" );
+ readBoolAttr( "Dropdown", XMLNS_DIALOGS_PREFIX ":spin" );
+ readShortAttr( "LineCount", XMLNS_DIALOGS_PREFIX ":linecount" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
+ readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":source-cell-range" );
// string item list
Sequence< OUString > itemValues;
- if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
- itemValues.getLength() > 0)
+ if ((readProp( "StringItemList" ) >>= itemValues) && itemValues.getLength() > 0)
{
- ElementDescriptor * popup = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ), _xDocument );
+ ElementDescriptor * popup = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument );
OUString const * pItemValues = itemValues.getConstArray();
sal_Int32 nPos;
for ( nPos = 0; nPos < itemValues.getLength(); ++nPos )
{
- ElementDescriptor * item = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ), _xDocument );
- item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
- pItemValues[ nPos ] );
+ ElementDescriptor * item = new ElementDescriptor(_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument );
+ item->addAttribute( XMLNS_DIALOGS_PREFIX ":value", pItemValues[ nPos ] );
popup->addSubElement( item );
}
Sequence< sal_Int16 > selected;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ) ) >>= selected)
+ if (readProp( "SelectedItems" ) >>= selected)
{
sal_Int16 const * pSelected = selected.getConstArray();
for ( nPos = selected.getLength(); nPos--; )
{
ElementDescriptor * item = static_cast< ElementDescriptor * >(
popup->getSubElement( pSelected[ nPos ] ).get() );
- item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":selected") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) );
+ item->addAttribute( XMLNS_DIALOGS_PREFIX ":selected", "true" );
}
}
@@ -469,60 +407,49 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
- if (readProp( OUSTR("VisualEffect") ) >>= aStyle._visualEffect)
+ if (readProp( "VisualEffect" ) >>= aStyle._visualEffect)
aStyle._set |= 0x40;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id" , all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
- readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
- readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":group-name") ) );
+ readBoolAttr("Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
+ readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
+ readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" );
+ readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
+ readStringAttr( "GroupName", XMLNS_DIALOGS_PREFIX ":group-name" );
sal_Int16 nState = 0;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
+ if (readProp( "State" ) >>= nState)
{
switch (nState)
{
case 0:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
+ addAttribute(XMLNS_DIALOGS_PREFIX ":checked", "false" );
break;
case 1:
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checked") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("true") ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" );
break;
default:
OSL_FAIL( "### unexpected radio state!" );
break;
}
}
- readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
+ readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
readEvents();
}
//__________________________________________________________________________________________________
@@ -531,29 +458,25 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x2 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readFontProps( this, aStyle ))
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
OUString aTitle;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
+ if (readProp( "Label" ) >>= aTitle)
{
- ElementDescriptor * title = new ElementDescriptor(
- _xProps, _xPropState,
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ), _xDocument );
- title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
- aTitle );
+ ElementDescriptor * title = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument );
+ title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle );
addSubElement( title );
}
@@ -565,11 +488,11 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readBorderProps( this, aStyle ))
aStyle._set |= 0x4;
@@ -577,24 +500,17 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) );
+ readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
+ readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" );
readEvents();
}
//__________________________________________________________________________________________________
@@ -603,11 +519,11 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
{
// collect styles
Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+ if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor)
aStyle._set |= 0x1;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+ if (readProp( "TextColor" ) >>= aStyle._textColor)
aStyle._set |= 0x2;
- if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+ if (readProp( "TextLineColor" ) >>= aStyle._textLineColor)
aStyle._set |= 0x20;
if (readBorderProps( this, aStyle ))
aStyle._set |= 0x4;
@@ -615,28 +531,19 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
aStyle._set |= 0x8;
if (aStyle._set)
{
- addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
- all_styles->getStyleId( aStyle ) );
+ addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) );
}
// collect elements
readDefaults();
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":url") ) );
- readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":description") ) );
- readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
- readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
- readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("NoLabel") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":nolabel") ) );
+ readStringAttr( "Label",XMLNS_DIALOGS_PREFIX ":value" );
+ readStringAttr( "URL", XMLNS_DIALOGS_PREFIX ":url" );
+ readStringAttr( "Description", XMLNS_DIALOGS_PREFIX ":description" );
+ readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
+ readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
+ readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
+ readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" );
+ readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" );
readEvents();
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list