diff options
author | danielt998 <daniel@fearnley.net> | 2016-02-11 22:07:09 +0000 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:59 -0400 |
commit | 953ebe9618074d6a11022d7a94bd1909d20da003 (patch) | |
tree | 3f9a58a2eea8d384f8684cefc1970cf68394325f /sd | |
parent | ef5c4957959d7c0ad9b7bf8cedfae85e7fd77cde (diff) |
tdf#95857 Sort out German plurals ...
Made a start in removing the incorrect 'Infos' German plural
Reviewed-on: https://gerrit.libreoffice.org/22301
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 2b31daf74e33b988c849cb26e88fa7657a4015af)
Change-Id: Ie989351a7473fc35b563e63ce6a4fb229093af60
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/OutlineView.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/View.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 48fd1f6f16c1..8f0c65bf28bb 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -151,8 +151,8 @@ public: void UpdateParagraph( sal_Int32 nPara ); protected: - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override; - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override; + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override; private: /** call this method before you do anything that can modify the outliner diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 5c9aef618ccd..fc16663f79e1 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -243,8 +243,8 @@ protected: DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void ); DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void ); - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override; - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override; + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override; SdDrawDocument& mrDoc; DrawDocShell* mpDocSh; diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 63c19ebfdcb6..0359203f96a6 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1724,18 +1724,18 @@ void OutlineView::UpdateParagraph( sal_Int32 nPara ) mrOutliner.SetParaAttribs( nPara, aNewAttrs2 ); } -void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ ) +void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfo*/ ) { } /** this is called after a paste or drop operation, make sure that the newly inserted paragraphs get the correct style sheet and new slides are inserted. */ -void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) +void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) { SdPage* pPage = nullptr; SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool(); - for( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ ) + for( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ ) { Paragraph* pPara = mrOutliner.GetParagraph( nPara ); @@ -1755,7 +1755,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) if( !pPara ) continue; // fatality!? - if( bPage && (nPara != pInfos->nStartPara) ) + if( bPage && (nPara != pInfo->nStartPara) ) { // insert new slide for this paragraph pPage = InsertSlideForParagraph( pPara ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 71c6ce268503..d3c6e1641736 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1187,13 +1187,13 @@ void View::CheckPossibilities() maSmartTags.CheckPossibilities(); } -void View::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ ) +void View::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfo*/ ) { } /** this is called after a paste or drop operation, make sure that the newly inserted paragraphs get the correct style sheet. */ -void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) +void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) { /* Style Sheet handling */ SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( GetTextEditObject() ); @@ -1216,7 +1216,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) // new paragraph, depending on the paragraph depth SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool(); - for ( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ ) + for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ ) { sal_Int16 nDepth = pOutliner->GetDepth( nPara ); @@ -1240,7 +1240,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) else { // just put the object style on each new paragraph - for ( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ ) + for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ ) { pOutliner->SetStyleSheet( nPara, pStyleSheet ); } |