This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new b6811d1d44 Translate German (Neu -> New), cleanup
b6811d1d44 is described below
commit b6811d1d4489f1a7193682c9c3c27c1a4dd6da85
Author: mseidel <[email protected]>
AuthorDate: Thu Mar 20 18:21:33 2025 +0100
Translate German (Neu -> New), cleanup
(cherry picked from commit fe9b7f6a5f0c378e0c911bf69d0633ad596c6f08)
---
.../source/ui/report/ReportSection.cxx | 144 ++++++++--------
main/sc/source/ui/view/viewfun7.cxx | 104 ++++++-----
main/svx/source/svdraw/svdmark.cxx | 10 +-
main/svx/source/svdraw/svdpoev.cxx | 146 ++++++++--------
main/svx/source/svdraw/svdxcgv.cxx | 192 ++++++++++-----------
5 files changed, 295 insertions(+), 301 deletions(-)
diff --git a/main/reportdesign/source/ui/report/ReportSection.cxx
b/main/reportdesign/source/ui/report/ReportSection.cxx
index a97c2c108b..1cc37ab9b2 100644
--- a/main/reportdesign/source/ui/report/ReportSection.cxx
+++ b/main/reportdesign/source/ui/report/ReportSection.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#include "precompiled_rptui.hxx"
#include "ReportSection.hxx"
#include "ReportWindow.hxx"
@@ -80,7 +79,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const
uno::Reference <lang::XMultiServ
}
//------------------------------------------------------------------------------
DBG_NAME( rpt_OReportSection )
-OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference<
report::XSection >& _xSection)
+OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference<
report::XSection >& _xSection)
: Window(_pParent,WB_DIALOGCONTROL)
, ::comphelper::OPropertyChangeListener(m_aMutex)
, DropTargetHelper(this)
@@ -103,7 +102,7 @@ OReportSection::OReportSection(OSectionWindow*
_pParent,const uno::Reference< re
SetParentClipMode( PARENTCLIPMODE_CLIP );
EnableChildTransparentMode( sal_False );
SetPaintTransparent( sal_False );
-
+
try
{
fill();
@@ -124,11 +123,11 @@ OReportSection::~OReportSection()
//m_pModel->GetUndoEnv().RemoveSection(m_xSection.get());
if ( m_pMulti.is() )
m_pMulti->dispose();
-
+
if ( m_pReportListener.is() )
m_pReportListener->dispose();
m_pFunc = ::std::auto_ptr<DlgEdFunc>();
-
+
{
::std::auto_ptr<OSectionView> aTemp( m_pView);
if ( m_pView )
@@ -216,7 +215,7 @@ void OReportSection::fill()
const Fraction aY(aGridSizeFine.B());
m_pView->SetSnapGridWidth(aX, aY);
- m_pView->SetGridSnap( pDesignView->isGridSnap() );
+ m_pView->SetGridSnap( pDesignView->isGridSnap() );
m_pView->SetGridFront( sal_False );
m_pView->SetDragStripes( sal_True );
m_pView->SetPageVisible();
@@ -234,7 +233,7 @@ void OReportSection::fill()
// LLA: TODO
// m_pPage->SetUppBorder(-10000);
- m_pView->SetDesignMode( sal_True );
+ m_pView->SetDesignMode( sal_True );
m_pView->StartListening( *m_pModel );
/*Resize();*/
@@ -274,13 +273,13 @@ void OReportSection::Paste(const uno::Sequence<
beans::NamedValue >& _aAllreadyC
SvxShape* pShape =
SvxShape::getImplementation( *pCopiesIter );
SdrObject* pObject = pShape ? pShape->GetSdrObject() :
NULL;
if ( pObject )
- {
- SdrObject* pNeuObj = pObject->Clone();
+ {
+ SdrObject* pNewObj = pObject->Clone();
- pNeuObj->SetPage( m_pPage );
- pNeuObj->SetModel(
m_pModel.get() );
+ pNewObj->SetPage( m_pPage );
+ pNewObj->SetModel(
m_pModel.get() );
SdrInsertReason
aReason(SDRREASON_VIEWCALL);
-
m_pPage->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
+
m_pPage->InsertObject(pNewObj,CONTAINER_APPEND,&aReason);
Rectangle
aRet(VCLPoint((*pCopiesIter)->getPosition()),VCLSize((*pCopiesIter)->getSize()));
aRet.setHeight(aRet.getHeight() + 1);
@@ -288,16 +287,16 @@ void OReportSection::Paste(const uno::Sequence<
beans::NamedValue >& _aAllreadyC
bool bOverlapping =
true;
while ( bOverlapping )
{
- bOverlapping =
isOver(aRet,*m_pPage,*m_pView,true,pNeuObj) != NULL;
+ bOverlapping =
isOver(aRet,*m_pPage,*m_pView,true,pNewObj) != NULL;
if (
bOverlapping )
{
aRet.Move(0,aRet.getHeight()+1);
- pNeuObj->SetLogicRect(aRet);
+ pNewObj->SetLogicRect(aRet);
//(*pCopiesIter)->setPositionY(aRet.Top());
}
}
- 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());
}
@@ -338,16 +337,16 @@ void OReportSection::SetMode( DlgEdMode eNewMode )
m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( ) );
m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY);
m_eMode = eNewMode;
- }
+ }
}
//
-----------------------------------------------------------------------------
void OReportSection::Copy(uno::Sequence< beans::NamedValue >&
_rAllreadyCopiedObjects)
-{
+{
Copy(_rAllreadyCopiedObjects,false);
}
//----------------------------------------------------------------------------
void OReportSection::Copy(uno::Sequence< beans::NamedValue >&
_rAllreadyCopiedObjects,bool _bEraseAnddNoClone)
-{
+{
OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!");
if( !m_pView->AreObjectsMarked() || !m_xSection.is() )
return;
@@ -363,7 +362,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue
>& _rAllreadyCopiedOb
aCopies.reserve(nMark);
SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory();
-
+
for( sal_uLong i = nMark; i > 0; )
{
--i;
@@ -373,8 +372,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 ) );
@@ -436,13 +435,13 @@ void OReportSection::SelectAll(const sal_uInt16
_nObjectType)
{
m_pView->UnmarkAll();
SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS);
- SdrObject* pObjIter = NULL;
+ SdrObject* pObjIter = NULL;
while( (pObjIter = aIter.Next()) != NULL )
{
if ( pObjIter->GetObjIdentifier() == _nObjectType )
m_pView->MarkObj( pObjIter, m_pView->GetSdrPageView() );
}
- }
+ }
}
}
void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController&
rController,const uno::Reference< report::XReportDefinition>&
_xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,sal_Bool _bHiContrast)
@@ -490,9 +489,9 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
sal_Bool bHiContrast = rSettings.GetHighContrastMode();
OReportController& rController =
m_pParent->getViewsWindow()->getView()->getReportView()->getController();
uno::Reference<frame::XFrame> xFrame = rController.getFrame();
- PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) );
+ PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) );
uno::Reference< report::XReportDefinition> xReportDefinition =
getSection()->getReportDefinition();
-
+
lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast);
Point aPos = _rCEvt.GetMousePosPixel();
@@ -532,7 +531,7 @@ void OReportSection::_propertyChanged(const
beans::PropertyChangeEvent& _rEvent)
const sal_Int32 nLeftMargin =
getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN);
const sal_Int32 nRightMargin =
getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN);
const sal_Int32 nPaperWidth =
getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width;
-
+
if ( _rEvent.PropertyName == PROPERTY_LEFTMARGIN )
{
m_pPage->SetLftBorder(nLeftMargin);
@@ -552,7 +551,7 @@ void OReportSection::_propertyChanged(const
beans::PropertyChangeEvent& _rEvent)
impl_adjustObjectSizePosition(nPaperWidth,nLeftMargin,nRightMargin);
m_pParent->Invalidate(INVALIDATE_UPDATE | INVALIDATE_TRANSPARENT);
}
- }
+
}
void OReportSection::impl_adjustObjectSizePosition(sal_Int32
i_nPaperWidth,sal_Int32 i_nLeftMargin,sal_Int32 i_nRightMargin)
{
@@ -593,7 +592,7 @@ void
OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
}
if ( aPos.Y < 0 )
aPos.Y = 0;
- if ( bChanged )
+ if ( bChanged )
{
xReportComponent->setPosition(aPos);
correctOverlapping(pObject,*this,false);
@@ -622,29 +621,29 @@ sal_Bool OReportSection::handleKeyEvent(const KeyEvent&
_rEvent)
//
-----------------------------------------------------------------------------
void OReportSection::deactivateOle()
{
- if ( m_pFunc.get() )
+ if ( m_pFunc.get() )
m_pFunc->deactivateOle(true);
}
//
-----------------------------------------------------------------------------
void OReportSection::createDefault(const ::rtl::OUString& _sType)
{
- SdrObject* pObj = m_pView->GetCreateObj();//rMarkList.GetMark(0)->GetObj();
- if ( !pObj )
- return;
- createDefault(_sType,pObj);
+ SdrObject* pObj =
m_pView->GetCreateObj();//rMarkList.GetMark(0)->GetObj();
+ if ( !pObj )
+ return;
+ createDefault(_sType,pObj);
}
//
-----------------------------------------------------------------------------
void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject*
_pObj)
{
- sal_Bool bAttributesAppliedFromGallery = sal_False;
+ sal_Bool bAttributesAppliedFromGallery = sal_False;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
std::vector< rtl::OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle(
GALLERY_THEME_POWERPOINT, aObjList ) )
{
- std::vector< rtl::OUString >::iterator aIter = aObjList.begin();
- std::vector< rtl::OUString >::iterator aEnd = aObjList.end();
+ std::vector< rtl::OUString >::iterator aIter =
aObjList.begin();
+ std::vector< rtl::OUString >::iterator aEnd =
aObjList.end();
for (sal_uInt32 i=0 ; aIter != aEnd; ++aIter,++i)
{
if ( aIter->equalsIgnoreAsciiCase( _sType ) )
@@ -704,10 +703,10 @@ uno::Reference< report::XReportComponent >
OReportSection::getCurrentControlMode
if ( m_pView )
{
const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
- sal_uInt32 nMarkCount = rMarkList.GetMarkCount();
+ sal_uInt32 nMarkCount = rMarkList.GetMarkCount();
- if ( nMarkCount == 1 )
- {
+ if ( nMarkCount == 1 )
+ {
SdrObject* pDlgEdObj =
rMarkList.GetMark(0)->GetMarkedSdrObj();
OObjectBase* pObj =
dynamic_cast<OObjectBase*>(pDlgEdObj);
if ( pObj )
@@ -719,34 +718,34 @@ uno::Reference< report::XReportComponent >
OReportSection::getCurrentControlMode
//
-----------------------------------------------------------------------------
void OReportSection::fillControlModelSelection(::std::vector< uno::Reference<
uno::XInterface > >& _rSelection) const
{
- if ( m_pView )
+ if ( m_pView )
{
const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
- const sal_uInt32 nMarkCount = rMarkList.GetMarkCount();
+ const sal_uInt32 nMarkCount = rMarkList.GetMarkCount();
- for (sal_uInt32 i=0; i < nMarkCount; ++i)
- {
+ for (sal_uInt32 i=0; i < nMarkCount; ++i)
+ {
const SdrObject* pDlgEdObj =
rMarkList.GetMark(i)->GetMarkedSdrObj();
const OObjectBase* pObj = dynamic_cast<const
OObjectBase*>(pDlgEdObj);
if ( pObj )
- _rSelection.push_back(pObj->getReportComponent());
+
_rSelection.push_back(pObj->getReportComponent());
}
}
}
//
-----------------------------------------------------------------------------
sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
{
- OSL_TRACE("AcceptDrop::DropEvent.Action %i\n", _rEvt.mnAction);
+ OSL_TRACE("AcceptDrop::DropEvent.Action %i\n", _rEvt.mnAction);
- ::Point aDropPos(_rEvt.maPosPixel);
- const MouseEvent aMouseEvt(aDropPos);
- if ( m_pFunc->isOverlapping(aMouseEvt) )
- return DND_ACTION_NONE;
+ ::Point aDropPos(_rEvt.maPosPixel);
+ const MouseEvent aMouseEvt(aDropPos);
+ if ( m_pFunc->isOverlapping(aMouseEvt) )
+ return DND_ACTION_NONE;
- if ( _rEvt.mnAction == DND_ACTION_COPY ||
- _rEvt.mnAction == DND_ACTION_LINK
- )
- {
+ if ( _rEvt.mnAction == DND_ACTION_COPY ||
+ _rEvt.mnAction == DND_ACTION_LINK
+ )
+ {
if (!m_pParent) return DND_ACTION_NONE;
sal_uInt16 nCurrentPosition = 0;
nCurrentPosition =
m_pParent->getViewsWindow()->getPosition(m_pParent);
@@ -775,7 +774,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent&
_rEvt )
if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors)
||
::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors,
CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
return _rEvt.mnAction;
-
+
const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) )
? DND_ACTION_COPYMOVE : DND_ACTION_NONE;
return nDropOption;
@@ -823,15 +822,15 @@ sal_Int8 OReportSection::ExecuteDrop( const
ExecuteDropEvent& _rEvt )
if ( !bMultipleFormat )
{
::svx::ODataAccessDescriptor aDescriptor =
::svx::OColumnTransferable::extractColumnDescriptor(aDropped);
-
+
aValues.realloc(1);
aValues[0].Value <<= aDescriptor.createPropertyValueSequence();
} // if ( !bMultipleFormat )
- else
+ else
aValues =
::svx::OMultiColumnTransferable::extractDescriptor(aDropped);
-
+
beans::PropertyValue* pIter = aValues.getArray();
- beans::PropertyValue* pEnd = pIter + aValues.getLength();
+ beans::PropertyValue* pEnd = pIter + aValues.getLength();
for(;pIter != pEnd; ++pIter)
{
uno::Sequence<beans::PropertyValue> aCurrent;
@@ -842,7 +841,7 @@ sal_Int8 OReportSection::ExecuteDrop( const
ExecuteDropEvent& _rEvt )
aCurrent.realloc(nLength + 3);
aCurrent[nLength].Name = PROPERTY_POSITION;
aCurrent[nLength++].Value <<= AWTPoint(aDropPos);
- // give also the DND Action (Shift|Ctrl) Key to really say
what we want
+ // give also the DND Action (Shift|Ctrl) Key to really say
what we want
aCurrent[nLength].Name =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction"));
aCurrent[nLength++].Value <<= _rEvt.mnAction;
@@ -850,26 +849,27 @@ sal_Int8 OReportSection::ExecuteDrop( const
ExecuteDropEvent& _rEvt )
aCurrent[nLength++].Value <<= getSection();
pIter->Value <<= aCurrent;
}
- }
+ }
- // we use this way to create undo actions
- OReportController& rController =
m_pParent->getViewsWindow()->getView()->getReportView()->getController();
+ // we use this way to create undo actions
+ OReportController& rController =
m_pParent->getViewsWindow()->getView()->getReportView()->getController();
rController.executeChecked(SID_ADD_CONTROL_PAIR,aValues);
- nDropOption = DND_ACTION_COPY;
- }
+ nDropOption = DND_ACTION_COPY;
+ }
return nDropOption;
}
//
-----------------------------------------------------------------------------
void OReportSection::stopScrollTimer()
{
- m_pFunc->stopScrollTimer();
+ m_pFunc->stopScrollTimer();
}
//
-----------------------------------------------------------------------------
bool OReportSection::isUiActive() const
{
- return m_pFunc->isUiActive();
+ return m_pFunc->isUiActive();
}
//
-----------------------------------------------------------------------------
//
=============================================================================
}
-//
=============================================================================
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sc/source/ui/view/viewfun7.cxx
b/main/sc/source/ui/view/viewfun7.cxx
index 1685f6d9eb..d575e4e222 100644
--- a/main/sc/source/ui/view/viewfun7.cxx
+++ b/main/sc/source/ui/view/viewfun7.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,26 +7,22 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
-
-
// INCLUDE ---------------------------------------------------------------
#include <svx/svditer.hxx>
@@ -43,7 +39,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/embed/Aspects.hpp>
-#include "document.hxx" // fuer MapMode Initialisierung in
PasteDraw
+#include "document.hxx" // für MapMode Initialisierung in PasteDraw
#include "viewfunc.hxx"
#include "tabvwsh.hxx"
#include "drawview.hxx"
@@ -81,12 +77,12 @@ void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos,
Size& rSize )
rPos.X() += x + 80;
if( y < 0 )
rPos.Y() += y + 200;
- rPos.X() += rSize.Width() / 2; // Position bei Paste
gibt Mittelpunkt an
+ rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an
rPos.Y() += rSize.Height() / 2;
}
void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
- sal_Bool bGroup, sal_Bool bSameDocClipboard )
+ sal_Bool bGroup, sal_Bool bSameDocClipboard )
{
MakeDrawLayer();
Point aPos( rLogicPos );
@@ -166,22 +162,22 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos,
SdrModel* pModel,
const SdrObject* pObj=pM->GetMarkedSdrObj();
// #116235#
- SdrObject* pNeuObj=pObj->Clone();
- //SdrObject*
pNeuObj=pObj->Clone(pDestPage,pDrawModel);
+ SdrObject* pNewObj=pObj->Clone();
+ //SdrObject*
pNewObj=pObj->Clone(pDestPage,pDrawModel);
- if (pNeuObj!=NULL)
+ if (pNewObj!=NULL)
{
- pNeuObj->SetModel(pDrawModel);
- pNeuObj->SetPage(pDestPage);
+ pNewObj->SetModel(pDrawModel);
+ pNewObj->SetPage(pDestPage);
// #68787# copy graphics within
the same model - always needs new name
- if ( pNeuObj->ISA(SdrGrafObj) &&
!bPasteIsMove )
-
pNeuObj->SetName(((ScDrawLayer*)pDrawModel)->GetNewGraphicName());
+ if ( pNewObj->ISA(SdrGrafObj) &&
!bPasteIsMove )
+
pNewObj->SetName(((ScDrawLayer*)pDrawModel)->GetNewGraphicName());
if (nDiffX!=0 || nDiffY!=0)
-
pNeuObj->NbcMove(Size(nDiffX,nDiffY));
- pDestPage->InsertObject( pNeuObj );
- pScDrawView->AddUndo(new
SdrUndoInsertObj( *pNeuObj ));
+
pNewObj->NbcMove(Size(nDiffX,nDiffY));
+ pDestPage->InsertObject( pNewObj );
+ pScDrawView->AddUndo(new
SdrUndoInsertObj( *pNewObj ));
// Chart braucht nicht mehr
getrennt behandelt zu werden,
// weil es seine Daten jetzt
selber hat
@@ -204,20 +200,20 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos,
SdrModel* pModel,
}
else
{
- bPasteIsMove = sal_False; // kein internes
Verschieben passiert
+ bPasteIsMove = sal_False; // kein internes Verschieben passiert
- SdrView aView(pModel); // #i71529# never create a base class of
SdrView directly!
+ SdrView aView(pModel); // #i71529# never create a base class of
SdrView directly!
SdrPageView* pPv =
aView.ShowSdrPage(aView.GetModel()->GetPage(0));
aView.MarkAllObj(pPv);
Size aSize = aView.GetAllMarkedRect().GetSize();
lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
- // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv
- // (bei Drop aus Ole-Objekt wuerde sonst mitten im
ExecuteDrag deaktiviert!)
+ // #41333# Markierung nicht ändern, wenn Ole-Objekt aktiv
+ // (bei Drop aus OLE-Objekt würde sonst mitten im
ExecuteDrag deaktiviert!)
sal_uLong nOptions = 0;
SfxInPlaceClient* pClient =
GetViewData()->GetViewShell()->GetIPClient();
- if ( pClient && pClient->IsObjectInPlaceActive() )
+ if ( pClient && pClient->IsObjectInPlaceActive() )
nOptions |= SDRINSERT_DONTMARK;
::std::vector< ::rtl::OUString > aExcludedChartNames;
@@ -280,7 +276,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos,
SdrModel* pModel,
// GetViewData()->GetViewShell()->SetDrawShell( sal_True );
// #99759# It is not sufficient to just set the DrawShell if we pasted, for
- // example, a chart. SetDrawShellOrSub() would only work for D&D in the
+ // example, a chart. SetDrawShellOrSub() would only work for D&D in the
// same document but not if inserting from the clipboard, therefore
// MarkListHasChanged() is what we need.
pScDrawView->MarkListHasChanged();
@@ -326,8 +322,8 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const
uno::Reference < embe
aSz.Height = aSize.Height();
xObj->setVisualAreaSize( nAspect, aSz );
}
-
- awt::Size aSz;
+
+ awt::Size aSz;
try
{
aSz = xObj->getVisualAreaSize( nAspect );
@@ -336,8 +332,8 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const
uno::Reference < embe
{
// the default size will be set later
}
-
- aSize = Size( aSz.Width, aSz.Height );
+
+ aSize = Size( aSz.Width, aSz.Height );
aSize = OutputDevice::LogicToLogic( aSize, aMapObj,
aMap100 ); // fuer SdrOle2Obj
if( aSize.Height() == 0 || aSize.Width() == 0 )
@@ -346,9 +342,9 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const
uno::Reference < embe
aSize.Width() = 5000;
aSize.Height() = 5000;
aSize = OutputDevice::LogicToLogic( aSize,
aMap100, aMapObj );
- aSz.Width = aSize.Width();
- aSz.Height = aSize.Height();
- xObj->setVisualAreaSize( nAspect, aSz );
+ aSz.Width = aSize.Width();
+ aSz.Height = aSize.Height();
+ xObj->setVisualAreaSize( nAspect, aSz );
}
}
@@ -359,7 +355,7 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const
uno::Reference < embe
Rectangle aRect( aInsPos, aSize );
ScDrawView* pDrView = GetScDrawView();
- SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect );
+ SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect );
SdrPageView* pPV = pDrView->GetSdrPageView();
pDrView->InsertObjectSafe( pSdrObj, *pPV );
// nicht markieren wenn Ole
@@ -390,13 +386,13 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos,
const Graphic& rGraphic,
MakeDrawLayer();
ScDrawView* pScDrawView = GetScDrawView();
- // #123922# check if the drop was over an existing object; if yes, evtl.
replace
- // the graphic for a SdrGraphObj (including link state updates) or adapt
the fill
- // style for other objects
- if(pScDrawView)
- {
- SdrObject* pPickObj = 0;
- SdrPageView* pPageView = pScDrawView->GetSdrPageView();
+ // #123922# check if the drop was over an existing object; if yes,
evtl. replace
+ // the graphic for a SdrGraphObj (including link state updates) or
adapt the fill
+ // style for other objects
+ if(pScDrawView)
+ {
+ SdrObject* pPickObj = 0;
+ SdrPageView* pPageView = pScDrawView->GetSdrPageView();
if(pPageView)
{
@@ -407,10 +403,10 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos,
const Graphic& rGraphic,
{
const String aBeginUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
SdrObject* pResult = pScDrawView->ApplyGraphicToObject(
- *pPickObj,
- rGraphic,
- aBeginUndo,
- rFile,
+ *pPickObj,
+ rGraphic,
+ aBeginUndo,
+ rFile,
rFilter);
if(pResult)
@@ -429,7 +425,7 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos, const
Graphic& rGraphic,
if (aSourceMap.GetMapUnit() == MAP_PIXEL)
{
- // Pixel-Korrektur beruecksichtigen, damit Bitmap
auf dem Bildschirm stimmt
+ // Pixel-Korrektur berücksichtigen, damit Bitmap
auf dem Bildschirm stimmt
Fraction aScaleX, aScaleY;
pScDrawView->CalcNormScale( aScaleX, aScaleY );
@@ -443,12 +439,12 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos,
const Graphic& rGraphic,
aPos.X() -= aSize.Width();
GetViewData()->GetViewShell()->SetDrawShell( sal_True );
- Rectangle aRect(aPos, aSize);
+ Rectangle aRect(aPos, aSize);
SdrGrafObj* pGrafObj = new SdrGrafObj(rGraphic, aRect);
- // #118522# calling SetGraphicLink here doesn't work
+ // #118522# calling SetGraphicLink here doesn't work
- // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt
+ // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt
ScDrawLayer* pLayer = (ScDrawLayer*) pScDrawView->GetModel();
String aName = pLayer->GetNewGraphicName();
// "Grafik x"
@@ -457,11 +453,13 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos,
const Graphic& rGraphic,
// nicht markieren wenn Ole
pScDrawView->InsertObjectSafe(pGrafObj, *pScDrawView->GetSdrPageView());
- // #118522# SetGraphicLink has to be used after inserting the object,
- // otherwise an empty graphic is swapped in and the contact stuff crashes.
- // See #i37444#.
+ // #118522# SetGraphicLink has to be used after inserting the object,
+ // otherwise an empty graphic is swapped in and the contact stuff
crashes.
+ // See #i37444#.
if (rFile.Len())
pGrafObj->SetGraphicLink( rFile, rFilter );
return sal_True;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdmark.cxx
b/main/svx/source/svdraw/svdmark.cxx
index 8eaf785e4a..f361e7c92e 100644
--- a/main/svx/source/svdraw/svdmark.cxx
+++ b/main/svx/source/svdraw/svdmark.cxx
@@ -31,7 +31,7 @@
#include <svx/svdopath.hxx> // zur Abschaltung
#include <svx/svdogrp.hxx> // des Cache bei
#include <svx/svdorect.hxx> // GetMarkDescription
-#include "svx/svdstr.hrc" // Name from resource
+#include "svx/svdstr.hrc" // Names from resource
#include "svx/svdglob.hxx" // StringCache
#include <svx/obj3d.hxx>
@@ -493,9 +493,9 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark,
sal_Bool bChkSort)
{
SdrMark* pLast = GetMark(sal_uLong(nAnz - 1));
const SdrObject* pLastObj = pLast->GetMarkedSdrObj();
- const SdrObject* pNeuObj = rMark.GetMarkedSdrObj();
+ const SdrObject* pNewObj = rMark.GetMarkedSdrObj();
- if(pLastObj == pNeuObj)
+ if(pLastObj == pNewObj)
{
// Aha, den gibt es schon
// Con1/Con2 Merging
@@ -512,12 +512,12 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark,
sal_Bool bChkSort)
// und nun checken, ob die Sortierung noch ok ist
const SdrObjList* pLastOL = pLastObj!=0L ?
pLastObj->GetObjList() : 0L;
- const SdrObjList* pNeuOL = pNeuObj !=0L ? pNeuObj
->GetObjList() : 0L;
+ const SdrObjList* pNeuOL = pNewObj !=0L ? pNewObj
->GetObjList() : 0L;
if(pLastOL == pNeuOL)
{
const sal_uLong nLastNum(pLastObj!=0L ?
pLastObj->GetOrdNum() : 0);
- const sal_uLong nNewNum(pNeuObj !=0L ? pNeuObj
->GetOrdNum() : 0);
+ const sal_uLong nNewNum(pNewObj !=0L ? pNewObj
->GetOrdNum() : 0);
if(nNewNum < nLastNum)
{
diff --git a/main/svx/source/svdraw/svdpoev.cxx
b/main/svx/source/svdraw/svdpoev.cxx
index 977ef7f95c..8ebccc1abc 100644
--- a/main/svx/source/svdraw/svdpoev.cxx
+++ b/main/svx/source/svdraw/svdpoev.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
@@ -30,12 +28,12 @@
#include <svx/svdpage.hxx>
#include <svx/svdopath.hxx>
#include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc" // Namen aus der Resource
-#include "svx/svdglob.hxx" // StringCache
+#include "svx/svdstr.hrc" // Names from resource
+#include "svx/svdglob.hxx" // StringCache
#include <svx/svdtrans.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <vcl/salbtype.hxx> // FRound
+#include <vcl/salbtype.hxx> // FRound
#include <svx/polypolygoneditor.hxx>
@@ -80,7 +78,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
bool bSegmFuz(false);
basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
- for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+ for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
{
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm,
bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -94,60 +92,60 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper(
SdrMark* pM, bool& b1stSmoot
SdrUShortCont* pPts = pM->GetMarkedPoints();
SdrPathObj* pPath = PTR_CAST(SdrPathObj,pObj);
- if(pPath && pPts)
+ if(pPath && pPts)
{
const sal_uInt32 nMarkedPntAnz(pPts->GetCount());
-
- if(nMarkedPntAnz)
+
+ if(nMarkedPntAnz)
{
bool bClosed(pPath->IsClosed());
bSetMarkedPointsSmoothPossible = true;
-
- if(bClosed)
+
+ if(bClosed)
{
bSetMarkedSegmentsKindPossible = true;
}
- for(sal_uInt32 nMarkedPntNum(0L); nMarkedPntNum <
nMarkedPntAnz; nMarkedPntNum++)
+ for(sal_uInt32 nMarkedPntNum(0L); nMarkedPntNum <
nMarkedPntAnz; nMarkedPntNum++)
{
sal_uInt32 nNum(pPts->GetObject(nMarkedPntNum));
sal_uInt32 nPolyNum, nPntNum;
-
if(PolyPolygonEditor::GetRelativePolyPoint(pPath->GetPathPoly(), nNum,
nPolyNum, nPntNum))
+
if(PolyPolygonEditor::GetRelativePolyPoint(pPath->GetPathPoly(), nNum,
nPolyNum, nPntNum))
{
const basegfx::B2DPolygon
aLocalPolygon(pPath->GetPathPoly().getB2DPolygon(nPolyNum));
bool bCanSegment(bClosed || nPntNum <
aLocalPolygon.count() - 1L);
- if(!bSetMarkedSegmentsKindPossible &&
bCanSegment)
+ if(!bSetMarkedSegmentsKindPossible &&
bCanSegment)
{
bSetMarkedSegmentsKindPossible
= true;
}
-
- if(!bSmoothFuz)
+
+ if(!bSmoothFuz)
{
- if (b1stSmooth)
+ if (b1stSmooth)
{
b1stSmooth = false;
eSmooth =
basegfx::tools::getContinuityInPoint(aLocalPolygon, nPntNum);
- }
- else
+ }
+ else
{
bSmoothFuz = (eSmooth
!= basegfx::tools::getContinuityInPoint(aLocalPolygon, nPntNum));
}
}
-
- if(!bSegmFuz)
+
+ if(!bSegmFuz)
{
- if(bCanSegment)
+ if(bCanSegment)
{
bool
bCrv(aLocalPolygon.isNextControlPointUsed(nPntNum));
- if(b1stSegm)
+ if(b1stSegm)
{
b1stSegm =
false;
bCurve = bCrv;
- }
- else
+ }
+ else
{
bSegmFuz =
(bCrv != bCurve);
}
@@ -156,25 +154,25 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper(
SdrMark* pM, bool& b1stSmoot
}
}
- if(!b1stSmooth && !bSmoothFuz)
+ if(!b1stSmooth && !bSmoothFuz)
{
- if(basegfx::CONTINUITY_NONE == eSmooth)
+ if(basegfx::CONTINUITY_NONE == eSmooth)
{
eMarkedPointsSmooth =
SDRPATHSMOOTH_ANGULAR;
}
- if(basegfx::CONTINUITY_C1 == eSmooth)
+ if(basegfx::CONTINUITY_C1 == eSmooth)
{
eMarkedPointsSmooth =
SDRPATHSMOOTH_ASYMMETRIC;
}
- if(basegfx::CONTINUITY_C2 == eSmooth)
+ if(basegfx::CONTINUITY_C2 == eSmooth)
{
eMarkedPointsSmooth =
SDRPATHSMOOTH_SYMMETRIC;
}
}
- if(!b1stSegm && !bSegmFuz)
+ if(!b1stSegm && !bSegmFuz)
{
eMarkedSegmentsKind = (bCurve) ?
SDRPATHSEGMENT_CURVE : SDRPATHSEGMENT_LINE;
}
@@ -185,25 +183,25 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper(
SdrMark* pM, bool& b1stSmoot
void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
{
basegfx::B2VectorContinuity eFlags;
-
- if(SDRPATHSMOOTH_ANGULAR == eKind)
+
+ if(SDRPATHSMOOTH_ANGULAR == eKind)
{
eFlags = basegfx::CONTINUITY_NONE;
}
- else if(SDRPATHSMOOTH_ASYMMETRIC == eKind)
+ else if(SDRPATHSMOOTH_ASYMMETRIC == eKind)
{
eFlags = basegfx::CONTINUITY_C1;
}
- else if(SDRPATHSMOOTH_SYMMETRIC == eKind)
+ else if(SDRPATHSMOOTH_SYMMETRIC == eKind)
{
eFlags = basegfx::CONTINUITY_C2;
}
- else
+ else
{
return;
}
- if(HasMarkedPoints())
+ if(HasMarkedPoints())
{
SortMarkedObjects();
@@ -212,14 +210,14 @@ void
SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
BegUndo(ImpGetResStr(STR_EditSetPointsSmooth),
GetDescriptionOfMarkedPoints());
sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
- for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
SdrUShortCont* pPts = pM->GetMarkedPoints();
SdrPathObj* pPath = dynamic_cast< SdrPathObj* >(
pM->GetMarkedSdrObj() );
-
- if(pPts && pPath)
+
+ if(pPts && pPath)
{
PolyPolygonEditor aEditor(
pPath->GetPathPoly(), pPath->IsClosed() );
if(aEditor.SetPointsSmooth( eFlags,
pPts->getContainer() ) )
@@ -238,7 +236,7 @@ void
SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
{
- if(HasMarkedPoints())
+ if(HasMarkedPoints())
{
SortMarkedObjects();
@@ -246,15 +244,15 @@ void
SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
if( bUndo )
BegUndo(ImpGetResStr(STR_EditSetSegmentsKind),
GetDescriptionOfMarkedPoints());
sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
-
- for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
+
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
SdrUShortCont* pPts = pM->GetMarkedPoints();
SdrPathObj* pPath = dynamic_cast< SdrPathObj* >(
pM->GetMarkedSdrObj() );
-
- if(pPts && pPath)
+
+ if(pPts && pPath)
{
PolyPolygonEditor aEditor(
pPath->GetPathPoly(), pPath->IsClosed() );
if(aEditor.SetSegmentsKind( eKind,
pPts->getContainer()) )
@@ -322,7 +320,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
SdrUShortCont* pPts=pM->GetMarkedPoints();
SdrPathObj* pPath = dynamic_cast< SdrPathObj* >(
pM->GetMarkedSdrObj() );
- if( pPath && pPts )
+ if( pPath && pPts )
{
PolyPolygonEditor aEditor( pPath
->GetPathPoly(), pPath->IsClosed() );
if( aEditor.DeletePoints( pPts->getContainer()
) )
@@ -357,7 +355,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
void SdrPolyEditView::RipUpAtMarkedPoints()
{
- if(HasMarkedPoints())
+ if(HasMarkedPoints())
{
SortMarkedObjects();
sal_uInt32 nMarkAnz(GetMarkedObjectCount());
@@ -366,14 +364,14 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if( bUndo )
BegUndo(ImpGetResStr(STR_EditRipUp),
GetDescriptionOfMarkedPoints());
- for(sal_uInt32 nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uInt32 nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
SdrUShortCont* pPts = pM->GetMarkedPoints();
SdrPathObj* pObj = PTR_CAST(SdrPathObj,
pM->GetMarkedSdrObj());
-
- if(pPts && pObj)
+
+ if(pPts && pObj)
{
pPts->ForceSort();
if( bUndo )
@@ -383,36 +381,36 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
sal_uInt32 nMarkPtsAnz(pPts->GetCount());
sal_uInt32 nMax(pObj->GetHdlCount());
- for(sal_uInt32 i(nMarkPtsAnz); i > 0L;)
+ for(sal_uInt32 i(nMarkPtsAnz); i > 0L;)
{
i--;
sal_uInt32 nNewPt0Idx(0L);
- SdrObject* pNeuObj =
pObj->RipPoint(pPts->GetObject(i), nNewPt0Idx);
+ SdrObject* pNewObj =
pObj->RipPoint(pPts->GetObject(i), nNewPt0Idx);
- if(pNeuObj)
+ if(pNewObj)
{
bInsAny = sal_True;
SdrInsertReason
aReason(SDRREASON_VIEWCALL, pObj);
-
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1,
&aReason);
+
pM->GetPageView()->GetObjList()->InsertObject(pNewObj, pObj->GetOrdNum() + 1,
&aReason);
if( bUndo )
-
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
- MarkObj(pNeuObj,
pM->GetPageView(), sal_False, sal_True);
+
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewObj));
+ MarkObj(pNewObj,
pM->GetPageView(), sal_False, sal_True);
}
- if(nNewPt0Idx)
- {
+ if(nNewPt0Idx)
+ {
// Korrektur notwendig?
DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei
SdrPolyEditView::RipUp()");
- if(!bKorregFlag)
+ if(!bKorregFlag)
{
bKorregFlag = sal_True;
- for(sal_uInt32
nBla(0L); nBla < nMarkPtsAnz; nBla++)
+ for(sal_uInt32
nBla(0L); nBla < nMarkPtsAnz; nBla++)
{
sal_uInt32
nPntNum(pPts->GetObject(nBla));
nPntNum +=
nNewPt0Idx;
-
- if(nPntNum >=
nMax)
+
+ if(nPntNum >=
nMax)
{
nPntNum
-= nMax;
}
@@ -532,11 +530,11 @@ SdrObjClosedKind
SdrPolyEditView::GetMarkedObjectsClosedState() const
}
}
- if(bOpen && bClosed)
+ if(bOpen && bClosed)
{
return SDROBJCLOSED_DONTCARE;
}
- else if(bOpen)
+ else if(bOpen)
{
return SDROBJCLOSED_OPEN;
}
@@ -609,19 +607,19 @@ void
SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
const SdrUShortCont* pPts=pM->GetMarkedPoints();
sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
- if (nPtAnz!=0 && pPath!=NULL)
+ if (nPtAnz!=0 && pPath!=NULL)
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
basegfx::B2DPolyPolygon aXPP(pPath->GetPathPoly());
- for(sal_uInt32 nPtNum(0L); nPtNum < nPtAnz; nPtNum++)
+ for(sal_uInt32 nPtNum(0L); nPtNum < nPtAnz; nPtNum++)
{
sal_uInt32 nPt(pPts->GetObject(nPtNum));
sal_uInt32 nPolyNum, nPointNum;
-
if(PolyPolygonEditor::GetRelativePolyPoint(aXPP, nPt, nPolyNum, nPointNum))
+
if(PolyPolygonEditor::GetRelativePolyPoint(aXPP, nPt, nPolyNum, nPointNum))
{
//#i83671# used nLocalPointNum (which
was the polygon point count)
// instead of the point index
(nPointNum). This of course leaded
@@ -651,12 +649,12 @@ void
SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
(*pTrFunc)(aPos,&aC1,&aC2,p1,p2,p3,p4,p5);
aNewXP.setB2DPoint(nPointNum,
basegfx::B2DPoint(aPos.X(), aPos.Y()));
- if (bC1)
+ if (bC1)
{
aNewXP.setPrevControlPoint(nPointNum, basegfx::B2DPoint(aC1.X(), aC1.Y()));
}
- if (bC2)
+ if (bC2)
{
aNewXP.setNextControlPoint(nPointNum, basegfx::B2DPoint(aC2.X(), aC2.Y()));
}
@@ -664,7 +662,7 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc
pTrFunc, const void*
aXPP.setB2DPolygon(nPolyNum, aNewXP);
}
}
-
+
pPath->SetPathPoly(aXPP);
}
}
@@ -738,4 +736,4 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef,
long nWink, bool bCo
AdjustMarkHdl();
}
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdxcgv.cxx
b/main/svx/source/svdraw/svdxcgv.cxx
index 0b8bac2ecd..4b312827ed 100644
--- a/main/svx/source/svdraw/svdxcgv.cxx
+++ b/main/svx/source/svdraw/svdxcgv.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
@@ -34,15 +32,15 @@
#include <svx/svdetc.hxx>
#include <svx/svdundo.hxx>
#include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx> // fuer kein OLE im SdrClipboardFormat
+#include <svx/svdoole2.hxx> // für kein OLE im SdrClipboardFormat
#include <svx/svdorect.hxx>
-#include <svx/svdoedge.hxx> // fuer Konnektoren uebers Clipboard
-#include <svx/svdopage.hxx> // fuer Konnektoren uebers Clipboard
+#include <svx/svdoedge.hxx> // für Konnektoren uebers Clipboard
+#include <svx/svdopage.hxx> // für Konnektoren uebers Clipboard
#include <svx/svdpage.hxx>
#include <svx/svdpagv.hxx>
-#include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel
-#include "svx/svdstr.hrc" // Namen aus der Resource
-#include "svx/svdglob.hxx" // StringCache
+#include <svx/svdtrans.hxx> // Für GetMapFactor zum umskalieren bei PasteModel
+#include "svx/svdstr.hrc" // Names from resource
+#include "svx/svdglob.hxx" // StringCache
#include "svx/xoutbmp.hxx"
#include <vcl/metaact.hxx>
#include <svl/poolitem.hxx>
@@ -73,7 +71,7 @@ SdrExchangeView::SdrExchangeView(SdrModel* pModel1,
OutputDevice* pOut):
Point SdrExchangeView::GetViewCenter(const OutputDevice* pOut) const
{
Point aCenter;
- if (pOut==NULL)
+ if (pOut==NULL)
{
pOut = GetFirstOutputDevice();
}
@@ -136,10 +134,10 @@ sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt)
const
void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst)
{
- if (rpLst==NULL)
+ if (rpLst==NULL)
{
SdrPageView* pPV = GetSdrPageView();
-
+
if (pPV!=NULL) {
rpLst=pPV->GetObjList();
}
@@ -224,7 +222,7 @@ sal_Bool SdrExchangeView::Paste(const XubString& rStr,
const Point& rPos, SdrObj
pObj->SetMergedItemSet(aDefaultAttr);
- SfxItemSet aTempAttr(pMod->GetItemPool()); // Keine Fuellung oder Linie
+ SfxItemSet aTempAttr(pMod->GetItemPool()); // Keine Füllung oder Linie
aTempAttr.Put(XLineStyleItem(XLINE_NONE));
aTempAttr.Put(XFillStyleItem(XFILL_NONE));
@@ -260,13 +258,13 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const
String& rBaseURL, sal_uI
pObj->SetMergedItemSet(aDefaultAttr);
- SfxItemSet aTempAttr(pMod->GetItemPool()); // Keine Fuellung oder Linie
+ SfxItemSet aTempAttr(pMod->GetItemPool()); // Keine Füllung oder Linie
aTempAttr.Put(XLineStyleItem(XLINE_NONE));
aTempAttr.Put(XFillStyleItem(XFILL_NONE));
pObj->SetMergedItemSet(aTempAttr);
- pObj->NbcSetText(rInput,rBaseURL,eFormat);
+ pObj->NbcSetText(rInput,rBaseURL,eFormat);
pObj->FitFrameToTextSize();
Size aSiz(pObj->GetLogicRect().GetSize());
MapUnit eMap=pMod->GetScaleUnit();
@@ -278,7 +276,7 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const
String& rBaseURL, sal_uI
{
SdrOutliner& rOutliner = pObj->GetModel()->GetHitTestOutliner();
rOutliner.SetText(*pObj->GetOutlinerParaObject());
-
+
if(1L == rOutliner.GetParagraphCount())
{
SfxStyleSheet* pCandidate = rOutliner.GetStyleSheet(0L);
@@ -334,7 +332,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const
Point& rPos, SdrObjL
UnmarkAllObj();
// evtl. umskalieren bei unterschiedlicher MapUnit am Model
- // Dafuer erstmal die Faktoren berechnen
+ // Dafür erstmal die Faktoren berechnen
MapUnit eSrcUnit=pSrcMod->GetScaleUnit();
MapUnit eDstUnit=pMod->GetScaleUnit();
sal_Bool bResize=eSrcUnit!=eDstUnit;
@@ -373,32 +371,32 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod,
const Point& rPos, SdrObjL
const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
// #116235#
- SdrObject* pNeuObj = pSrcOb->Clone();
+ SdrObject* pNewObj = pSrcOb->Clone();
- if (pNeuObj!=NULL)
+ if (pNewObj!=NULL)
{
- if(bResize)
+ if(bResize)
{
-
pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139#
-
pNeuObj->NbcResize(aPt0,xResize,yResize);
-
pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139#
+
pNewObj->GetModel()->SetPasteResize(sal_True); // #51139#
+
pNewObj->NbcResize(aPt0,xResize,yResize);
+
pNewObj->GetModel()->SetPasteResize(sal_False); // #51139#
}
-
+
// #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();
-
+
if(pPg)
{
// #i72535#
const SdrLayerAdmin& rAd =
pPg->GetLayerAdmin();
SdrLayerID nLayer(0);
-
- if(pNeuObj->ISA(FmFormObj))
+
+ if(pNewObj->ISA(FmFormObj))
{
// for FormControls, force to
form layer
nLayer =
rAd.GetLayerID(rAd.GetControlLayerName(), true);
@@ -407,29 +405,29 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod,
const Point& rPos, SdrObjL
{
nLayer =
rAd.GetLayerID(aAktLayer, sal_True);
}
-
- if(SDRLAYER_NOTFOUND == nLayer)
+
+ if(SDRLAYER_NOTFOUND == nLayer)
{
nLayer = 0;
}
- pNeuObj->SetLayer(nLayer);
+ pNewObj->SetLayer(nLayer);
}
SdrInsertReason aReason(SDRREASON_VIEWCALL);
-
pDstLst->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
+
pDstLst->InsertObject(pNewObj,CONTAINER_APPEND,&aReason);
if( bUndo )
-
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
+
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNewObj));
if (bMark) {
// Markhandles noch nicht sofort setzen!
// Das erledigt das ModelHasChanged der
MarkView.
-
MarkObj(pNeuObj,pMarkPV,sal_False,sal_True);
+
MarkObj(pNewObj,pMarkPV,sal_False,sal_True);
}
// #i13033#
- aCloneList.AddPair(pSrcOb, pNeuObj);
+ aCloneList.AddPair(pSrcOb, pNewObj);
}
else
{
@@ -472,7 +470,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const
Point& rPos, SdrObjL
sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const
{
- return( FORMAT_PRIVATE == nFormat ||
+ return( FORMAT_PRIVATE == nFormat ||
FORMAT_GDIMETAFILE == nFormat ||
FORMAT_BITMAP == nFormat ||
FORMAT_RTF == nFormat ||
@@ -534,12 +532,12 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
if( AreObjectsMarked() )
{
- if(1 == GetMarkedObjectCount())
- {
- if(bNoVDevIfOneBmpMarked)
- {
- SdrObject* pGrafObjTmp = GetMarkedObjectByIndex( 0 );
- SdrGrafObj* pGrafObj = ( GetMarkedObjectCount() == 1 ) ?
PTR_CAST( SdrGrafObj, pGrafObjTmp ) : NULL;
+ if(1 == GetMarkedObjectCount())
+ {
+ if(bNoVDevIfOneBmpMarked)
+ {
+ SdrObject* pGrafObjTmp =
GetMarkedObjectByIndex( 0 );
+ SdrGrafObj* pGrafObj = (
GetMarkedObjectCount() == 1 ) ? PTR_CAST( SdrGrafObj, pGrafObjTmp ) : NULL;
if( pGrafObj && ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP
) )
{
@@ -554,8 +552,8 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
{
aBmp =
pSdrGrafObj->GetGraphic().getSvgData()->getReplacement();
}
- }
- }
+ }
+ }
if( !aBmp )
{
@@ -591,7 +589,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
const drawinglayer::geometry::ViewInformation2D
aViewInformation2D;
const basegfx::B2DRange aRange(
drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(
- xPrimitives,
+ xPrimitives,
aViewInformation2D));
if(!aRange.isEmpty())
@@ -603,7 +601,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
aRange,
500000);
}
- }
+ }
}
}
@@ -614,9 +612,9 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked)
const
{
- GDIMetaFile aMtf;
+ GDIMetaFile aMtf;
- if( AreObjectsMarked() )
+ if( AreObjectsMarked() )
{
Rectangle aBound( GetMarkedObjBoundRect() );
Size aBoundSize( aBound.GetWidth(), aBound.GetHeight() );
@@ -631,7 +629,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool
bNoVDevIfOneMtfMarked) co
{
Graphic aGraphic( pGrafObj->GetTransformedGraphic() );
- // #119735# just use GetGDIMetaFile, it will create a bufferd
version of contained bitmap now automatically
+ // #119735# just use GetGDIMetaFile, it will create a buffered
version of contained bitmap now automatically
aMtf = aGraphic.GetGDIMetaFile();
}
}
@@ -651,17 +649,17 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool
bNoVDevIfOneMtfMarked) co
aMtf.Stop();
aMtf.WindStart();
-
+
// moving the result is more reliable then setting a relative
MapMode at the VDev (used
// before), also see #i99268# in GetObjGraphic() below. Some draw
actions at
// the OutDev are simply not handled correctly when a MapMode is
set at the
- // target devive, e.g. MetaFloatTransparentAction. Even the Move
for this action
+ // target device, e.g. MetaFloatTransparentAction. Even the Move
for this action
// was missing the manipulation of the embedded Metafile
aMtf.Move(-aBound.Left(), -aBound.Top());
aMtf.SetPrefMapMode( aMap );
- // removed PrefSize extension. It is principially wrong
to set a reduced size at
+ // removed PrefSize extension. It is principally wrong
to set a reduced size at
// the created MetaFile. The mentioned errors occur at
output time since the integer
// MapModes from VCL lead to errors. It is now
corrected in the VCLRenderer for
// primitives (and may later be done in breaking up a
MetaFile to primitives)
@@ -676,7 +674,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool
bNoVDevIfOneMtfMarked) co
Graphic SdrExchangeView::GetAllMarkedGraphic() const
{
- Graphic aRet;
+ Graphic aRet;
if( AreObjectsMarked() )
{
@@ -686,21 +684,21 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const
aRet = GetMarkedObjMetaFile(false);
}
- return aRet;
+ return aRet;
}
//
-----------------------------------------------------------------------------
Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const
SdrObject* pObj )
{
- Graphic aRet;
+ Graphic aRet;
- if( pModel && pObj )
- {
- // try to get a graphic from the object first
+ if( pModel && pObj )
+ {
+ // try to get a graphic from the object first
const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj*
>(pObj);
const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj*
>(pObj);
-
+
if(pSdrGrafObj)
{
if(pSdrGrafObj->isEmbeddedSvg())
@@ -710,7 +708,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel*
pModel, const SdrObject*
}
else
{
- // #110981# Make behaviour coherent with metafile
+ // #110981# Make behavior coherent with metafile
// recording below (which of course also takes
// view-transformed objects)
aRet = pSdrGrafObj->GetTransformedGraphic();
@@ -746,15 +744,15 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel*
pModel, const SdrObject*
// moving the result directly
aMtf.Move(-aBoundRect.Left(), -aBoundRect.Top());
- aMtf.SetPrefMapMode( aMap );
+ aMtf.SetPrefMapMode( aMap );
aMtf.SetPrefSize( aBoundRect.GetSize() );
- if( aMtf.GetActionCount() )
- aRet = aMtf;
- }
- }
+ if( aMtf.GetActionCount() )
+ aRet = aMtf;
+ }
+ }
- return aRet;
+ return aRet;
}
//
-----------------------------------------------------------------------------
@@ -762,20 +760,20 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel*
pModel, const SdrObject*
::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const
{
SortMarkedObjects();
- ::std::vector< SdrObject* > aRetval;
+ ::std::vector< SdrObject* > aRetval;
- ::std::vector< ::std::vector< SdrMark* > > aObjVectors( 2 );
- ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
- ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
- const SdrLayerAdmin& rLayerAdmin =
pMod->GetLayerAdmin();
- const sal_uInt32 nControlLayerId =
rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
- sal_uInt32 n, nCount;
+ ::std::vector< ::std::vector< SdrMark* > > aObjVectors( 2 );
+ ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[
0 ];
+ ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[
1 ];
+ const SdrLayerAdmin& rLayerAdmin =
pMod->GetLayerAdmin();
+ const sal_uInt32 nControlLayerId =
rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
+ sal_uInt32 n, nCount;
for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
- {
- SdrMark* pMark = GetSdrMarkByIndex( n );
+ {
+ SdrMark* pMark = GetSdrMarkByIndex( n );
- // paint objects on control layer on top of all otherobjects
+ // paint objects on control layer on top of all other objects
if( nControlLayerId == pMark->GetMarkedSdrObj()->GetLayer() )
rObjVector2.push_back( pMark );
else
@@ -816,8 +814,8 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut)
const
SdrModel* SdrExchangeView::GetMarkedObjModel() const
{
- // Wenn das sortieren der MarkList mal stoeren sollte,
- // werde ich sie mir wohl kopieren muessen.
+ // Wenn das sortieren der MarkList mal stören sollte,
+ // werde ich sie mir wohl kopieren müssen.
SortMarkedObjects();
SdrModel* pNeuMod=pMod->AllocModel();
SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False);
@@ -825,42 +823,42 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
if( !mxSelectionController.is() ||
!mxSelectionController->GetMarkedObjModel( pNeuPag ) )
{
- ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
+ ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
// #i13033#
// New mechanism to re-create the connections of cloned
connectors
CloneList aCloneList;
- sal_uInt32 nCloneErrCnt(0);
+ sal_uInt32 nCloneErrCnt(0);
for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
{
const SdrObject* pObj = aSdrObjects[i];
- SdrObject* pNeuObj;
+ SdrObject* pNewObj;
if( pObj->ISA( SdrPageObj ) )
{
// convert SdrPageObj's to a graphic
representation, because
// virtual connection to referenced page gets
lost in new model
- pNeuObj = new SdrGrafObj( GetObjGraphic( pMod,
pObj ), pObj->GetLogicRect() );
- pNeuObj->SetPage( pNeuPag );
- pNeuObj->SetModel( pNeuMod );
+ pNewObj = new SdrGrafObj( GetObjGraphic( pMod,
pObj ), pObj->GetLogicRect() );
+ pNewObj->SetPage( pNeuPag );
+ pNewObj->SetModel( pNeuMod );
}
else
{
// #116235#
- // pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
- pNeuObj = pObj->Clone();
- pNeuObj->SetPage( pNeuPag );
- pNeuObj->SetModel( pNeuMod );
+ // pNewObj = pObj->Clone( pNeuPag, pNeuMod );
+ pNewObj = pObj->Clone();
+ pNewObj->SetPage( pNeuPag );
+ pNewObj->SetModel( pNeuMod );
}
- if( pNeuObj )
+ if( pNewObj )
{
SdrInsertReason aReason(SDRREASON_VIEWCALL);
-
pNeuPag->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
+
pNeuPag->InsertObject(pNewObj,CONTAINER_APPEND,&aReason);
// #i13033#
- aCloneList.AddPair(pObj, pNeuObj);
+ aCloneList.AddPair(pObj, pNewObj);
}
else
nCloneErrCnt++;
@@ -933,4 +931,4 @@ sal_Bool SdrExchangeView::Paste(Window* /*pWin*/,
sal_uIntPtr /*nFormat*/)
return sal_False;
}
-// eof
+/* vim: set noet sw=4 ts=4: */
