diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-15 12:20:01 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:57:35 -0500 |
commit | 56a52533d446c89592f838f3b50c97d6b7ff3961 (patch) | |
tree | 05765f6f7a017f45a9a91275203e9c54b4a3cc37 | |
parent | e8c6a8e214441ac19a4e39511c757c8085c89366 (diff) |
merge vosremoval-reference.diff
-rw-r--r-- | sc/inc/document.hxx | 10 | ||||
-rw-r--r-- | sc/source/core/data/documen2.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/documen3.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen9.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/inc/poolhelp.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/filt_pch.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLDDELinksContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTrackedChangesContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/sheetdata.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldpimp.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlsceni.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/forbiuno.cxx | 6 | ||||
-rw-r--r-- | sc/util/makefile.mk | 1 |
21 files changed, 42 insertions, 21 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index ed7834326..9ca0d14e6 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -32,7 +32,7 @@ #include <vcl/prntypes.hxx> #include <vcl/timer.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include "scdllapi.h" #include "table.hxx" // FastGetRowHeight (inline) #include "rangelst.hxx" @@ -259,7 +259,7 @@ friend class ScDocRowHeightUpdater; private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; - vos::ORef<ScPoolHelper> xPoolHelper; + rtl::Reference<ScPoolHelper> xPoolHelper; SfxUndoManager* mpUndoManager; ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper @@ -302,7 +302,7 @@ private: ScChangeViewSettings* pChangeViewSettings; ScScriptTypeData* pScriptTypeData; ScRefreshTimerControl* pRefreshTimerControl; - vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharacters; + rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharacters; ScFieldEditEngine* pCacheFieldEditEngine; @@ -1587,8 +1587,8 @@ public: ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); - vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharacters(); - void SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> xNew ); + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharacters(); + void SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ); BYTE GetAsianCompression() const; // CharacterCompressionType values BOOL IsValidAsianCompression() const; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 73b1cabe5..74383622f 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -455,9 +455,9 @@ ScDocument::~ScDocument() // delete the EditEngine before destroying the xPoolHelper delete pCacheFieldEditEngine; - if ( xPoolHelper.isValid() && !bIsClip ) + if ( xPoolHelper.is() && !bIsClip ) xPoolHelper->SourceDocumentGone(); - xPoolHelper.unbind(); + xPoolHelper.clear(); DeleteColorTable(); delete pScriptTypeData; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index b1c41e95c..46a072095 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1904,7 +1904,7 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy eLanguage = eLatin; eCjkLanguage = eCjk; eCtlLanguage = eCtl; - if ( xPoolHelper.isValid() ) + if ( xPoolHelper.is() ) { ScDocumentPool* pPool = xPoolHelper->GetDocPool(); pPool->SetPoolDefaultItem( SvxLanguageItem( eLanguage, ATTR_FONT_LANGUAGE ) ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 2a1eae35a..af7e76204 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -713,12 +713,12 @@ void ScDocument::SetXMLFromWrapper( BOOL bVal ) bXMLFromWrapper = bVal; } -vos::ORef<SvxForbiddenCharactersTable> ScDocument::GetForbiddenCharacters() +rtl::Reference<SvxForbiddenCharactersTable> ScDocument::GetForbiddenCharacters() { return xForbiddenCharacters; } -void ScDocument::SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> xNew ) +void ScDocument::SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ) { xForbiddenCharacters = xNew; if ( pEditEngine ) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index efde32471..2a66a64e3 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1951,7 +1951,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam) BOOL ScDocument::IsClipboardSource() const { ScDocument* pClipDoc = SC_MOD()->GetClipDoc(); - return pClipDoc && pClipDoc->xPoolHelper.isValid() && + return pClipDoc && pClipDoc->xPoolHelper.is() && xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool(); } diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index bfc024f9f..4f8bed6c7 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -29,7 +29,7 @@ #define SC_POOLHELP_HXX #include <rtl/ref.hxx> -#include <vos/refernce.hxx> +#include <salhelper/simplereferenceobject.hxx> #include <tools/link.hxx> #include "docoptio.hxx" @@ -40,7 +40,7 @@ class SvNumberFormatter; class SfxItemPool; -class ScPoolHelper : public vos::OReference +class ScPoolHelper : public salhelper::SimpleReferenceObject { private: ScDocOptions aOpt; diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 484cdb8f0..1fc2fdb9a 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -222,7 +222,7 @@ #include <vcl/svapp.hxx> #include <osl/thread.hxx> #include <vos/runnable.hxx> -#include <vos/refernce.hxx> +#include <salhelper/simplereferenceobject.hxx> #include <vcl/apptypes.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 12ae9ce4b..269861a5c 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -46,6 +46,8 @@ using namespace com::sun::star; using namespace xmloff::token; using ::rtl::OUString; +using rtl::OUString; + //------------------------------------------------------------------ ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 22f4a8cbb..80abe62b9 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -45,6 +45,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; +using rtl::OUString; TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index f8c181486..320681e8e 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -51,6 +51,8 @@ using namespace ::com::sun::star; using namespace xmloff::token; using ::rtl::OUString; +using rtl::OUString; + XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ), diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 07f498094..40ae21116 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -48,6 +48,8 @@ using rtl::OUString; using namespace com::sun::star; using namespace xmloff::token; +using rtl::OUString; + //----------------------------------------------------------------------------- class ScXMLChangeInfoContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 0e6162842..e81ddae8d 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -209,7 +209,7 @@ void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespace // ignore the initial namespaces if ( maInitialPrefixes.find( aIter->first ) == maInitialPrefixes.end() ) { - const NameSpaceEntry& rEntry = aIter->second.getBody(); + const NameSpaceEntry& rEntry = *(aIter->second); maLoadedNamespaces.push_back( ScLoadedNamespaceEntry( rEntry.sPrefix, rEntry.sName, rEntry.nKey ) ); } ++aIter; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 31acb54cc..35f78f7a6 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -97,6 +97,8 @@ using namespace com::sun::star; using namespace xmloff::token; +using rtl::OUString; + //------------------------------------------------------------------ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 5d46d998b..d515637de 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -66,6 +66,8 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::rtl::OUString; +using rtl::OUString; + //------------------------------------------------------------------ ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 612fd8caf..0c98142a8 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -108,6 +108,8 @@ using namespace ::xmloff::token; using namespace ::formula; using ::rtl::OUString; +using rtl::OUString; + OUString SAL_CALL ScXMLImport_getImplementationName() throw() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisImporter" ) ); diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 33d9d2979..5e2d19b47 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -50,6 +50,8 @@ using namespace com::sun::star; using namespace xmloff::token; using ::rtl::OUString; +using rtl::OUString; + //------------------------------------------------------------------ ScXMLTableScenarioContext::ScXMLTableScenarioContext( diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index e8e171ddb..4e1bd93b4 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -78,6 +78,9 @@ using namespace xmloff::token; //using namespace ::com::sun::star::text; using namespace ::formula; +using rtl::OUString; +using com::sun::star::uno::Reference; + ScXMLCellImportPropertyMapper::ScXMLCellImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImportP) : diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 38ec980c6..880a14770 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -88,6 +88,8 @@ using namespace com::sun::star; using ::rtl::OUString; +using rtl::OUString; + // ----------------------------------------------------------------------- ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 764664fe5..8686cc787 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -179,19 +179,19 @@ void ScDocShell::InitItems() PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) ); } - if ( !aDocument.GetForbiddenCharacters().isValid() || + if ( !aDocument.GetForbiddenCharacters().is() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) { // get settings from SvxAsianConfig SvxAsianConfig aAsian( sal_False ); - if ( !aDocument.GetForbiddenCharacters().isValid() ) + if ( !aDocument.GetForbiddenCharacters().is() ) { // set forbidden characters if necessary uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); if (aLocales.getLength()) { - vos::ORef<SvxForbiddenCharactersTable> xForbiddenTable = + rtl::Reference<SvxForbiddenCharactersTable> xForbiddenTable = new SvxForbiddenCharactersTable( aDocument.GetServiceManager() ); const lang::Locale* pLocales = aLocales.getConstArray(); diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 50335b105..c6a91c28d 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -40,14 +40,14 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -vos::ORef<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) +rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) { - vos::ORef<SvxForbiddenCharactersTable> xRet; + rtl::Reference<SvxForbiddenCharactersTable> xRet; if ( pDocSh ) { ScDocument* pDoc = pDocSh->GetDocument(); xRet = pDoc->GetForbiddenCharacters(); - if ( !xRet.isValid() ) + if ( !xRet.is() ) { // create an empty SvxForbiddenCharactersTable for SvxUnoForbiddenCharsTable, // so changes can be stored. diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 71c05abaa..c6c2abc0e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -88,6 +88,7 @@ SHL1STDLIBS= \ $(TKLIB) \ $(VOSLIB) \ $(SALLIB) \ + $(SALHELPERLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(UNOTOOLSLIB) \ |