diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-13 11:45:32 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-13 11:45:32 +0200 |
commit | 552bbc2ec1b41f9ceb5367f1e94eb7e8bbffc76a (patch) | |
tree | ace6990543020a29ee4fed56e97353ac667c726d /sd | |
parent | 833d376b6df5f2f9e4a9cee8fe59aafac405d94f (diff) |
loplugin:oncevar: empty strings: sd
Change-Id: I94330c65d021c96e79185c8a2d59f1be702c6b61
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 18 | ||||
-rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 3 |
5 files changed, 11 insertions, 22 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 5bc477b0f535..3b870da22f9e 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -533,7 +533,6 @@ void SdDrawDocument::CreateDefaultCellStyles() { SdStyleSheetPool* pSSPool = static_cast< SdStyleSheetPool* >(GetStyleSheetPool()); SfxStyleSheetBase* pSheet = nullptr; - OUString aHelpFile; Reference< XNameContainer > xTableFamily( pSSPool->getByName( "table" ), UNO_QUERY ); @@ -542,7 +541,7 @@ void SdDrawDocument::CreateDefaultCellStyles() OUString aDefaultCellStyleName( "default" ); 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(); Color aNullCol(RGB_Color(COL_BLACK)); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 4a0aadfd7e02..474d3c6e0860 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -288,8 +288,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, if( bMustDelete ) delete pFontList; - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } 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->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX ); - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } CharHeightPropertyBox::~CharHeightPropertyBox() @@ -532,8 +530,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W Link<Edit&,void> aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } TransparencyPropertyBox::~TransparencyPropertyBox() @@ -628,8 +625,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p Link<Edit&,void> aLink( LINK( this, RotationPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } RotationPropertyBox::~RotationPropertyBox() @@ -748,8 +744,7 @@ ScalePropertyBox::ScalePropertyBox(sal_Int32 nControlType, vcl::Window* pParent, Link<Edit&,void> aLink( LINK( this, ScalePropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } ScalePropertyBox::~ScalePropertyBox() @@ -907,8 +902,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl )); mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX ); - OUString aPresetId; - setValue( rValue, aPresetId ); + setValue( rValue, OUString() ); } FontStylePropertyBox::~FontStylePropertyBox() diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 856ef30e5eff..20bbc450fad5 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -277,8 +277,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) ::tools::Rectangle aRect (aPos, aSize); sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true ); - OUString sTableStyle; - apply_table_style( pObj, pModel, sTableStyle ); + apply_table_style( pObj, pModel, OUString() ); pPage->NbcInsertObject( pObj ); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e1add507af43..eacd8ade3941 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -495,8 +495,6 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; SdPage* pPreviousNotesPage = static_cast<SdPage*>( mpDoc->GetPage( nStandardPageNum - 1 ) ); sal_uInt16 nNotesPageNum = nStandardPageNum + 1; - OUString aStandardPageName; - OUString aNotesPageName; /************************************************************** * standard page @@ -512,7 +510,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) pPreviousStandardPage->GetRgtBorder(), pPreviousStandardPage->GetLwrBorder() ); pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() ); - pStandardPage->SetName(aStandardPageName); + pStandardPage->SetName(OUString()); // insert page after current page mpDoc->InsertPage(pStandardPage, nStandardPageNum); @@ -547,7 +545,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) pPreviousNotesPage->GetRgtBorder(), pPreviousNotesPage->GetLwrBorder() ); pNotesPage->SetOrientation( pPreviousNotesPage->GetOrientation() ); - pNotesPage->SetName(aNotesPageName); + pNotesPage->SetName(OUString()); pNotesPage->SetPageKind(PageKind::Notes); // insert page after current page diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index d18e0006fdfe..2844da7cead8 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -698,8 +698,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, // special insert? if( !nRet && mpViewSh ) { - OUString aTmpString1, aTmpString2; - INetBookmark aINetBookmark( aTmpString1, aTmpString2 ); + INetBookmark aINetBookmark( (OUString()), (OUString()) ); // insert bookmark if( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && |