merge vosremoval-reference.diff

14 files changed, 33 insertions, 25 deletions

diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 9ace2a45bb..3e09660c08 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -106,7 +106,7 @@ sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rNa
         }
         while ( sal_True );
     }
-    ::vos::ORef<NameSpaceEntry> pEntry(new NameSpaceEntry);
+    ::rtl::Reference<NameSpaceEntry> pEntry(new NameSpaceEntry);
     pEntry->sName   = rName;
     pEntry->nKey    = nKey;
     pEntry->sPrefix = rPrefix;
@@ -308,7 +308,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
         it = aNameCache.end();
     if ( it != aNameCache.end() )
     {
-        const NameSpaceEntry &rEntry = (*it).second.getBody();
+        const NameSpaceEntry &rEntry = *((*it).second);
         if ( pPrefix )
             *pPrefix = rEntry.sPrefix;
         if ( pLocalName )
@@ -322,7 +322,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
     }
     else
     {
-    vos::ORef<NameSpaceEntry> xEntry(new NameSpaceEntry());
+    rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry());
 
         sal_Int32 nColonPos = rAttrName.indexOf( sal_Unicode(':') );
         if( -1L == nColonPos )
@@ -360,7 +360,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
 
         if (bCache)
     {
-        typedef std::pair< const rtl::OUString, vos::ORef<NameSpaceEntry> > value_type;
+        typedef std::pair< const rtl::OUString, rtl::Reference<NameSpaceEntry> > value_type;
         (void) const_cast<NameSpaceHash*>(&aNameCache)->insert (value_type (rAttrName, xEntry));
     }
     }
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index b0cb120b11..bfd7e2a980 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 class SvXMLImport;
 class SvXMLExport;
@@ -53,7 +53,7 @@ namespace xmloff
     {
     public:
         virtual SvXMLExport&								getGlobalContext() = 0;
-        virtual ::vos::ORef< SvXMLExportPropertyMapper >	getStylePropertyMapper() = 0;
+        virtual ::rtl::Reference< SvXMLExportPropertyMapper >	getStylePropertyMapper() = 0;
 
         /** steps through a collection and exports all children of this collection
         */
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index a406a6e7c9..b4b1f53465 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <sal/types.h>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 #include <comphelper/stl_types.hxx>
 
 class SvXMLExport;
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 66d5ebf234..3d8ef0e911 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -94,7 +94,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
+    ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
     {
         return m_pImpl->getStylePropertyMapper();
     }
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 7ecd16bfcb..4217b95ab7 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -61,7 +61,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    ::vos::ORef< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
+    ::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
     {
         return m_pImpl->getStylePropertyMapper();
     }
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 1a64b4583a..01a60eb7f8 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -100,13 +100,13 @@ namespace xmloff
 
         // add our style family to the export context's style pool
         m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
-        ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper( getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr() );
-        m_xStyleExportMapper = new OFormComponentStyleExportMapper( xStylePropertiesMapper.getBodyPtr() );
+        ::rtl::Reference< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper( getControlStylePropertyMap(), m_xPropertyHandlerFactory.get() );
+        m_xStyleExportMapper = new OFormComponentStyleExportMapper( xStylePropertiesMapper.get() );
 
         // our style family
         m_rContext.GetAutoStylePool()->AddFamily(
             XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH),
-            m_xStyleExportMapper.getBodyPtr(),
+            m_xStyleExportMapper.get(),
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_CONTROL_PREFIX) )
         );
 
@@ -184,7 +184,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper()
+    ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper()
     {
         return m_xStyleExportMapper;
     }
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 0a2e7c25eb..eb0e04bf8e 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/awt/XControlModel.hpp>
 #include "callbacks.hxx"
 #include "ifacecompare.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 class SvXMLExport;
 class SvXMLNumFmtExport;
@@ -80,8 +80,8 @@ namespace xmloff
         PropertySetBag		m_aIgnoreList;
 
         // style handling
