merge vosremoval-reference.diff

14 files changed, 38 insertions, 41 deletions

diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index 7f7c0cdd6253..0c649f1617c4 100644
--- a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
 #include <com/sun/star/linguistic2/XSupportedLocales.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 #include <cppuhelper/implbase2.hxx>
 #include "editeng/editengdllapi.h"
@@ -45,10 +45,10 @@ protected:
     /** this virtual function is called if the forbidden characters are changed */
     virtual void onChange();
 
-    vos::ORef<SvxForbiddenCharactersTable> mxForbiddenChars;
+    rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenChars;
 
 public:
-    SvxUnoForbiddenCharsTable(vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars);
+    SvxUnoForbiddenCharsTable(rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars);
     ~SvxUnoForbiddenCharsTable();
 
     // XForbiddenCharacters
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index c5e14f15d64d..7437deb19d93 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -64,7 +64,7 @@ class SvxForbiddenCharactersTable;
 class SvxNumberFormat;
 class FontList;
 
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
 
@@ -369,8 +369,8 @@ public:
     void            SetHyphenator( ::com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XHyphenator >& xHyph );
 
-    void            SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
-    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable() const;
+    void            SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
 
     void            SetDefaultLanguage( LanguageType eLang );
     LanguageType    GetDefaultLanguage() const;
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 3e18ffbbbbe7..7deb0f77a6fe 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -30,7 +30,7 @@
 
 #include <tools/table.hxx>
 
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include "editeng/editengdllapi.h"
@@ -50,7 +50,7 @@ struct ForbiddenCharactersInfo
 
 DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
 
-class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public salhelper::SimpleReferenceObject
 {
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 10a1f36db388..4526d148f37d 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -80,7 +80,7 @@ class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 #include <com/sun/star/uno/Reference.h>
 
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <editeng/svxfont.hxx>
 #include <editeng/eedata.hxx>
 #include <editeng/paragraphdata.hxx>
@@ -979,8 +979,8 @@ public:
     void            SetHyphenator( ::com::sun::star::uno::Reference<
                         ::com::sun::star::linguistic2::XHyphenator >& xHyph );
 
-    void            SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
-    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable() const;
+    void            SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
 
     // Depricated
     void            SetDefaultLanguage( LanguageType eLang );
diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 7ca3a2be0fce..e2d7d54b20b4 100644
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -30,7 +30,6 @@
 
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
-#include <vos/refernce.hxx>
 #include <com/sun/star/util/Language.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
@@ -74,8 +73,6 @@ class EDITENG_DLLPUBLIC LinguMgr
 {
     friend class LinguMgrExitLstnr;
 
-    //static ::VOS::ORefCount aRefCount;
-
     static ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr;
     static ::com::sun::star::uno::Reference<
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d82ecc6cb6b5..d33419d80984 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -671,6 +671,7 @@
 #include "rtl/logfile.hxx"
 #include "rtl/math.hxx"
 #include "rtl/memory.h"
+#include "rlt/ref.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textenc.h"
 #include "rtl/ustrbuf.hxx"
@@ -679,6 +680,7 @@
 #include "sal/config.h"
 #include "sal/main.h"
 #include "sal/types.h"
+#include <salhelper/simplereferenceobject.hxx>
 #include "svl/srchdefs.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
@@ -876,8 +878,6 @@
 #include "vcl/wall.hxx"
 #include "vcl/wintypes.hxx"
 #include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
 #include "vos/thread.hxx"
 #include "vos/xception.hxx"
 #include "xmloff/DashStyle.hxx"
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index e036df6ef4c4..734b8d75ee8e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2147,13 +2147,13 @@ void EditEngine::SetHyphenator( Reference< XHyphenator > & xHyph )
     pImpEditEngine->SetHyphenator( xHyph );
 }
 
-void EditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetForbiddenCharsTable( xForbiddenChars );
 }
 
-vos::ORef<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetForbiddenCharsTable( FALSE );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 7851549221db..c4f518982991 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -185,9 +185,9 @@ SfxPoolItem** GlobalEditData::GetDefItems()
     return ppDefItems;
 }
 
