INTEGRATION: CWS dialogxml1 (1.22.12); FILE MERGED

2004/07/16 14:42:27 dbo 1.22.12.3: #115999# border color
2004/07/15 15:16:12 dbo 1.22.12.2: #115999# fixed various new properties
2004/07/06 13:23:37 dbo 1.22.12.1: #115999#

1 files changed, 403 insertions, 350 deletions

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 1ad5e5b973ce..d7e2dd581099 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imp_share.hxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: hr $ $Date: 2004-04-13 16:18:36 $
+ *  last change: $Author: kz $ $Date: 2004-07-30 16:48:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,60 +59,48 @@
  *
  ************************************************************************/
 
+#include "common.hxx"
+#include "misc.hxx"
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <xmlscript/xmllib_imexp.hxx>
 #include <xmlscript/xmlmod_imexp.hxx>
-
 #include <cppuhelper/implbase1.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
-
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/FontEmphasisMark.hpp>
 #include <com/sun/star/awt/FontRelief.hpp>
-
 #include <com/sun/star/xml/input/XRoot.hpp>
-
 #include <vector>
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
-
-using namespace ::rtl;
-using namespace ::std;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+namespace css = ::com::sun::star;
 
 namespace xmlscript
 {
+
 //
-inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW( () )
+inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () )
 {
     sal_Int32 nVal;
     if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x')
-    {
         nVal = rStr.copy( 2 ).toInt32( 16 );
-    }
     else
-    {
         nVal = rStr.toInt32();
-    }
     return nVal;
 }
+
 inline bool getBoolAttr(
-    sal_Bool * pRet, OUString const & rAttrName,
-    Reference< xml::input::XAttributes > const & xAttributes,
+    sal_Bool * pRet, ::rtl::OUString const & rAttrName,
+    css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
     sal_Int32 nUid )
 {
-    OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
+    ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
     if (aValue.getLength())
     {
         if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("true") ))
@@ -127,27 +115,29 @@ inline bool getBoolAttr(
         }
         else
         {
-            throw xml::sax::SAXException(
-                rAttrName + OUString( RTL_CONSTASCII_USTRINGPARAM(": no boolean value (true|false)!") ),
-                Reference< XInterface >(), Any() );
+            throw css::xml::sax::SAXException(
+                rAttrName + OUSTR(": no boolean value (true|false)!"),
+                css::uno::Reference<css::uno::XInterface>(), css::uno::Any() );
         }
     }
     return false;
 }
+
 inline bool getStringAttr(
-    OUString * pRet, OUString const & rAttrName,
-    Reference< xml::input::XAttributes > const & xAttributes,
+    ::rtl::OUString * pRet, ::rtl::OUString const & rAttrName,
+    css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
     sal_Int32 nUid )
 {
     *pRet = xAttributes->getValueByUidName( nUid, rAttrName );
     return (pRet->getLength() > 0);
 }
