summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authordanielt998 <daniel@fearnley.net>2016-02-11 22:07:09 +0000
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-02-12 15:29:25 +0000
commit2b31daf74e33b988c849cb26e88fa7657a4015af (patch)
treeb4385985063c60b7900c63a1a229ef5165dbc12d /sd
parent662406b44d16c713c3d42585b57caf46689980f0 (diff)
tdf#95857 Sort out German plurals ...
Made a start in removing the incorrect 'Infos' German plural Change-Id: Ie989351a7473fc35b563e63ce6a4fb229093af60 Reviewed-on: https://gerrit.libreoffice.org/22301 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/OutlineView.hxx4
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/view/outlview.cxx8
-rw-r--r--sd/source/ui/view/sdview.cxx8
4 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index c45909f9711b..f309db41246e 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 662679e146d7..dc4893a7f30e 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -242,8 +242,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 0e6a8de22d80..3e1f12c38b90 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1723,18 +1723,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 );
@@ -1754,7 +1754,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 482ad6135812..c569d19bee33 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1185,13 +1185,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() );
@@ -1214,7 +1214,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 );
@@ -1238,7 +1238,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 );
}