-vos::ORef<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTable()
+rtl::Reference<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTable()
 {
-    if ( !xForbiddenCharsTable.isValid() )
+    if ( !xForbiddenCharsTable.is() )
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
         xForbiddenCharsTable = new SvxForbiddenCharactersTable( xMSF );
diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index 49bfa058038e..33855cba834f 100644
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <editeng/forbiddencharacterstable.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 class SfxPoolItem;
 
@@ -42,7 +42,7 @@ private:
     SfxPoolItem**   ppDefItems;
     OutputDevice*   pStdRefDevice;
 
-    vos::ORef<SvxForbiddenCharactersTable>  xForbiddenCharsTable;
+    rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
 
 public:
                     GlobalEditData();
@@ -51,8 +51,8 @@ public:
     SfxPoolItem**   GetDefItems();
     OutputDevice*   GetStdRefDevice();
 
-    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable();
-    void            SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; }
+    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable();
+    void            SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; }
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetLanguageGuesser();
 };
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index e185bcc9e3e5..163f1b7e338a 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <i18npool/lang.h>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 DBG_NAMEEX( EditView )
 DBG_NAMEEX( EditEngine )
@@ -519,7 +519,7 @@ private:
     Link                maBeginDropHdl;
     Link                maEndDropHdl;
 
-    vos::ORef<SvxForbiddenCharactersTable>  xForbiddenCharsTable;
+    rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
 
 
     // ================================================================
@@ -1021,8 +1021,8 @@ public:
     void                SetAddExtLeading( BOOL b );
     BOOL                IsAddExtLeading() const { return bAddExtLeading; }
 
-    vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
-    void                SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
+    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
+    void                SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
 
     BOOL                mbLastTryMerge;
 
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 9877f591d85b..57d087766371 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4548,15 +4548,15 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
     }
 }
 
-vos::ORef<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
+rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
 {
-    vos::ORef<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
-    if ( !xF.isValid() && bGetInternal )
+    rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
+    if ( !xF.is() && bGetInternal )
         xF = EE_DLL()->GetGlobalData()->GetForbiddenCharsTable();
     return xF;
 }
 
-void ImpEditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void ImpEditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
     EE_DLL()->GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars );
 }
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index e5fd4c47a36e..0a786cff44b7 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -534,13 +534,13 @@ Reference< XSpellChecker1 > Outliner::GetSpeller()
     return pEditEngine->GetSpeller();
 }
 
-void Outliner::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void Outliner::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetForbiddenCharsTable( xForbiddenChars );
 }
 
-vos::ORef<SvxForbiddenCharactersTable> Outliner::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> Outliner::GetForbiddenCharsTable() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetForbiddenCharsTable();
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index a44d4d59e550..a1019d61b46b 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -40,10 +40,9 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::i18n;
 using namespace ::rtl;
-using namespace ::vos;
 using namespace ::cppu;
 
-SvxUnoForbiddenCharsTable::SvxUnoForbiddenCharsTable(ORef<SvxForbiddenCharactersTable> xForbiddenChars) :
+SvxUnoForbiddenCharsTable::SvxUnoForbiddenCharsTable(::rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars) :
     mxForbiddenChars( xForbiddenChars )
 {
 }
@@ -61,7 +60,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
 {
     SolarMutexGuard aGuard;
 
-    if(!mxForbiddenChars.isValid())
+    if(!mxForbiddenChars.is())
         throw RuntimeException();
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -77,7 +76,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
 {
     SolarMutexGuard aGuard;
 
-    if(!mxForbiddenChars.isValid())
+    if(!mxForbiddenChars.is())
         return sal_False;
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -91,7 +90,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co
 {
     SolarMutexGuard aGuard;
 
-    if(!mxForbiddenChars.isValid())
+    if(!mxForbiddenChars.is())
         throw RuntimeException();
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -105,7 +104,7 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
 {
     SolarMutexGuard aGuard;
 
-    if(!mxForbiddenChars.isValid())
+    if(!mxForbiddenChars.is())
         throw RuntimeException();
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -120,7 +119,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
 {
     SolarMutexGuard aGuard;
 
-    const sal_Int32 nCount = mxForbiddenChars.isValid() ? mxForbiddenChars->Count() : 0;
+    const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->Count() : 0;
 
     Sequence< Locale > aLocales( nCount );
     if( nCount )
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
index a11bde28aed3..b1e5675240ca 100644
--- a/editeng/util/makefile.mk
+++ b/editeng/util/makefile.mk
@@ -77,6 +77,7 @@ SHL1STDLIBS= \
              $(CPPULIB) \
              $(VOSLIB) \
              $(SALLIB) \
+             $(SALHELPERLIB) \
              $(ICUUCLIB)
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def