+
 inline bool getLongAttr(
-    sal_Int32 * pRet, OUString const & rAttrName,
-    Reference< xml::input::XAttributes > const & xAttributes,
+    sal_Int32 * pRet, ::rtl::OUString const & rAttrName,
+    css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
     sal_Int32 nUid )
 {
-    OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
+    ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) );
     if (aValue.getLength())
     {
         *pRet = toInt32( aValue );
@@ -158,25 +148,26 @@ inline bool getLongAttr(
 
 class ImportContext;
 
-//==================================================================================================
+//==============================================================================
 struct DialogImport
-    : public ::cppu::WeakImplHelper1< xml::input::XRoot >
+    : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
 {
     friend class ImportContext;
 
-    Reference< XComponentContext > _xContext;
-    Reference< util::XNumberFormatsSupplier > _xSupplier;
+    css::uno::Reference< css::uno::XComponentContext > _xContext;
+    css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier;
 
-    vector< OUString > _styleNames;
-    vector< Reference< xml::input::XElement > > _styles;
+    ::std::vector< ::rtl::OUString > _styleNames;
+    ::std::vector< css::uno::Reference< css::xml::input::XElement > > _styles;
 
-    Reference< container::XNameContainer > _xDialogModel;
-    Reference< lang::XMultiServiceFactory > _xDialogModelFactory;
+    css::uno::Reference< css::container::XNameContainer > _xDialogModel;
+    css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
 
     sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;
 
 public:
-    inline bool isEventElement( sal_Int32 nUid, OUString const & rLocalName )
+    inline bool isEventElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName )
     {
         return ((XMLNS_SCRIPT_UID == nUid &&
                  (rLocalName.equalsAsciiL(
@@ -189,24 +180,26 @@ public:
     }
 
     void addStyle(
-        OUString const & rStyleId,
-        Reference< xml::input::XElement > const & xStyle )
+        ::rtl::OUString const & rStyleId,
+        css::uno::Reference< css::xml::input::XElement > const & xStyle )
         SAL_THROW( () );
-    Reference< xml::input::XElement > getStyle(
-        OUString const & rStyleId ) const
+    css::uno::Reference< css::xml::input::XElement > getStyle(
+        ::rtl::OUString const & rStyleId ) const
         SAL_THROW( () );
 
-    inline Reference< XComponentContext > const & getComponentContext() SAL_THROW( () )
-        { return _xContext; }
-    Reference< util::XNumberFormatsSupplier > const & getNumberFormatsSupplier();
+    inline css::uno::Reference< css::uno::XComponentContext >
+    const & getComponentContext() SAL_THROW( () ) { return _xContext; }
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
+    const & getNumberFormatsSupplier();
 
     inline DialogImport(
-        Reference< XComponentContext > const & xContext,
-        Reference< container::XNameContainer > const & xDialogModel )
+        css::uno::Reference<css::uno::XComponentContext> const & xContext,
+        css::uno::Reference<css::container::XNameContainer>
+        const & xDialogModel )
         SAL_THROW( () )
         : _xContext( xContext )
         , _xDialogModel( xDialogModel )
-        , _xDialogModelFactory( xDialogModel, UNO_QUERY_THROW )
+        , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW )
         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
                       _xContext.is() ); }
     virtual ~DialogImport()
@@ -214,88 +207,93 @@ public:
 
     // XRoot
     virtual void SAL_CALL startDocument(
-        Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-        throw (xml::sax::SAXException, RuntimeException);
+        css::uno::Reference< css::xml::input::XNamespaceMapping >
+        const & xNamespaceMapping )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
     virtual void SAL_CALL endDocument()
-        throw (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (xml::sax::SAXException, RuntimeException);
+        ::rtl::OUString const & rTarget, ::rtl::OUString const & rData )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
     virtual void SAL_CALL setDocumentLocator(
-        Reference< xml::sax::XLocator > const & xLocator )
-        throw (xml::sax::SAXException, RuntimeException);
-    virtual Reference< xml::input::XElement > SAL_CALL startRootElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+        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,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 };
 
-//==================================================================================================
+//==============================================================================
 class ElementBase
-    : public ::cppu::WeakImplHelper1< xml::input::XElement >
+    : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
 {
 protected:
     DialogImport * _pImport;
     ElementBase * _pParent;
 
     sal_Int32 _nUid;
-    OUString _aLocalName;
-    Reference< xml::input::XAttributes > _xAttributes;
+    ::rtl::OUString _aLocalName;
+    css::uno::Reference< css::xml::input::XAttributes > _xAttributes;
 
 public:
     ElementBase(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () );
     virtual ~ElementBase()
         SAL_THROW( () );
 
     // XElement
-    virtual Reference< xml::input::XElement > SAL_CALL getParent()
-        throw (RuntimeException);
-    virtual OUString SAL_CALL getLocalName()
-        throw (RuntimeException);
+    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
+        throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getLocalName()
+        throw (css::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getUid()
-        throw (RuntimeException);
-    virtual Reference< xml::input::XAttributes > SAL_CALL getAttributes()
-        throw (RuntimeException);
+        throw (css::uno::RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XAttributes >
+    SAL_CALL getAttributes() throw (css::uno::RuntimeException);
     virtual void SAL_CALL ignorableWhitespace(
-        OUString const & rWhitespaces )
-        throw (xml::sax::SAXException, RuntimeException);
-    virtual void SAL_CALL characters( OUString const & rChars )
-        throw (xml::sax::SAXException, RuntimeException);
+        ::rtl::OUString const & rWhitespaces )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+    virtual void SAL_CALL characters( ::rtl::OUString const & rChars )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
     virtual void SAL_CALL processingInstruction(
-        OUString const & Target, OUString const & Data )
-        throw (xml::sax::SAXException, RuntimeException);
+        ::rtl::OUString const & Target, ::rtl::OUString const & Data )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
     virtual void SAL_CALL endElement()
-        throw (xml::sax::SAXException, RuntimeException);
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+        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,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 };
 
