From d2c8e2e76f1c363dd7a07bd7c47d78d3e50ae5c1 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 15 Oct 2010 12:20:01 -0500 Subject: merge vosremoval-reference.diff --- sc/inc/document.hxx | 10 +++++----- sc/source/core/data/documen2.cxx | 4 ++-- sc/source/core/data/documen3.cxx | 2 +- sc/source/core/data/documen9.cxx | 4 ++-- sc/source/core/data/document.cxx | 2 +- sc/source/core/inc/poolhelp.hxx | 4 ++-- sc/source/filter/inc/filt_pch.hxx | 2 +- sc/source/filter/xml/XMLDDELinksContext.cxx | 2 ++ sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 1 + sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 ++ sc/source/filter/xml/XMLTrackedChangesContext.cxx | 2 ++ sc/source/filter/xml/sheetdata.cxx | 2 +- sc/source/filter/xml/xmlcelli.cxx | 2 ++ sc/source/filter/xml/xmldpimp.cxx | 2 ++ sc/source/filter/xml/xmlimprt.cxx | 2 ++ sc/source/filter/xml/xmlsceni.cxx | 2 ++ sc/source/filter/xml/xmlstyli.cxx | 3 +++ sc/source/filter/xml/xmlwrap.cxx | 2 ++ sc/source/ui/docshell/docsh2.cxx | 6 +++--- sc/source/ui/unoobj/forbiuno.cxx | 6 +++--- 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 1c2e20e55d32..de6b87d0a12e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #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 xPoolHelper; + rtl::Reference xPoolHelper; SfxUndoManager* mpUndoManager; ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper @@ -302,7 +302,7 @@ private: ScChangeViewSettings* pChangeViewSettings; ScScriptTypeData* pScriptTypeData; ScRefreshTimerControl* pRefreshTimerControl; - vos::ORef xForbiddenCharacters; + rtl::Reference xForbiddenCharacters; ScFieldEditEngine* pCacheFieldEditEngine; @@ -1587,8 +1587,8 @@ public: ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); - vos::ORef GetForbiddenCharacters(); - void SetForbiddenCharacters( const vos::ORef xNew ); + rtl::Reference GetForbiddenCharacters(); + void SetForbiddenCharacters( const rtl::Reference 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 0f2c95446683..adb9cf49ed0a 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 9cf0be4b3feb..89e2274bc660 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 0e1d4be1e3d6..039103e189f0 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 ScDocument::GetForbiddenCharacters() +rtl::Reference ScDocument::GetForbiddenCharacters() { return xForbiddenCharacters; } -void ScDocument::SetForbiddenCharacters( const vos::ORef xNew ) +void ScDocument::SetForbiddenCharacters( const rtl::Reference xNew ) { xForbiddenCharacters = xNew; if ( pEditEngine ) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 89130196e662..e9363978b1cb 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 f98963513c59..1a9e2c2e4c4c 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -29,7 +29,7 @@ #define SC_POOLHELP_HXX #include -#include +#include #include #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 556f6ca365da..85aaf46e698b 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -222,7 +222,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index c7e3923337da..792c19b5e30a 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 defb99bcde38..ec79d21aba40 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 ff50e7264fea..9ddc5ede06a5 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 ba9e508d50b3..86a5f4a88a81 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 a5bf3515fe84..9f35e99f5326 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 d0cbf9610383..cc3588a3c249 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 1f2e2db5f254..3f1af06fd309 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 b204e05b8e3c..c1a984dbf080 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 047e275587e8..3235941af5b2 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 942151f50b78..ffecefb2d653 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 0cb99a066b1d..a72494d068a6 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 d8a7311a6c94..ab567f7d23df 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 aLocales = aAsian.GetStartEndCharLocales(); if (aLocales.getLength()) { - vos::ORef xForbiddenTable = + rtl::Reference 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 e847c4ee25a3..1a03a0d57acb 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 lcl_GetForbidden( ScDocShell* pDocSh ) +rtl::Reference lcl_GetForbidden( ScDocShell* pDocSh ) { - vos::ORef xRet; + rtl::Reference 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 71c05abaaf34..c6c2abc0ee44 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -88,6 +88,7 @@ SHL1STDLIBS= \ $(TKLIB) \ $(VOSLIB) \ $(SALLIB) \ + $(SALHELPERLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(UNOTOOLSLIB) \ -- cgit