Skip to content

C
core
Kaydet (Commit) 3b9d2501 authored tarafından Johnny_M's avatar Johnny_M Kaydeden (comit) Michael Stahl
Dosyalara gözat
Seçenekler

tdf#39674 Translate some German variable names 

This translates "Neu..." to "New..." in names of some variables.

No functional change is intended.

Change-Id: I29859ecdd44e15820414746cd2b39f62cdfc0ae3
Reviewed-on: https://gerrit.libreoffice.org/39213Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 9be706e3
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
include/svx/svdundo.hxx
Dosyayı görüntüle @ 3b9d2501
......@@ -523,11 +523,11 @@ public:
class SdrUndoMoveLayer : public SdrUndoLayer
{
sal_uInt16 nNeuPos;
sal_uInt16 nNewPos;
public:
SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {}
SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNewPos(nNewPos1) {}
virtual void Undo() override;
virtual void Redo() override;
......@@ -761,7 +761,7 @@ public:
// Layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1);
// Page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
......
reportdesign/source/core/inc/ReportUndoFactory.hxx
Dosyayı görüntüle @ 3b9d2501
......@@ -56,7 +56,7 @@ namespace rptui
// layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override;
virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override;
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) override;
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) override;
// page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override;
......
reportdesign/source/core/sdr/ReportUndoFactory.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -127,9 +127,9 @@ SdrUndoAction* OReportUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, S
return m_pUndoFactory->CreateUndoDeleteLayer( nLayerNum, rNewLayerAdmin, rNewModel );
}
SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1)
{
return m_pUndoFactory->CreateUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNeuPos1 );
return m_pUndoFactory->CreateUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 );
}
// page
......
reportdesign/source/ui/report/ReportSection.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -265,11 +265,11 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr;
if ( pObject )
{
SdrObject* pNeuObj = pObject->Clone();
SdrObject* pNewObj = pObject->Clone();
pNeuObj->SetPage( m_pPage );
pNeuObj->SetModel( m_pModel.get() );
m_pPage->InsertObject(pNeuObj, SAL_MAX_SIZE);
pNewObj->SetPage( m_pPage );
pNewObj->SetModel( m_pModel.get() );
m_pPage->InsertObject(pNewObj, SAL_MAX_SIZE);
tools::Rectangle aRet(VCLPoint((*pCopiesIter)->getPosition()),VCLSize((*pCopiesIter)->getSize()));
aRet.setHeight(aRet.getHeight() + 1);
......@@ -277,15 +277,15 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
bool bOverlapping = true;
while ( bOverlapping )
{
bOverlapping = isOver(aRet,*m_pPage,*m_pView,true,pNeuObj) != nullptr;
bOverlapping = isOver(aRet,*m_pPage,*m_pView,true,pNewObj) != nullptr;
if ( bOverlapping )
{
aRet.Move(0,aRet.getHeight()+1);
pNeuObj->SetLogicRect(aRet);
pNewObj->SetLogicRect(aRet);
}
}
m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNeuObj ) );
m_pView->MarkObj( pNeuObj, m_pView->GetSdrPageView() );
m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNewObj ) );
m_pView->MarkObj( pNewObj, m_pView->GetSdrPageView() );
if ( m_xSection.is() && (static_cast<sal_uInt32>(aRet.getHeight() + aRet.Top()) > m_xSection->getHeight()) )
m_xSection->setHeight(aRet.getHeight() + aRet.Top());
}
......@@ -358,8 +358,8 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
{
try
{
SdrObject* pNeuObj = pSdrObject->Clone();
aCopies.push_back(uno::Reference<report::XReportComponent>(pNeuObj->getUnoShape(),uno::UNO_QUERY));
SdrObject* pNewObj = pSdrObject->Clone();
aCopies.push_back(uno::Reference<report::XReportComponent>(pNewObj->getUnoShape(),uno::UNO_QUERY));
if ( _bEraseAnddNoClone )
{
m_pView->AddUndo( rUndo.CreateUndoDeleteObject( *pSdrObject ) );
......
sc/source/ui/view/viewfun7.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -153,25 +153,25 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
const SdrMark* pM=aMark.GetMark(nm);
const SdrObject* pObj=pM->GetMarkedSdrObj();
SdrObject* pNeuObj=pObj->Clone();
SdrObject* pNewObj=pObj->Clone();
if (pNeuObj!=nullptr)
if (pNewObj!=nullptr)
{
pNeuObj->SetModel(pDrawModel);
pNeuObj->SetPage(pDestPage);
pNewObj->SetModel(pDrawModel);
pNewObj->SetPage(pDestPage);
// copy graphics within the same model - always needs new name
if ( dynamic_cast<const SdrGrafObj*>( pNeuObj) != nullptr && !bPasteIsMove )
pNeuObj->SetName(static_cast<ScDrawLayer*>(pDrawModel)->GetNewGraphicName());
if ( dynamic_cast<const SdrGrafObj*>( pNewObj) != nullptr && !bPasteIsMove )
pNewObj->SetName(static_cast<ScDrawLayer*>(pDrawModel)->GetNewGraphicName());
if (nDiffX!=0 || nDiffY!=0)
pNeuObj->NbcMove(Size(nDiffX,nDiffY));
pNewObj->NbcMove(Size(nDiffX,nDiffY));
if (pDestPage)
pDestPage->InsertObject( pNeuObj );
pScDrawView->AddUndo(new SdrUndoInsertObj( *pNeuObj ));
pDestPage->InsertObject( pNewObj );
pScDrawView->AddUndo(new SdrUndoInsertObj( *pNewObj ));
if (ScDrawLayer::IsCellAnchored(*pNeuObj))
ScDrawLayer::SetCellAnchoredFromPosition(*pNeuObj, *GetViewData().GetDocument(), nTab);
if (ScDrawLayer::IsCellAnchored(*pNewObj))
ScDrawLayer::SetCellAnchoredFromPosition(*pNewObj, *GetViewData().GetDocument(), nTab);
}
}
......
svx/source/svdraw/svdmark.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -285,9 +285,9 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort)
{
SdrMark* pLast = GetMark(nCount - 1);
const SdrObject* pLastObj = pLast->GetMarkedSdrObj();
const SdrObject* pNeuObj = rMark.GetMarkedSdrObj();
const SdrObject* pNewObj = rMark.GetMarkedSdrObj();
if(pLastObj == pNeuObj)
if(pLastObj == pNewObj)
{
// This one already exists.
// Con1/Con2 Merging
......@@ -304,14 +304,14 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort)
// now check if the sort is ok
const SdrObjList* pLastOL = pLastObj!=nullptr ? pLastObj->GetObjList() : nullptr;
const SdrObjList* pNeuOL = pNeuObj !=nullptr ? pNeuObj ->GetObjList() : nullptr;
const SdrObjList* pNeuOL = pNewObj !=nullptr ? pNewObj ->GetObjList() : nullptr;
if(pLastOL == pNeuOL)
{
const sal_uLong nLastNum(pLastObj!=nullptr ? pLastObj->GetOrdNum() : 0);
const sal_uLong nNeuNum(pNeuObj !=nullptr ? pNeuObj ->GetOrdNum() : 0);
const sal_uLong nNewNum(pNewObj !=nullptr ? pNewObj ->GetOrdNum() : 0);
if(nNeuNum < nLastNum)
if(nNewNum < nLastNum)
{
// at some point, we have to sort
mbSorted = false;
......
svx/source/svdraw/svdmodel.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -1683,14 +1683,14 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if (bMergeMasterPages)
{
sal_uInt16 nNeuNum(0xFFFF);
sal_uInt16 nNewNum(0xFFFF);
if(pMasterMap)
{
nNeuNum = pMasterMap[nMaPgNum];
nNewNum = pMasterMap[nMaPgNum];
}
if(nNeuNum != 0xFFFF)
if(nNewNum != 0xFFFF)
{
// tdf#90357 here pPg and the to-be-set new masterpage are parts of the new model
// already, but the currently set masterpage is part of the old model. Remove master
......@@ -1705,9 +1705,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
AddUndo(GetSdrUndoFactory().CreateUndoPageChangeMasterPage(*pPg));
}
pPg->TRG_SetMasterPage(*GetMasterPage(nNeuNum));
pPg->TRG_SetMasterPage(*GetMasterPage(nNewNum));
}
DBG_ASSERT(nNeuNum!=0xFFFF,"SdrModel::Merge(): Something is crooked with the mapping of the MasterPages.");
DBG_ASSERT(nNewNum!=0xFFFF,"SdrModel::Merge(): Something is crooked with the mapping of the MasterPages.");
} else {
if (nMaPgNum>=nDstMasterPageAnz) {
// This is outside of the original area of the MasterPage of the DstModel.
......
svx/source/svdraw/svdpoev.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -366,14 +366,14 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
for(SdrUShortCont::const_reverse_iterator it = rPts.rbegin(); it != rPts.rend(); ++it)
{
sal_uInt32 nNewPt0Idx(0L);
SdrObject* pNeuObj = pObj->RipPoint(*it, nNewPt0Idx);
SdrObject* pNewObj = pObj->RipPoint(*it, nNewPt0Idx);
if(pNeuObj)
if(pNewObj)
{
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1);
pM->GetPageView()->GetObjList()->InsertObject(pNewObj, pObj->GetOrdNum() + 1);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
MarkObj(pNeuObj, pM->GetPageView(), false, true);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewObj));
MarkObj(pNewObj, pM->GetPageView(), false, true);
}
if(nNewPt0Idx)
......
svx/source/svdraw/svdundo.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -1344,7 +1344,7 @@ OUString SdrUndoDelLayer::GetComment() const
void SdrUndoMoveLayer::Undo()
{
SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos);
SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNewPos);
DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Undo(): Removed layer is != pLayer.");
pLayerAdmin->InsertLayer(pLayer,nNum);
}
......@@ -1353,7 +1353,7 @@ void SdrUndoMoveLayer::Redo()
{
SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum);
DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Redo(): Removed layer is != pLayer.");
pLayerAdmin->InsertLayer(pLayer,nNeuPos);
pLayerAdmin->InsertLayer(pLayer,nNewPos);
}
OUString SdrUndoMoveLayer::GetComment() const
......@@ -1835,9 +1835,9 @@ SdrUndoAction* SdrUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLa
return new SdrUndoDelLayer( nLayerNum, rNewLayerAdmin, rNewModel );
}
SdrUndoAction* SdrUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
SdrUndoAction* SdrUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1)
{
return new SdrUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNeuPos1 );
return new SdrUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 );
}
// page
......
svx/source/svdraw/svdxcgv.cxx
Dosyayı görüntüle @ 3b9d2501
......@@ -299,22 +299,22 @@ bool SdrExchangeView::Paste(
{
const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
SdrObject* pNeuObj = pSrcOb->Clone();
SdrObject* pNewObj = pSrcOb->Clone();
if (pNeuObj!=nullptr)
if (pNewObj!=nullptr)
{
if(bResize)
{
pNeuObj->GetModel()->SetPasteResize(true);
pNeuObj->NbcResize(aPt0,aXResize,aYResize);
pNeuObj->GetModel()->SetPasteResize(false);
pNewObj->GetModel()->SetPasteResize(true);
pNewObj->NbcResize(aPt0,aXResize,aYResize);
pNewObj->GetModel()->SetPasteResize(false);
}
// #i39861#
pNeuObj->SetModel(pDstLst->GetModel());
pNeuObj->SetPage(pDstLst->GetPage());
pNewObj->SetModel(pDstLst->GetModel());
pNewObj->SetPage(pDstLst->GetPage());
pNeuObj->NbcMove(aSiz);
pNewObj->NbcMove(aSiz);
const SdrPage* pPg = pDstLst->GetPage();
......@@ -324,7 +324,7 @@ bool SdrExchangeView::Paste(
const SdrLayerAdmin& rAd = pPg->GetLayerAdmin();
SdrLayerID nLayer(0);
if(dynamic_cast<const FmFormObj*>( pNeuObj) != nullptr)
if(dynamic_cast<const FmFormObj*>( pNewObj) != nullptr)
{
// for FormControls, force to form layer
nLayer = rAd.GetLayerID(rAd.GetControlLayerName());
......@@ -339,22 +339,22 @@ bool SdrExchangeView::Paste(
nLayer = SdrLayerID(0);
}
pNeuObj->SetLayer(nLayer);
pNewObj->SetLayer(nLayer);
}
pDstLst->InsertObject(pNeuObj, SAL_MAX_SIZE);
pDstLst->InsertObject(pNewObj, SAL_MAX_SIZE);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewObj));
if (bMark) {
// Don't already set Markhandles!
// That is instead being done by ModelHasChanged in MarkView.
MarkObj(pNeuObj,pMarkPV,false,true);
MarkObj(pNewObj,pMarkPV,false,true);
}
// #i13033#
aCloneList.AddPair(pSrcOb, pNeuObj);
aCloneList.AddPair(pSrcOb, pNewObj);
}
else
{
......@@ -731,27 +731,27 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
for(SdrObject* pObj : aSdrObjects)
{
SdrObject* pNeuObj;
SdrObject* pNewObj;
if( dynamic_cast<const SdrPageObj*>( pObj) != nullptr )
{
// convert SdrPageObj's to a graphic representation, because
// virtual connection to referenced page gets lost in new model
pNeuObj = new SdrGrafObj( GetObjGraphic( mpModel, pObj ), pObj->GetLogicRect() );
pNeuObj->SetPage( pNeuPag );
pNeuObj->SetModel( pNeuMod );
pNewObj = new SdrGrafObj( GetObjGraphic( mpModel, pObj ), pObj->GetLogicRect() );
pNewObj->SetPage( pNeuPag );
pNewObj->SetModel( pNeuMod );
}
else
{
pNeuObj = pObj->Clone();
pNeuObj->SetPage( pNeuPag );
pNeuObj->SetModel( pNeuMod );
pNewObj = pObj->Clone();
pNewObj->SetPage( pNeuPag );
pNewObj->SetModel( pNeuMod );
}
pNeuPag->InsertObject(pNeuObj, SAL_MAX_SIZE);
pNeuPag->InsertObject(pNewObj, SAL_MAX_SIZE);
// #i13033#
aCloneList.AddPair(pObj, pNeuObj);
aCloneList.AddPair(pObj, pNewObj);
}
// #i13033#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment