summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/escherex.cxx8
-rw-r--r--filter/source/msfilter/eschesdo.cxx3
-rw-r--r--filter/source/msfilter/mstoolbar.cxx11
-rw-r--r--filter/source/msfilter/svdfppt.cxx35
4 files changed, 24 insertions, 33 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 8362b211f4aa..3de4007fdf38 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4991,7 +4991,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
{
/* The DGG record is still not written. ESCHER_Persist_Dgg seeks
to the place where the complete record has to be inserted. */
- InsertAtCurrentPos( mxGlobal->GetDggAtomSize(), false );
+ InsertAtCurrentPos( mxGlobal->GetDggAtomSize() );
mxGlobal->WriteDggAtom( *mpOutStrm );
if ( mxGlobal->HasGraphics() )
@@ -5002,7 +5002,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
sal_uInt32 nBSCSize = mxGlobal->GetBlibStoreContainerSize( pPicStreamMergeBSE );
if ( nBSCSize > 0 )
{
- InsertAtCurrentPos( nBSCSize, false );
+ InsertAtCurrentPos( nBSCSize );
mxGlobal->WriteBlibStoreContainer( *mpOutStrm, pPicStreamMergeBSE );
}
}
@@ -5016,7 +5016,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
}
}
-void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom )
+void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes )
{
sal_uInt32 nSize, nType, nSource, nBufSize, nToCopy, nCurPos = mpOutStrm->Tell();
@@ -5038,7 +5038,7 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom )
/* Expand the record, if the insertion position is inside, or if the
position is at the end of a container (expands always), or at the
end of an atom and bExpandEndOfAtom is set. */
- if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && (bContainer || bExpandEndOfAtom)) )
+ if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && bContainer) )
{
mpOutStrm->SeekRel( -4 );
mpOutStrm->WriteUInt32( nSize + nBytes );
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 1a3e62a54220..b7312eefb090 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -252,8 +252,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
aPropOpt.AddOpt( ESCHER_Prop_pihlShape, false, nSize, const_cast<sal_uInt8 *>(pBuf), nSize );
}
- if ( pInteraction->hasInteraction() )
- aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
+ aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
}
if ( rObj.GetType() == "drawing.Custom" )
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 9367e78a8624..af001fb7f9fc 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -120,7 +120,7 @@ OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID )
}
bool
-CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist )
+CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc )
{
bool bRes = true;
try
@@ -145,12 +145,9 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen
aPopupMenu[3].Value <<= sal_Int32( 0 );
xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) );
- if ( bPersist )
- {
- xCfgManager->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xPopup, uno::UNO_QUERY ) );
- uno::Reference< ui::XUIConfigurationPersistence > xPersistence( xCfgManager, uno::UNO_QUERY_THROW );
- xPersistence->store();
- }
+ xCfgManager->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xPopup, uno::UNO_QUERY ) );
+ uno::Reference< ui::XUIConfigurationPersistence > xPersistence( xCfgManager, uno::UNO_QUERY_THROW );
+ xPersistence->store();
}
}
catch( const uno::Exception& )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6199da64f760..9c27674850a0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1661,8 +1661,7 @@ SdrPowerPointImport::~SdrPowerPointImport()
}
bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc,
- css::uno::Reference< css::drawing::XShape > *pShapeRef,
- bool bFloatingCtrl )
+ css::uno::Reference< css::drawing::XShape > *pShapeRef )
{
bool bRes = false;
uno::Reference< form::XFormComponent > xFComp;
@@ -1671,7 +1670,7 @@ bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc,
if ( xFComp.is() )
{
css::awt::Size aSz; // not used in import
- bRes = InsertControl( xFComp, aSz,pShapeRef,bFloatingCtrl);
+ bRes = InsertControl( xFComp, aSz,pShapeRef, false/*bFloatingCtrl*/);
}
}
return bRes;
@@ -2977,10 +2976,9 @@ sal_uInt16 SdrPowerPointImport::GetMasterPageIndex( sal_uInt16 nPageNum, PptPage
return nIdx;
}
-SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, bool bForce )
+SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset )
{
SdrObject* pRet = nullptr;
- bool bCreateObj = bForce;
std::unique_ptr<SfxItemSet> pSet;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later
DffRecordHeader aPageHd;
@@ -3017,24 +3015,21 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
}
}
rStCtrl.Seek( nFPosMerk ); // restore FilePos
- if ( bCreateObj )
+ if ( !pSet )
{
- if ( !pSet )
- {
- pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
- pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
- }
- pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) );
- Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
- pRet = new SdrRectObj( aRect );
- pRet->SetModel( pSdrModel );
+ pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
+ pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
+ }
+ pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) );
+ Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
+ pRet = new SdrRectObj( aRect );
+ pRet->SetModel( pSdrModel );
- pRet->SetMergedItemSet(*pSet);
+ pRet->SetMergedItemSet(*pSet);
- pRet->SetMarkProtect( true );
- pRet->SetMoveProtect( true );
- pRet->SetResizeProtect( true );
- }
+ pRet->SetMarkProtect( true );
+ pRet->SetMoveProtect( true );
+ pRet->SetResizeProtect( true );
return pRet;
}
generated by cgit (git 2.34.1) at 2024-07-11 21:39:44 +0000