diff options
Diffstat (limited to 'sc/source/filter/excel/excimp8.cxx')
| -rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 50a7870822e3..c4937f840c3a 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -1,31 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "excimp8.hxx" @@ -325,29 +315,23 @@ void ImportExcel8::ReadBasic( void ) const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get(); if( pShell && xRootStrg.Is() ) try { - bool bLoadCode = rFilterOpt.IsLoadExcelBasicCode(); - bool bLoadExecutable = rFilterOpt.IsLoadExcelBasicExecutable(); - bool bLoadStrg = rFilterOpt.IsLoadExcelBasicStorage(); // #FIXME need to get rid of this, we can also do this from within oox // via the "ooo.vba.VBAGlobals" service - if( bLoadCode || bLoadStrg ) + if( ( rFilterOpt.IsLoadExcelBasicCode() || + rFilterOpt.IsLoadExcelBasicStorage() ) && + rFilterOpt.IsLoadExcelBasicExecutable() ) { - bool bAsComment = !bLoadExecutable; - - if ( !bAsComment ) + // see if we have the XCB stream + SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE ); + if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) { - // see if we have the XCB stream - SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE ); - if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) + ScCTBWrapper wrapper; + if ( wrapper.Read( *xXCB ) ) { - ScCTBWrapper wrapper; - if ( wrapper.Read( *xXCB ) ) - { #if OSL_DEBUG_LEVEL > 1 - wrapper.Print( stderr ); + wrapper.Print( stderr ); #endif - wrapper.ImportCustomToolBar( *pShell ); - } + wrapper.ImportCustomToolBar( *pShell ); } } } |