-        ::vos::ORef< XMLPropertyHandlerFactory >	m_xPropertyHandlerFactory;
-        ::vos::ORef< SvXMLExportPropertyMapper >	m_xStyleExportMapper;
+        ::rtl::Reference< XMLPropertyHandlerFactory >	m_xPropertyHandlerFactory;
+        ::rtl::Reference< SvXMLExportPropertyMapper >	m_xStyleExportMapper;
 
         // we need our own number formats supplier:
         // Controls which have a number formats do not work with the formats supplier of the document they reside
@@ -181,7 +181,7 @@ namespace xmloff
         virtual SvXMLExport&								getGlobalContext();
         virtual ::rtl::OUString								getObjectStyleName(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject );
-        virtual ::vos::ORef< SvXMLExportPropertyMapper >	getStylePropertyMapper();
+        virtual ::rtl::Reference< SvXMLExportPropertyMapper >	getStylePropertyMapper();
 
         /** clear any structures which have been build in the recent <method>examine</method> calls.
         */
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 78a297bda6..7205a87081 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -242,8 +242,8 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
 
     // initialize our style map
     m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
-    ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr());
-    m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.getBodyPtr(), _rImporter);
+        ::rtl::Reference< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.get());
+        m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.get(), _rImporter);
 
     // 'initialize'
     m_aCurrentPageIds = m_aControlIds.end();
@@ -419,7 +419,7 @@ void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPrope
 }
 
 //---------------------------------------------------------------------
-::vos::ORef< SvXMLImportPropertyMapper > OFormLayerXMLImport_Impl::getStylePropertyMapper() const
+::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport_Impl::getStylePropertyMapper() const
 {
     return m_xImportMapper;
 }
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 80a9db78d8..bbd0ae4e83 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include "formattributes.hxx"
 #include "callbacks.hxx"
 #include "eventimport.hxx"
@@ -93,8 +93,8 @@ namespace xmloff
 
     protected:
         // style handling
-        ::vos::ORef< XMLPropertyHandlerFactory >	m_xPropertyHandlerFactory;
-        ::vos::ORef< SvXMLImportPropertyMapper >	m_xImportMapper;
+        ::rtl::Reference< XMLPropertyHandlerFactory >	m_xPropertyHandlerFactory;
+        ::rtl::Reference< SvXMLImportPropertyMapper >	m_xImportMapper;
 
         DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, MapString2PropertySet );
         DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map);
@@ -170,7 +170,7 @@ namespace xmloff
 
         /** retrieves the property mapper form form related auto styles.
         */
-        ::vos::ORef< SvXMLImportPropertyMapper > getStylePropertyMapper() const;
+        ::rtl::Reference< SvXMLImportPropertyMapper > getStylePropertyMapper() const;
 
         /** start importing the forms of the given page
         */
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 647af830f1..19d013609f 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -30,7 +30,7 @@
 
 #include <xmloff/xmlictxt.hxx>
 #include "formattributes.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "layerimport.hxx"
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index e20c5f4ed3..ac67323a80 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -49,6 +49,7 @@ using namespace com::sun::star::document;
 using namespace com::sun::star::xml::sax;
 using namespace ::xmloff::token;
 
+using rtl::OUString;
 
 // =============================================================================
 // XMLScriptChildContext: context for <office:script> element
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 1002c414c0..4739d7195e 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -70,6 +70,8 @@ using ::com::sun::star::lang::WrappedTargetException;
 using ::com::sun::star::beans::UnknownPropertyException;
 using ::com::sun::star::beans::PropertyVetoException;
 
+using rtl::OUString;
+using rtl::OUStringBuffer;
 
 SvXMLImportPropertyMapper::SvXMLImportPropertyMapper(
         const UniReference< XMLPropertySetMapper >& rMapper,
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f5ecb43dda..7e0dd7f9d5 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -84,6 +84,9 @@ using namespace ::com::sun::star::frame;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::io;
 
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] =
         "SymbolTextDistance";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PARENT_NUMBERING[] =
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 0b294c8239..e4a2d09c8d 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -65,6 +65,8 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::xmloff::token;
 
+using rtl::OUString;
+
 
 XMLFieldParamImportContext::XMLFieldParamImportContext(
     SvXMLImport& rImport,