diff options
author | Noel Power <noel.power@suse.com> | 2012-12-13 17:04:58 +0000 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2012-12-13 17:04:58 +0000 |
commit | 45b448b202b87ef66812d25c69e308f405ac221e (patch) | |
tree | 3b82f46ce35fca56195c049314803313ed68adf7 /sc/source | |
parent | 70b960b966d36b1cb12bfb0c71d093fa0c5a3288 (diff) |
Revert "fix fdo#58237 import hyperlinks for shapes in xlsx documents"
This reverts commit 2551fec6d2a73d10cfa2aec85ae7d00e237e0294.
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/inc/worksheetbuffer.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 22 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheetbuffer.cxx | 19 |
3 files changed, 2 insertions, 43 deletions
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index d58a49017c46..bceca5551b54 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -81,10 +81,6 @@ public: sal_Int16 getCalcSheetIndex( const ::rtl::OUString& rWorksheetName ) const; /** Returns the finalized name of the sheet with the passed worksheet name. */ ::rtl::OUString getCalcSheetName( const ::rtl::OUString& rWorksheetName ) const; - /** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' ) - if sSheetNameRef doesn't start with '#' it is ignored and not modified - */ - void convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const; private: struct SheetInfo : public SheetInfoModel diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index a301326ab906..bb8fe087951b 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -26,9 +26,6 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <rtl/strbuf.hxx> -#include <svx/svdobj.hxx> -#include "drwlayer.hxx" -#include "userdat.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/helper/attributelist.hxx" @@ -39,10 +36,11 @@ #include "stylesbuffer.hxx" #include "themebuffer.hxx" #include "unitconverter.hxx" -#include "worksheetbuffer.hxx" + namespace oox { namespace xls { +using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -55,10 +53,6 @@ using namespace ::oox::core; using namespace ::oox::drawingml; using namespace ::oox::ole; -using ::com::sun::star::awt::Size; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::awt::XControlModel; using ::rtl::OStringBuffer; using ::rtl::OUString; using ::rtl::OUStringToOString; @@ -103,24 +97,12 @@ Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, con void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& rxShapes ) { - rtl::OUString sURL; - getShapeProperties()[ PROP_URL ] >>= sURL; - getWorksheets().convertSheetNameRef( sURL ); if( !maMacroName.isEmpty() && mxShape.is() ) { VbaMacroAttacherRef xAttacher( new ShapeMacroAttacher( maMacroName, mxShape ) ); getBaseFilter().getVbaProject().registerMacroAttacher( xAttacher ); } ::oox::drawingml::Shape::finalizeXShape( rFilter, rxShapes ); - if ( !sURL.isEmpty() ) - { - SdrObject* pObj = SdrObject::getSdrObjectFromXShape( mxShape ); - if ( pObj ) - { - if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True ) ) - pInfo->SetHlink( sURL ); - } - } } // ============================================================================ diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 7483900c088e..7703ea43e03c 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -110,25 +110,6 @@ OUString WorksheetBuffer::getCalcSheetName( sal_Int32 nWorksheet ) const return pSheetInfo ? pSheetInfo->maCalcName : OUString(); } -void WorksheetBuffer::convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const -{ - // convert '#SheetName!A1' to '#SheetName.A1' - if( !sSheetNameRef.isEmpty() && (sSheetNameRef[ 0 ] == '#') ) - { - sal_Int32 nSepPos = sSheetNameRef.lastIndexOf( '!' ); - if( nSepPos > 0 ) - { - // replace the exclamation mark with a period - sSheetNameRef = sSheetNameRef.replaceAt( nSepPos, 1, OUString( sal_Unicode( '.' ) ) ); - // #i66592# convert sheet names that have been renamed on import - OUString aSheetName = sSheetNameRef.copy( 1, nSepPos - 1 ); - OUString aCalcName = getCalcSheetName( aSheetName ); - if( !aCalcName.isEmpty() ) - sSheetNameRef = sSheetNameRef.replaceAt( 1, nSepPos - 1, aCalcName ); - } - } -} - sal_Int16 WorksheetBuffer::getCalcSheetIndex( const OUString& rWorksheetName ) const { const SheetInfo* pSheetInfo = maSheetInfosByName.get( rWorksheetName ).get(); |