merge vosremoval-reference.diff

5 files changed, 11 insertions, 8 deletions

diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 1f6b883ede..1860480941 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -700,6 +700,7 @@
 #include "rtl/logfile.hxx"
 #include "rtl/math.hxx"
 #include "rtl/memory.h"
+#include "rtl/ref.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textenc.h"
 #include "rtl/ustrbuf.hxx"
@@ -708,6 +709,7 @@
 #include "sal/config.h"
 #include "sal/main.h"
 #include "sal/types.h"
+#include "salhelper/simplereferenceobject.hxx"
 #include "sfx2/bindings.hxx"
 #include "sfx2/ctrlitem.hxx"
 #include "sfx2/dispatch.hxx"
@@ -943,8 +945,6 @@
 #include "vcl/wall.hxx"
 #include "vcl/wintypes.hxx"
 #include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
 #include "vos/xception.hxx"
 #include "xmloff/DashStyle.hxx"
 #include "xmloff/GradientStyle.hxx"
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index f7633bf6ae..3a590d7507 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -51,7 +51,7 @@ class OutputDevice;
 #include <vcl/field.hxx>
 #include "svx/svxdllapi.h"
 
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 #if defined(UNX) || defined(WIN) || defined(WNT)
 #define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
@@ -693,8 +693,8 @@ public:
     BOOL isLocked() const { return (BOOL)mbModelLocked; }
     void setLock( BOOL bLock );
 
-    void			SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
-    vos::ORef<SvxForbiddenCharactersTable>	GetForbiddenCharsTable() const;
+    void			SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+    rtl::Reference<SvxForbiddenCharactersTable>	GetForbiddenCharsTable() const;
 
     void SetCharCompressType( UINT16 nType );
     UINT16 GetCharCompressType() const { return mnCharCompressType; }
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index aa099b85ca..2a6a05c342 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -74,6 +74,8 @@ using namespace	::com::sun::star::drawing;
 using namespace	::com::sun::star::lang;
 using namespace	::com::sun::star::accessibility;
 
+using rtl::OUString;
+
 //=====  internal  ============================================================
 
 /** initialize this component and set default values */
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9c47bedf61..07028eb4f6 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1972,12 +1972,12 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
 {
     if( mpForbiddenCharactersTable )
         mpForbiddenCharactersTable->release();
 
-    mpForbiddenCharactersTable = xForbiddenChars.getBodyPtr();
+    mpForbiddenCharactersTable = xForbiddenChars.get();
 
     if( mpForbiddenCharactersTable )
         mpForbiddenCharactersTable->acquire();
@@ -1986,7 +1986,7 @@ void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xF
     ImpSetOutlinerDefaults( pHitTestOutliner );
 }
 
-vos::ORef<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
 {
     return mpForbiddenCharactersTable;
 }
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 050decc8d4..06e3132f4e 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -154,6 +154,7 @@ SHL2STDLIBS= \
             $(CPPULIB) \
             $(VOSLIB) \
             $(SALLIB) \
+            $(SALHELPERLIB) \
             $(ICUUCLIB)
 
 .IF "$(GUI)"=="WNT"