[Libreoffice-commits] .: Branch 'feature/container-controls-and-miscbits' - xmlscript/source

[Noel Power]

 xmlscript/source/xmldlg_imexp/imp_share.hxx        |    6 ------
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |    6 ++----
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx    |   10 +++++-----
 3 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit a22f01b1a6054d1dd7e07ba8280b4f353df71bad
Author: Noel Power <noel.power at novell.com>
Date:   Fri Nov 5 10:37:53 2010 +0000

    clean up styles, fix missing export of (embedded) image url

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 5523fe0..0717e32 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -128,8 +128,6 @@ struct DialogImport
 
     ::boost::shared_ptr< ::std::vector< ::rtl::OUString > > _pStyleNames;
     ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles;
-    ::std::vector< ::rtl::OUString >& _styleNames;
-    ::std::vector< css::uno::Reference< css::xml::input::XElement > >& _styles;
 
     css::uno::Reference< css::container::XNameContainer > _xDialogModel;
     css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
@@ -176,8 +174,6 @@ public:
         : _xContext( xContext )
         , _pStyleNames( pStyleNames )
         , _pStyles( pStyles )
-        , _styleNames( *_pStyleNames )
-        , _styles( *_pStyles )
         , _xDialogModel( xDialogModel )
         , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ), _xDoc( xDoc )
         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
@@ -187,8 +183,6 @@ public:
         , _xSupplier( rOther._xSupplier )
         , _pStyleNames( rOther._pStyleNames )
         , _pStyles( rOther._pStyles )
-        , _styleNames( *_pStyleNames )
-        , _styles( *_pStyles )
         , _xDialogModel( rOther._xDialogModel )
         , _xDialogModelFactory( rOther._xDialogModelFactory )
         , _xDoc( rOther._xDoc )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 2d955fd..01f1efe 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -1333,10 +1333,8 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
     if ( (aDecorationAny >>= bDecoration) && !bDecoration )
         addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtitlebar") ),
                       OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
-
-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
-
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
     readEvents();
 }
 
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 02a74f2..b5d61fd 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -2010,19 +2010,19 @@ void DialogImport::addStyle(
     Reference< xml::input::XElement > const & xStyle )
     SAL_THROW( () )
 {
-    _styleNames.push_back( rStyleId );
-    _styles.push_back( xStyle );
+    (*_pStyleNames).push_back( rStyleId );
+    (*_pStyles).push_back( xStyle );
 }
 //__________________________________________________________________________________________________
 Reference< xml::input::XElement > DialogImport::getStyle(
     OUString const & rStyleId ) const
     SAL_THROW( () )
 {
-    for ( size_t nPos = 0; nPos < _styleNames.size(); ++nPos )
+    for ( size_t nPos = 0; nPos < (*_pStyleNames).size(); ++nPos )
     {
-        if (_styleNames[ nPos ] == rStyleId)
+        if ( (*_pStyleNames)[ nPos ] == rStyleId)
         {
-            return _styles[ nPos ];
+            return (*_pStyles)[ nPos ];
         }
     }
     return 0;