-//==================================================================================================
+//==============================================================================
 class StylesElement
     : public ElementBase
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline StylesElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
                        rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class StyleElement
     : public ElementBase
 {
@@ -303,67 +301,76 @@ class StyleElement
     sal_Int32 _textColor;
     sal_Int32 _textLineColor;
     sal_Int16 _border;
-    awt::FontDescriptor _descr;
+    sal_Int32 _borderColor;
+    css::awt::FontDescriptor _descr;
     sal_Int16 _fontRelief;
     sal_Int16 _fontEmphasisMark;
     sal_Int32 _fillColor;
+    sal_Int16 _visualEffect;
 
+    // current highest mask: 0x40
     short _inited, _hasValue;
 
-    void setFontProperties( Reference< beans::XPropertySet > const & xProps );
+    void setFontProperties(
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
 
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     bool importTextColorStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
     bool importTextLineColorStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
     bool importFillColorStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
     bool importBackgroundColorStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
     bool importFontStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
     bool importBorderStyle(
-        Reference< beans::XPropertySet > const & xProps );
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
+    bool importVisualEffectStyle(
+        css::uno::Reference< css::beans::XPropertySet > const & xProps );
 
     inline StyleElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
                        rLocalName, xAttributes, pParent, pImport )
-        , _fontRelief( awt::FontRelief::NONE )
-        , _fontEmphasisMark( awt::FontEmphasisMark::NONE )
+        , _fontRelief( css::awt::FontRelief::NONE )
+        , _fontEmphasisMark( css::awt::FontEmphasisMark::NONE )
         , _inited( 0 )
         , _hasValue( 0 )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class MenuPopupElement
     : public ElementBase
 {
-    vector< OUString > _itemValues;
-    vector< sal_Int16 > _itemSelected;
+    ::std::vector< ::rtl::OUString > _itemValues;
+    ::std::vector< sal_Int16 > _itemSelected;
 public:
-    Sequence< OUString > getItemValues();
-    Sequence< sal_Int16 > getSelectedItems();
+    css::uno::Sequence< ::rtl::OUString > getItemValues();
+    css::uno::Sequence< sal_Int16 > getSelectedItems();
 
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline MenuPopupElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
@@ -371,7 +378,7 @@ public:
         {}
 };
 
-//==================================================================================================
+//==============================================================================
 class ControlElement
     : public ElementBase
 {
@@ -380,19 +387,19 @@ class ControlElement
 protected:
     sal_Int32 _nBasePosX, _nBasePosY;
 
-    vector< Reference< xml::input::XElement > > _events;
+    ::std::vector< css::uno::Reference< css::xml::input::XElement > > _events;
 
-    OUString getControlId(
-        Reference< xml::input::XAttributes > const & xAttributes );
-    Reference< xml::input::XElement > getStyle(
-        Reference< xml::input::XAttributes > const & xAttributes );
+    ::rtl::OUString getControlId(
+        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 );
 public:
-    vector< Reference< xml::input::XElement > > * getEvents() SAL_THROW( () )
-        { return &_events; }
+    ::std::vector<css::uno::Reference< css::xml::input::XElement> > *getEvents()
+        SAL_THROW( () ) { return &_events; }
 
     ControlElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () );
 };
@@ -402,66 +409,67 @@ class ImportContext
 {
 protected:
     DialogImport * _pImport;
-    Reference< beans::XPropertySet > _xControlModel;
-    OUString _aId;
+    css::uno::Reference< css::beans::XPropertySet > _xControlModel;
+    ::rtl::OUString _aId;
 
 public:
     inline ImportContext(
         DialogImport * pImport,
-        Reference< beans::XPropertySet > const & xControlModel_,
-        OUString const & id )
+        css::uno::Reference< css::beans::XPropertySet > const & xControlModel_,
+        ::rtl::OUString const & id )
         : _pImport( pImport ),
           _xControlModel( xControlModel_ ),
           _aId( id )
         { OSL_ASSERT( _xControlModel.is() ); }
 
