mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:oncevar: empty strings: sd

Browse Source 
Change-Id: I94330c65d021c96e79185c8a2d59f1be702c6b61
This commit is contained in:
Stephan Bergmann
2017-07-13 11:45:32 +02:00
parent 833d376b6d
commit 552bbc2ec1
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sd/source/core/drawdoc4.cxx
View File

@@ -533,7 +533,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
{ {
SdStyleSheetPool* pSSPool = static_cast< SdStyleSheetPool* >(GetStyleSheetPool()); SdStyleSheetPool* pSSPool = static_cast< SdStyleSheetPool* >(GetStyleSheetPool());
SfxStyleSheetBase* pSheet = nullptr; SfxStyleSheetBase* pSheet = nullptr;
OUString aHelpFile;
Reference< XNameContainer > xTableFamily( pSSPool->getByName( "table" ), UNO_QUERY ); Reference< XNameContainer > xTableFamily( pSSPool->getByName( "table" ), UNO_QUERY );
@@ -542,7 +541,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
OUString aDefaultCellStyleName( "default" ); OUString aDefaultCellStyleName( "default" );
pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, SFXSTYLEBIT_AUTO)); pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, SFXSTYLEBIT_AUTO));
pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT ); pSheet->SetHelpId( OUString(), HID_SD_CELL_STYLE_DEFAULT );
SfxItemSet& rISet = pSheet->GetItemSet(); SfxItemSet& rISet = pSheet->GetItemSet();
Color aNullCol(RGB_Color(COL_BLACK)); Color aNullCol(RGB_Color(COL_BLACK));

18
sd/source/ui/animations/CustomAnimationDialog.cxx
View File

@@ -288,8 +288,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent,
if( bMustDelete ) if( bMustDelete )
delete pFontList; delete pFontList;
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
IMPL_LINK_NOARG(FontPropertyBox, ControlSelectHdl, ComboBox&, void) IMPL_LINK_NOARG(FontPropertyBox, ControlSelectHdl, ComboBox&, void)
@@ -443,8 +442,7 @@ CharHeightPropertyBox::CharHeightPropertyBox(sal_Int32 nControlType, vcl::Window
mpControl->SetModifyHdl( LINK( this, CharHeightPropertyBox, EditModifyHdl ) ); mpControl->SetModifyHdl( LINK( this, CharHeightPropertyBox, EditModifyHdl ) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX ); mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX );
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
CharHeightPropertyBox::~CharHeightPropertyBox() CharHeightPropertyBox::~CharHeightPropertyBox()
@@ -532,8 +530,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W
Link<Edit&,void> aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) ); Link<Edit&,void> aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink ); mpControl->SetModifyHdl( aLink );
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
TransparencyPropertyBox::~TransparencyPropertyBox() TransparencyPropertyBox::~TransparencyPropertyBox()
@@ -628,8 +625,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p
Link<Edit&,void> aLink( LINK( this, RotationPropertyBox, implModifyHdl ) ); Link<Edit&,void> aLink( LINK( this, RotationPropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink ); mpControl->SetModifyHdl( aLink );
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
RotationPropertyBox::~RotationPropertyBox() RotationPropertyBox::~RotationPropertyBox()
@@ -748,8 +744,7 @@ ScalePropertyBox::ScalePropertyBox(sal_Int32 nControlType, vcl::Window* pParent,
Link<Edit&,void> aLink( LINK( this, ScalePropertyBox, implModifyHdl ) ); Link<Edit&,void> aLink( LINK( this, ScalePropertyBox, implModifyHdl ) );
mpControl->SetModifyHdl( aLink ); mpControl->SetModifyHdl( aLink );
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
ScalePropertyBox::~ScalePropertyBox() ScalePropertyBox::~ScalePropertyBox()
@@ -907,8 +902,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl )); mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl ));
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX ); mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX );
OUString aPresetId; setValue( rValue, OUString() );
setValue( rValue, aPresetId );
} }
FontStylePropertyBox::~FontStylePropertyBox() FontStylePropertyBox::~FontStylePropertyBox()

3
sd/source/ui/table/tablefunction.cxx
View File

@@ -277,8 +277,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel )
::tools::Rectangle aRect (aPos, aSize); ::tools::Rectangle aRect (aPos, aSize);
sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 );
pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true ); pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true );
OUString sTableStyle; apply_table_style( pObj, pModel, OUString() );
apply_table_style( pObj, pModel, sTableStyle );
pPage->NbcInsertObject( pObj ); pPage->NbcInsertObject( pObj );

6
sd/source/ui/unoidl/unomodel.cxx
View File

@@ -495,8 +495,6 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
SdPage* pPreviousNotesPage = static_cast<SdPage*>( mpDoc->GetPage( nStandardPageNum - 1 ) ); SdPage* pPreviousNotesPage = static_cast<SdPage*>( mpDoc->GetPage( nStandardPageNum - 1 ) );
sal_uInt16 nNotesPageNum = nStandardPageNum + 1; sal_uInt16 nNotesPageNum = nStandardPageNum + 1;
OUString aStandardPageName;
OUString aNotesPageName;
/************************************************************** /**************************************************************
* standard page * standard page
@@ -512,7 +510,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
pPreviousStandardPage->GetRgtBorder(), pPreviousStandardPage->GetRgtBorder(),
pPreviousStandardPage->GetLwrBorder() ); pPreviousStandardPage->GetLwrBorder() );
pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() ); pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() );
pStandardPage->SetName(aStandardPageName); pStandardPage->SetName(OUString());
// insert page after current page // insert page after current page
mpDoc->InsertPage(pStandardPage, nStandardPageNum); mpDoc->InsertPage(pStandardPage, nStandardPageNum);
@@ -547,7 +545,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
pPreviousNotesPage->GetRgtBorder(), pPreviousNotesPage->GetRgtBorder(),
pPreviousNotesPage->GetLwrBorder() ); pPreviousNotesPage->GetLwrBorder() );
pNotesPage->SetOrientation( pPreviousNotesPage->GetOrientation() ); pNotesPage->SetOrientation( pPreviousNotesPage->GetOrientation() );
pNotesPage->SetName(aNotesPageName); pNotesPage->SetName(OUString());
pNotesPage->SetPageKind(PageKind::Notes); pNotesPage->SetPageKind(PageKind::Notes);
// insert page after current page // insert page after current page

3
sd/source/ui/view/sdview2.cxx
View File

@@ -698,8 +698,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
// special insert? // special insert?
if( !nRet && mpViewSh ) if( !nRet && mpViewSh )
{ {
OUString aTmpString1, aTmpString2; INetBookmark aINetBookmark( (OUString()), (OUString()) );
INetBookmark aINetBookmark( aTmpString1, aTmpString2 );
// insert bookmark // insert bookmark
if( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && if( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) &&