diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/filter/xml/XMLTableSourceContext.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/filter/xml/XMLTableSourceContext.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLTableSourceContext.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index d3607a2ab279..303b4eb684c2 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -49,7 +49,7 @@ using namespace xmloff::token; //------------------------------------------------------------------ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : @@ -101,7 +101,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() { } -SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) @@ -119,7 +119,7 @@ void ScXMLTableSourceContext::EndElement() { ScXMLImport::MutexGuard aGuard(GetScImport()); if (pDoc->RenameTab( static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()), - GetScImport().GetTables().GetCurrentSheetName(), sal_False, sal_True)) + GetScImport().GetTables().GetCurrentSheetName(), false, sal_True)) { String aFileString(sLink); String aFilterString(sFilterName); @@ -128,9 +128,9 @@ void ScXMLTableSourceContext::EndElement() aFileString = ScGlobal::GetAbsDocName( aFileString, pDoc->GetDocumentShell() ); if ( !aFilterString.Len() ) - ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, FALSE, FALSE ); + ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, false, false ); - BYTE nLinkMode = SC_LINK_NONE; + sal_uInt8 nLinkMode = SC_LINK_NONE; if ( nMode == sheet::SheetLinkMode_NORMAL ) nLinkMode = SC_LINK_NORMAL; else if ( nMode == sheet::SheetLinkMode_VALUE ) |