diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 9 | ||||
| -rw-r--r-- | sc/source/filter/excel/namebuff.cxx | 12 | ||||
| -rw-r--r-- | sc/source/filter/inc/namebuff.hxx | 9 | ||||
| -rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4 |
5 files changed, 15 insertions, 20 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 510df2141119..ad286548ed99 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -582,20 +582,19 @@ void ImportExcel::Externname25() nOpt = aIn.ReaduInt16(); nRes = aIn.ReaduInt32(); - OUString aName( aIn.ReadByteString( false ) ); + aIn.ReadByteString( false ); // name if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) ) {// external name - aName = ScfTools::ConvertToScDefinedName( aName ); - pExcRoot->pExtNameBuff->AddName( aName, mnLastRefIdx ); + pExcRoot->pExtNameBuff->AddName( mnLastRefIdx ); } else if( nOpt & 0x0010 ) {// ole link - pExcRoot->pExtNameBuff->AddOLE( aName, mnLastRefIdx, nRes ); // nRes is storage ID + pExcRoot->pExtNameBuff->AddOLE( mnLastRefIdx, nRes ); // nRes is storage ID } else {// dde link - pExcRoot->pExtNameBuff->AddDDE( aName, mnLastRefIdx ); + pExcRoot->pExtNameBuff->AddDDE( mnLastRefIdx ); } } diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 3b12910187a3..8947b3bcd593 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -190,22 +190,22 @@ ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) : { } -void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx ) +void ExtNameBuff::AddDDE( sal_Int16 nRefIdx ) { - ExtName aNew( rName, 0x0001 ); + ExtName aNew( 0x0001 ); maExtNames[ nRefIdx ].push_back( aNew ); } -void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ) +void ExtNameBuff::AddOLE( sal_Int16 nRefIdx, sal_uInt32 nStorageId ) { - ExtName aNew( rName, 0x0002 ); + ExtName aNew( 0x0002 ); aNew.nStorageId = nStorageId; maExtNames[ nRefIdx ].push_back( aNew ); } -void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx ) +void ExtNameBuff::AddName( sal_Int16 nRefIdx ) { - ExtName aNew( GetScAddInName( rName ), 0x0004 ); + ExtName aNew( 0x0004 ); maExtNames[ nRefIdx ].push_back( aNew ); } diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index f6d700106976..b60a2c46da91 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -221,11 +221,10 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) struct ExtName { - OUString aName; sal_uInt32 nStorageId; sal_uInt16 nFlags; - inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} + inline ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {} bool IsDDE() const; bool IsOLE() const; @@ -236,9 +235,9 @@ class ExtNameBuff : protected XclImpRoot public: explicit ExtNameBuff( const XclImpRoot& rRoot ); - void AddDDE( const OUString& rName, sal_Int16 nRefIdx ); - void AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ); - void AddName( const OUString& rName, sal_Int16 nRefIdx ); + void AddDDE( sal_Int16 nRefIdx ); + void AddOLE( sal_Int16 nRefIdx, sal_uInt32 nStorageId ); + void AddName( sal_Int16 nRefIdx ); const ExtName* GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const; diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0bdb74610940..43c8848fda1d 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -395,7 +395,6 @@ private: SheetViewSettings maSheetViewSett; /// View settings for this sheet. VmlDrawingPtr mxVmlDrawing; /// Collection of all VML shapes. ExtLst maExtLst; /// List of extended elements - BiffSheetDrawingPtr mxBiffDrawing; /// Collection of all BIFF/DFF shapes. OUString maDrawingPath; /// Path to DrawingML fragment. OUString maVmlDrawingPath; /// Path to legacy VML drawing fragment. awt::Size maDrawPageSize; /// Current size of the drawing page in 1/100 mm. diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index d5ee45bd533a..6fdad87f41b0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -800,8 +800,6 @@ namespace { struct ScVisAreaChanged { - const ScIAccessibleViewForwarder* mpViewForwarder; - explicit ScVisAreaChanged(const ScIAccessibleViewForwarder* pViewForwarder) : mpViewForwarder(pViewForwarder) {} void operator() (const ScShapeChild& rAccShapeData) const { if (rAccShapeData.mpAccShape.is()) @@ -818,7 +816,7 @@ void ScShapeChildren::VisAreaChanged() const ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin(); while (aItr != aEndItr) { - ScVisAreaChanged aVisAreaChanged(&(aItr->maViewForwarder)); + ScVisAreaChanged aVisAreaChanged; std::for_each(aItr->maBackShapes.begin(), aItr->maBackShapes.end(), aVisAreaChanged); std::for_each(aItr->maControls.begin(), aItr->maControls.end(), aVisAreaChanged); std::for_each(aItr->maForeShapes.begin(), aItr->maForeShapes.end(), aVisAreaChanged); |