-    inline Reference< beans::XPropertySet > getControlModel()
+    inline css::uno::Reference< css::beans::XPropertySet > getControlModel()
         { return _xControlModel; }
 
     void importDefaults(
         sal_Int32 nBaseX, sal_Int32 nBaseY,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         bool supportPrintable = true );
     void importEvents(
-        vector< Reference< xml::input::XElement > > const & rEvents );
+        ::std::vector< css::uno::Reference< css::xml::input::XElement > >
+        const & rEvents );
 
     bool importStringProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importDoubleProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importBooleanProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importShortProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importLongProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importLongProperty(
         sal_Int32 nOffset,
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importAlignProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importImageAlignProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importDateFormatProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importTimeFormatProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importOrientationProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     bool importButtonTypeProperty(
-        OUString const & rPropName, OUString const & rAttrName,
-        Reference< xml::input::XAttributes > const & xAttributes );
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
 };
 
 //==============================================================================
@@ -470,471 +478,516 @@ class ControlImportContext : public ImportContext
 public:
     inline ControlImportContext(
         DialogImport * pImport,
-        OUString const & rId, OUString const & rControlName )
+        ::rtl::OUString const & rId, ::rtl::OUString const & rControlName )
         : ImportContext(
             pImport,
-            Reference< beans::XPropertySet >(
+            css::uno::Reference< css::beans::XPropertySet >(
                 pImport->_xDialogModelFactory->createInstance( rControlName ),
-                UNO_QUERY_THROW ), rId )
+                css::uno::UNO_QUERY_THROW ), rId )
         {}
     inline ~ControlImportContext()
     {
         _pImport->_xDialogModel->insertByName(
-            _aId, makeAny(
-                Reference< awt::XControlModel >::query( _xControlModel ) ) );
+            _aId, css::uno::makeAny(
+                css::uno::Reference<css::awt::XControlModel>::query(
+                    _xControlModel ) ) );
     }
 };
 
-//==================================================================================================
+//==============================================================================
 class WindowElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline WindowElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class EventElement
     : public ElementBase
 {
 public:
     virtual void SAL_CALL endElement()
-        throw (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline EventElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ElementBase( nUid, rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class BulletinBoardElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline BulletinBoardElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () );
 };
-//==================================================================================================
+
+//==============================================================================
 class ButtonElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline ButtonElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class CheckBoxElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline CheckBoxElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class ComboBoxElement
     : public ControlElement
 {
-    Reference< xml::input::XElement > _popup;
+    css::uno::Reference< css::xml::input::XElement > _popup;
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline ComboBoxElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class MenuListElement
     : public ControlElement
 {
-    Reference< xml::input::XElement > _popup;
+    css::uno::Reference< css::xml::input::XElement > _popup;
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline MenuListElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class RadioElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline RadioElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class RadioGroupElement
     : public ControlElement
 {
-    vector< Reference< xml::input::XElement > > _radios;
+    ::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios;
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline RadioGroupElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class TitledBoxElement
     : public BulletinBoardElement
 {
-    OUString _label;
-    vector< Reference< xml::input::XElement > > _radios;
+    ::rtl::OUString _label;
+    ::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios;
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline TitledBoxElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : BulletinBoardElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class TextElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline TextElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class TextFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline TextFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class ImageControlElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline ImageControlElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class FileControlElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline FileControlElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class CurrencyFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline CurrencyFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class DateFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline DateFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class NumericFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline NumericFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class TimeFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline TimeFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class PatternFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline PatternFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class FormattedFieldElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline FormattedFieldElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class FixedLineElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline FixedLineElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class ScrollBarElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline ScrollBarElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
-//==================================================================================================
+
+//==============================================================================
 class ProgressBarElement
     : public ControlElement
 {
 public:
-    virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
-        sal_Int32 nUid, OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::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 (xml::sax::SAXException, RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
 
     inline ProgressBarElement(
-        OUString const & rLocalName,
-        Reference< xml::input::XAttributes > const & xAttributes,
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )