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 213ed6ee2f Translate German (Neu -> New), cleanup
213ed6ee2f is described below
commit 213ed6ee2ff775389784f4f3269d81154cf5c872
Author: mseidel <[email protected]>
AuthorDate: Fri Mar 21 15:00:11 2025 +0100
Translate German (Neu -> New), cleanup
(cherry picked from commit e9eb28911c9f73955f54794d304724ab1a9a37e1)
---
.../source/core/inc/ReportUndoFactory.hxx | 83 ++++----
.../source/core/sdr/ReportUndoFactory.cxx | 51 ++---
main/svx/inc/svx/svdundo.hxx | 228 +++++++++------------
main/svx/source/svdraw/svdopath.cxx | 38 ++--
main/svx/source/svdraw/svdorect.cxx | 12 +-
main/svx/source/svdraw/svdundo.cxx | 210 ++++++++-----------
6 files changed, 279 insertions(+), 343 deletions(-)
diff --git a/main/reportdesign/source/core/inc/ReportUndoFactory.hxx
b/main/reportdesign/source/core/inc/ReportUndoFactory.hxx
index dfd87a983f..1fce833e04 100644
--- a/main/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/main/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -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.
- *
+ *
*************************************************************/
-
#ifndef REPORT_UNDOFACTORY_HXX_INCLUDED
#define REPORT_UNDOFACTORY_HXX_INCLUDED
@@ -29,52 +28,54 @@
namespace rptui
{
- class OReportUndoFactory : public SdrUndoFactory
- {
- OModuleClient m_aModuleClient;
- ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory;
+ class OReportUndoFactory : public SdrUndoFactory
+ {
+ OModuleClient m_aModuleClient;
+ ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory;
- OReportUndoFactory(const OReportUndoFactory&);
- OReportUndoFactory& operator=(const OReportUndoFactory&);
- public:
- OReportUndoFactory();
- virtual ~OReportUndoFactory();
+ OReportUndoFactory(const OReportUndoFactory&);
+ OReportUndoFactory& operator=(const OReportUndoFactory&);
+ public:
+ OReportUndoFactory();
+ virtual ~OReportUndoFactory();
- // shapes
- virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject );
- virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject,
const Size& rDist );
- virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject );
- virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject,
bool bStyleSheet1 = false, bool bSaveText = false );
- virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject,
bool bOrdNumDirect = false);
- virtual SdrUndoAction* CreateUndoInsertObject( SdrObject& rObject,
bool bOrdNumDirect = false);
- virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject,
bool bOrdNumDirect = false);
- virtual SdrUndoAction* CreateUndoNewObject( SdrObject& rObject,
bool bOrdNumDirect = false);
- virtual SdrUndoAction* CreateUndoCopyObject( SdrObject& rObject,
bool bOrdNumDirect = false);
+ // shapes
+ virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject
);
+ virtual SdrUndoAction* CreateUndoMoveObject( SdrObject&
rObject, const Size& rDist );
+ virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject
);
+ virtual SdrUndoAction* CreateUndoAttrObject( SdrObject&
rObject, bool bStyleSheet1 = false, bool bSaveText = false );
+ virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject&
rObject, bool bOrdNumDirect = false);
+ virtual SdrUndoAction* CreateUndoInsertObject( SdrObject&
rObject, bool bOrdNumDirect = false);
+ virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject&
rObject, bool bOrdNumDirect = false);
+ virtual SdrUndoAction* CreateUndoNewObject( SdrObject& rObject,
bool bOrdNumDirect = false);
+ virtual SdrUndoAction* CreateUndoCopyObject( SdrObject&
rObject, bool bOrdNumDirect = false);
- virtual SdrUndoAction* CreateUndoObjectOrdNum( SdrObject& rObject,
sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
+ virtual SdrUndoAction* CreateUndoObjectOrdNum( SdrObject&
rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
- virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject&
rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false );
- virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject&
rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer );
- virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj,
sal_Int32 nText );
+ virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject&
rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false );
+ virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject&
rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer );
+ virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject&
rNewObj, sal_Int32 nText );
- // 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);
+ // 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
nNewPos1);
- // page
- virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
- virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
- virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
- virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg,
sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1);
+ // page
+ virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
+ virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
+ virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
+ virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg,
sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1);
- // master page
- virtual SdrUndoAction* CreateUndoPageRemoveMasterPage(SdrPage&
rChangedPage);
- virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage&
rChangedPage);
+ // master page
+ virtual SdrUndoAction* CreateUndoPageRemoveMasterPage(SdrPage&
rChangedPage);
+ virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage&
rChangedPage);
- };
+ };
//==============================================================================
} // rptui
//==============================================================================
#endif // REPORT_UNDOFACTORY_HXX_INCLUDED
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx
b/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 54bf68e3ef..acb13d0ae9 100644
--- a/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/main/reportdesign/source/core/sdr/ReportUndoFactory.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_reportdesign.hxx"
#include "ReportUndoFactory.hxx"
#include "RptObject.hxx"
@@ -28,34 +27,34 @@
namespace rptui
{
- using namespace ::com::sun::star;
+ using namespace ::com::sun::star;
//
-----------------------------------------------------------------------------
SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16
_nCommentId)
{
- OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject);
- if ( !pObj )
- return NULL;
- uno::Reference< report::XReportComponent> xReportComponent =
pObj->getReportComponent();
- uno::Reference< report::XSection> xSection = pObj->getSection();
- uno::Reference< report::XGroup> xGroup = xSection->getGroup();
- SdrUndoAction* pUndo = NULL;
- if ( xGroup.is() )
- pUndo = new
OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId);
- else
- pUndo = new
OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId);
- return pUndo;
+ OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject);
+ if ( !pObj )
+ return NULL;
+ uno::Reference< report::XReportComponent> xReportComponent =
pObj->getReportComponent();
+ uno::Reference< report::XSection> xSection = pObj->getSection();
+ uno::Reference< report::XGroup> xGroup = xSection->getGroup();
+ SdrUndoAction* pUndo = NULL;
+ if ( xGroup.is() )
+ pUndo = new
OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId);
+ else
+ pUndo = new
OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId);
+ return pUndo;
}
//
-----------------------------------------------------------------------------
DBG_NAME( rpt_OReportUndoFactory )
//
-----------------------------------------------------------------------------
OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory)
{
- DBG_CTOR( rpt_OReportUndoFactory,NULL);
+ DBG_CTOR( rpt_OReportUndoFactory,NULL);
}
//
-----------------------------------------------------------------------------
OReportUndoFactory::~OReportUndoFactory()
{
- DBG_DTOR( rpt_OReportUndoFactory,NULL);
+ DBG_DTOR( rpt_OReportUndoFactory,NULL);
}
///////////////////////////////////////////////////////////////////////
// shapes
@@ -86,12 +85,12 @@ SdrUndoAction* OReportUndoFactory::CreateUndoRemoveObject(
SdrObject& rObject, b
SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject,
bool /*bOrdNumDirect*/ )
{
- return lcl_createUndo(rObject,rptui::Inserted,RID_STR_UNDO_INSERT_CONTROL);
+ return
lcl_createUndo(rObject,rptui::Inserted,RID_STR_UNDO_INSERT_CONTROL);
}
SdrUndoAction* OReportUndoFactory::CreateUndoDeleteObject( SdrObject& rObject,
bool /*bOrdNumDirect*/ )
{
- return lcl_createUndo(rObject,rptui::Removed,RID_STR_UNDO_DELETE_CONTROL);
+ return
lcl_createUndo(rObject,rptui::Removed,RID_STR_UNDO_DELETE_CONTROL);
//return m_pUndoFactory->CreateUndoDeleteObject( rObject, bOrdNumDirect
? sal_True : sal_False );
}
@@ -136,9 +135,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
@@ -161,7 +160,7 @@ SdrUndoAction*
OReportUndoFactory::CreateUndoSetPageNum(SdrPage& rNewPg, sal_uIn
{
return m_pUndoFactory->CreateUndoSetPageNum( rNewPg, nOldPageNum1,
nNewPageNum1 );
}
- // master page
+// master page
SdrUndoAction* OReportUndoFactory::CreateUndoPageRemoveMasterPage(SdrPage&
rChangedPage)
{
return m_pUndoFactory->CreateUndoPageRemoveMasterPage( rChangedPage );
@@ -175,3 +174,5 @@ SdrUndoAction*
OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan
//==================================================================
} //rptui
//==================================================================
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/inc/svx/svdundo.hxx b/main/svx/inc/svx/svdundo.hxx
index da2d6919ce..f33b705c4f 100644
--- a/main/svx/inc/svx/svdundo.hxx
+++ b/main/svx/inc/svx/svdundo.hxx
@@ -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.
- *
+ *
*************************************************************/
-
-
#ifndef _SVDUNDO_HXX
#define _SVDUNDO_HXX
@@ -36,7 +34,7 @@
#include <svl/style.hxx>
//************************************************************
-// Vorausdeklarationen
+// Vorausdeklarationen
//************************************************************
class SfxItemSet;
@@ -53,7 +51,7 @@ class SdrObjGeoData;
class OutlinerParaObject;
//************************************************************
-// SdrUndoAction
+// SdrUndoAction
//
// Abstrakte Basisklasse fuer alle UndoActions der DrawingEngine
//
@@ -84,12 +82,12 @@ public:
};
//************************************************************
-// SdrUndoGroup
+// SdrUndoGroup
//
// Zusammenfassung beliebig vieler einzelner UndoActions zu einer einzigen
-// UndoAction. Beim Undo() werden die Einzelactions rueckwaets aufgerufen
-// (die zuletzt angehaengte zuerst...), beim Redo() dagegen entspricht die
-// Aufrufreihenfolge der Einfuegereihenfolge.
+// UndoAction. Beim Undo() werden die Einzelactions rückwärts aufgerufen
+// (die zuletzt angehängte zuerst...), beim Redo() dagegen entspricht die
+// Aufrufreihenfolge der Einfügereihenfolge.
//
//************************************************************
@@ -130,9 +128,9 @@ public:
};
//************************************************************
-// SdrUndoObj
+// SdrUndoObj
//
-// Abstrakte Basisklasse fuer alle UndoActions die mit Objekten zu tun haben.
+// Abstrakte Basisklasse für alle UndoActions die mit Objekten zu tun haben.
//
//************************************************************
@@ -149,16 +147,16 @@ protected:
static void GetDescriptionStringForObject( const SdrObject&
_rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False
);
- // #94278# new method for evtl. PageChange at UNDO/REDO
+ // #94278# new method for evtl. PageChange at UNDO/REDO
void ImpShowPageOfThisObject();
};
//************************************************************
-// SdrUndoAttrObj
+// SdrUndoAttrObj
//
-// Aenderung der Objektattribute.
+// Änderung der Objektattribute.
// Action direkt vor dem Setzen der neuen Attribute konstruieren.
-// Auch fuer StyleSheets
+// Auch für StyleSheets
//
//************************************************************
@@ -170,8 +168,8 @@ protected:
SfxItemSet* pRepeatSet;
// oder besser den StyleSheetNamen merken?
- rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
- rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet;
+ rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
+ rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet;
FASTBOOL bStyleSheet;
FASTBOOL bHaveToTakeRedoSet;
@@ -184,8 +182,8 @@ protected:
// Wenn sich um ein Gruppenobjekt handelt:
SdrUndoGroup* pUndoGroup;
- // helper to ensure StyleSheet is in pool (provided by SdrModel from
SdrObject)
- void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool&
rStyleSheetPool, SfxStyleSheet& rSheet);
+ // helper to ensure StyleSheet is in pool (provided by SdrModel from
SdrObject)
+ void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool&
rStyleSheetPool, SfxStyleSheet& rSheet);
public:
SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False,
FASTBOOL bSaveText=sal_False);
@@ -203,9 +201,9 @@ public:
};
//************************************************************
-// SdrUndoMoveObj
+// SdrUndoMoveObj
//
-// Blosses verschieben eines Objektes.
+// Bloßes verschieben eines Objektes.
// Action direkt vor dem Verschieben konstruieren.
//
//************************************************************
@@ -213,7 +211,7 @@ public:
class SVX_DLLPUBLIC SdrUndoMoveObj : public SdrUndoObj
{
protected:
- Size aDistance; //
Entfernung, um die verschoben wird
+ Size aDistance; //
Entfernung, um die verschoben wird
public:
SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {}
@@ -234,9 +232,9 @@ public:
};
//************************************************************
-// SdrUndoGeoObj
+// SdrUndoGeoObj
//
-// Aenderung der Geometrie eines Objektes.
+// Änderung der Geometrie eines Objektes.
// Action direkt vor der geometrischen Transformation konstruieren.
//
//************************************************************
@@ -260,7 +258,7 @@ public:
};
//************************************************************
-// SdrUndoObjList
+// SdrUndoObjList
//
// Manipulationen an einer ObjList: Neues Obj, DeleteObj, SetObjZLevel,
Grouping, ...
// Abstrakte Basisklasse.
@@ -268,14 +266,14 @@ public:
//************************************************************
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
- bool bOwner;
+ bool bOwner;
protected:
SdrObjList* pObjList;
SdrView* pView; // um bei
ObjDel, Undo die
SdrPageView* pPageView; // Selektion
widerherstellen zu koennen
sal_uInt32 nOrdNum;
- // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
+ // Bei einem Undo/Redo findet möglicherweise Übereignung des Objektes
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
protected:
@@ -288,10 +286,10 @@ protected:
};
//************************************************************
-// SdrUndoRemoveObj
+// SdrUndoRemoveObj
//
// Entfernen Objekts aus einer Objektliste. Innerhalb einer UndoGroup
-// mit korrospondierenden Inserts zu verwenden.
+// mit korrespondierenden Inserts zu verwenden.
// Action vor dem entfernen aus der ObjList konstruieren.
//
//************************************************************
@@ -307,10 +305,10 @@ public:
};
//************************************************************
-// SdrUndoInsertObj
+// SdrUndoInsertObj
//
-// Einfuegen Objekts in eine Objektliste. Innerhalb einer UndoGroup
-// mit korrospondierenden Removes zu verwenden.
+// Einfügen Objekts in eine Objektliste. Innerhalb einer UndoGroup
+// mit korrespondierenden Removes zu verwenden.
// Action vor dem entfernen aus der ObjList konstruieren.
//
//************************************************************
@@ -326,9 +324,9 @@ public:
};
//************************************************************
-// SdrUndoDelObj
+// SdrUndoDelObj
//
-// Loeschen eines Objekts.
+// Löschen eines Objekts.
// Action vor dem entfernen aus der ObjList konstruieren.
//
//************************************************************
@@ -336,27 +334,27 @@ public:
class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
{
private:
- void TryToFlushGraphicContent();
+ void TryToFlushGraphicContent();
public:
- SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False);
- virtual ~SdrUndoDelObj();
+ SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False);
+ virtual ~SdrUndoDelObj();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo();
+ virtual void Redo();
- virtual String GetComment() const;
- virtual String GetSdrRepeatComment(SdrView& rView) const;
+ virtual String GetComment() const;
+ virtual String GetSdrRepeatComment(SdrView& rView) const;
- virtual void SdrRepeat(SdrView& rView);
- virtual bool CanSdrRepeat(SdrView& rView) const;
+ virtual void SdrRepeat(SdrView& rView);
+ virtual bool CanSdrRepeat(SdrView& rView) const;
};
//************************************************************
-// SdrUndoNewObj
+// SdrUndoNewObj
//
-// Einfuegen eines neuen Objektes.
-// Action nach dem einfuegen in die ObjList konstruieren.
+// Einfügen eines neuen Objektes.
+// Action nach dem einfügen in die ObjList konstruieren.
//
//************************************************************
@@ -372,11 +370,11 @@ public:
virtual String GetComment() const;
- static String GetComment( const SdrObject& _rForObject );
+ static String GetComment( const SdrObject& _rForObject );
};
//************************************************************
-// SdrUndoReplaceObj
+// SdrUndoReplaceObj
//
// Austausch eines Objektes.
// Action vor dem Replace an der ObjList konstruieren.
@@ -385,8 +383,8 @@ public:
class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
{
- bool bOldOwner;
- bool bNewOwner;
+ bool bOldOwner;
+ bool bNewOwner;
protected:
SdrObjList* pObjList;
@@ -408,10 +406,10 @@ public:
};
//************************************************************
-// SdrUndoCopyObj
+// SdrUndoCopyObj
//
// Kopieren eines Objekts
-// Action nach dem einfuegen in die ObjList konstruieren.
+// Action nach dem einfügen in die ObjList konstruieren.
//
//************************************************************
@@ -426,7 +424,7 @@ public:
};
//************************************************************
-// SdrUndoObjOrdNum
+// SdrUndoObjOrdNum
//************************************************************
class SdrUndoObjOrdNum : public SdrUndoObj
@@ -463,7 +461,7 @@ public:
};
//************************************************************
-// SdrUndoObjSetText
+// SdrUndoObjSetText
//************************************************************
class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj
@@ -496,48 +494,40 @@ public:
class SdrUndoObjStrAttr : public SdrUndoObj
{
public:
- enum ObjStrAttrType
- {
- OBJ_NAME,
- OBJ_TITLE,
- OBJ_DESCRIPTION
- };
+ enum ObjStrAttrType
+ {
+ OBJ_NAME,
+ OBJ_TITLE,
+ OBJ_DESCRIPTION
+ };
protected:
- const ObjStrAttrType meObjStrAttr;
- const String msOldStr;
- const String msNewStr;
+ const ObjStrAttrType meObjStrAttr;
+ const String msOldStr;
+ const String msNewStr;
public:
- SdrUndoObjStrAttr( SdrObject& rNewObj,
+ SdrUndoObjStrAttr( SdrObject& rNewObj,
const ObjStrAttrType eObjStrAttr,
const String& sOldStr,
const String& sNewStr);
virtual ~SdrUndoObjStrAttr() {}
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo();
+ virtual void Redo();
- virtual String GetComment() const;
+ virtual String GetComment() const;
};
// <--
////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@@@ @@ @@ @@@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@@ @@@@ @@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@ @@ @@ @@@@@ @@ @@
-//
+// LAYER
////////////////////////////////////////////////////////////////////////////////////////////////////
//************************************************************
-// SdrUndoLayer
+// SdrUndoLayer
//
-// Abstrakte Basisklasse fuer alle UndoActions die mit SdrLayer zu tun haben.
+// Abstrakte Basisklasse für alle UndoActions die mit SdrLayer zu tun haben.
//
//************************************************************
@@ -556,9 +546,9 @@ public:
};
//************************************************************
-// SdrUndoNewLayer
+// SdrUndoNewLayer
//
-// Einfuegen eines neuen Layer. Action nach dem Einfuegen konstruieren.
+// Einfügen eines neuen Layer. Action nach dem Einfügen konstruieren.
//
//************************************************************
@@ -576,9 +566,9 @@ public:
};
//************************************************************
-// SdrUndoDelLayer
+// SdrUndoDelLayer
//
-// Loeschen eines Layer. Action vor dem Remove konstruieren
+// Löschen eines Layer. Action vor dem Remove konstruieren
//
//************************************************************
@@ -596,7 +586,7 @@ public:
};
//************************************************************
-// SdrUndoMoveLayer
+// SdrUndoMoveLayer
//
// Verschieben eines Layer. Action vor dem Verschieben konstruieren.
//
@@ -604,11 +594,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 ~SdrUndoMoveLayer() {}
virtual void Undo();
@@ -618,21 +608,13 @@ public:
};
////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@@@@ @@@@@ @@@@
-//
+// PAGES
////////////////////////////////////////////////////////////////////////////////////////////////////
//************************************************************
-// SdrUndoPage
+// SdrUndoPage
//
-// Abstrakte Basisklasse fuer alle UndoActions die mit SdrPages zu tun haben.
+// Abstrakte Basisklasse für alle UndoActions die mit SdrPages zu tun haben.
//
//************************************************************
@@ -654,7 +636,7 @@ protected:
};
//************************************************************
-// SdrUndoPageList
+// SdrUndoPageList
//
// Manipulationen an einer PageList: Neue Page, DeletePage,
MovePage(ChangePageNum)
// Abstrakte Basisklasse.
@@ -666,7 +648,7 @@ class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
protected:
sal_uInt16 nPageNum;
- // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page
+ // Bei einem Undo/Redo findet möglicherweise Übereignung der Page
// statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE
FASTBOOL bItsMine;
@@ -676,9 +658,9 @@ protected:
};
//************************************************************
-// SdrUndoDelPage
+// SdrUndoDelPage
//
-// Loeschen einer Page.
+// Löschen einer Page.
// Action vor dem entfernen aus der List konstruieren.
//
//************************************************************
@@ -704,10 +686,10 @@ public:
};
//************************************************************
-// SdrUndoNewPage
+// SdrUndoNewPage
//
-// Einfuegen einer neuen Page.
-// Action nach dem einfuegen in die Liste konstruieren.
+// Einfügen einer neuen Page.
+// Action nach dem einfügen in die Liste konstruieren.
//
//************************************************************
@@ -724,10 +706,10 @@ public:
};
//************************************************************
-// SdrUndoCopyPage
+// SdrUndoCopyPage
//
// Kopieren einer Page
-// Action nach dem einfuegen in die Liste konstruieren.
+// Action nach dem einfügen in die Liste konstruieren.
//
//************************************************************
@@ -745,7 +727,7 @@ public:
};
//************************************************************
-// SdrUndoSetPageNum
+// SdrUndoSetPageNum
//
// Verschieben der Page innerhalb der Liste
// Action vor dem Verschieben der Page konstruieren.
@@ -770,19 +752,11 @@ public:
};
////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@ @@@@ @@@@ @@@@@@ @@@@@ @@@@@ @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@@@@ @@@@@@ @@@@ @@ @@@@ @@@@@ @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@ @@ @@ @@ @@@@ @@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@@@@ @@@@
-//
+// MASTERPAGES
////////////////////////////////////////////////////////////////////////////////////////////////////
//************************************************************
-// SdrUndoPageMasterPage
+// SdrUndoPageMasterPage
//
// Abstrakte Basisklasse fuer alle UndoActions die mit
// MasterPage-Beziehungen zu tun haben.
@@ -804,7 +778,7 @@ public:
};
//************************************************************
-// SdrUndoPageRemoveMasterPage
+// SdrUndoPageRemoveMasterPage
//
// Entfernen einer MasterPage von einer Zeichenseite.
// Action vor dem Entfernen des MasterPageDescriptors erzeugen.
@@ -823,10 +797,10 @@ public:
};
//************************************************************
-// SdrUndoPageChangeMasterPage
+// SdrUndoPageChangeMasterPage
//
-// Aenderung des MasterPageDescriptors (z.B. Aendern der VisibleLayer).
-// Action vor der Aenderung am MasterPageDescriptor erzeugen.
+// Änderung des MasterPageDescriptors (z.B. ändern der VisibleLayer).
+// Action vor der Änderung am MasterPageDescriptor erzeugen.
//
//************************************************************
@@ -857,7 +831,7 @@ class SVX_DLLPUBLIC SdrUndoFactory
{
public:
// shapes
- virtual ~SdrUndoFactory();
+ virtual ~SdrUndoFactory();
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject );
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const
Size& rDist );
virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject );
@@ -884,7 +858,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);
@@ -900,3 +874,5 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
#endif //_SVDUNDO_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdopath.cxx
b/main/svx/source/svdraw/svdopath.cxx
index 033f97cf67..b07d7d5162 100644
--- a/main/svx/source/svdraw/svdopath.cxx
+++ b/main/svx/source/svdraw/svdopath.cxx
@@ -662,7 +662,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
{
mpSdrPathDragData->ResetPoly(mrSdrPathObject);
- // Div. Daten lokal Kopieren fuer weniger Code und schnelleren
Zugriff
+ // Div. Daten lokal Kopieren für weniger Code und schnelleren
Zugriff
FASTBOOL bClosed =mpSdrPathDragData->bClosed ; //
geschlossenes Objekt?
sal_uInt16 nPnt =mpSdrPathDragData->nPnt ;
// Punktnummer innerhalb des obigen Polygons
FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; //
Gedraggter Punkt ist der Anfangspunkt einer Polyline
@@ -672,10 +672,10 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; //
Vorheriger Punkt ist Anfangspunkt einer Polyline
FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; //
Folgepunkt ist Endpunkt einer Polyline
sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ;
// Index des vorvorherigen Punkts
- sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des uebernächsten Punkts
+ sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ;
// Index des übernächsten Punkts
FASTBOOL bControl =mpSdrPathDragData->bControl ; //
Punkt ist ein Kontrollpunkt
- //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; //
Punkt ist Kontrollpunkt vor einem Stützpunkt
+ FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; //
Punkt ist Kontrollpunkt hinter einem Stützpunkt
FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; //
Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; //
Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
@@ -685,8 +685,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
Point aPos(rDrag.GetNow()); // die aktuelle
Position
Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der
gedraggte Punkt
sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine
Nachbarpunkte
- Point aNeuPos1,aNeuPos2; // die neuen
Alternativen fuer aPos
- FASTBOOL bPnt1=sal_False,bPnt2=sal_False; // die neuen
Alternativen gueltig?
+ Point aNewPos1,aNewPos2; // die neuen
Alternativen für aPos
+ FASTBOOL bPnt1=sal_False,bPnt2=sal_False; // die neuen
Alternativen gültig?
if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { //
Mind. 2 Pt bei Linien
if (!bBegPnt) nPnt1=nPrevPnt;
if (!bEndPnt) nPnt2=nNextPnt;
@@ -711,9 +711,9 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
FASTBOOL bVer=bVLin || (!bHLin &&
(nXFact<=nYFact)==bBigOrtho);
if (bHor) ndy=long(ndy0*nXFact);
if (bVer) ndx=long(ndx0*nYFact);
- aNeuPos1=aPnt1;
- aNeuPos1.X()+=ndx;
- aNeuPos1.Y()+=ndy;
+ aNewPos1=aPnt1;
+ aNewPos1.X()+=ndx;
+ aNewPos1.Y()+=ndy;
}
}
if (nPnt2!=0xFFFF && !bNextIsControl) {
@@ -732,23 +732,23 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
FASTBOOL bVer=bVLin || (!bHLin &&
(nXFact<=nYFact)==bBigOrtho);
if (bHor) ndy=long(ndy0*nXFact);
if (bVer) ndx=long(ndx0*nYFact);
- aNeuPos2=aPnt2;
- aNeuPos2.X()+=ndx;
- aNeuPos2.Y()+=ndy;
+ aNewPos2=aPnt2;
+ aNewPos2.X()+=ndx;
+ aNewPos2.Y()+=ndy;
}
}
if (bPnt1 && bPnt2) { // beide Alternativen vorhanden
(Konkurenz)
- BigInt nX1(aNeuPos1.X()-aPos.X()); nX1*=nX1;
- BigInt nY1(aNeuPos1.Y()-aPos.Y()); nY1*=nY1;
- BigInt nX2(aNeuPos2.X()-aPos.X()); nX2*=nX2;
- BigInt nY2(aNeuPos2.Y()-aPos.Y()); nY2*=nY2;
+ BigInt nX1(aNewPos1.X()-aPos.X()); nX1*=nX1;
+ BigInt nY1(aNewPos1.Y()-aPos.Y()); nY1*=nY1;
+ BigInt nX2(aNewPos2.X()-aPos.X()); nX2*=nX2;
+ BigInt nY2(aNewPos2.Y()-aPos.Y()); nY2*=nY2;
nX1+=nY1; // Korrekturabstand zum Quadrat
nX2+=nY2; // Korrekturabstand zum Quadrat
// Die Alternative mit dem geringeren
Korrekturbedarf gewinnt
if (nX1<nX2) bPnt2=sal_False; else
bPnt1=sal_False;
}
- if (bPnt1) rDrag.Now()=aNeuPos1;
- if (bPnt2) rDrag.Now()=aNeuPos2;
+ if (bPnt1) rDrag.Now()=aNewPos1;
+ if (bPnt2) rDrag.Now()=aNewPos2;
}
rDrag.SetActionRect(Rectangle(rDrag.GetNow(),rDrag.GetNow()));
@@ -821,7 +821,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat&
rDrag ) const
mpSdrPathDragData->aXP.CalcSmoothJoin(nPnt,nPrevPnt,nNextPnt);
}
}
- // Und nun noch die anderen Enden der Strecken
ueberpruefen (nPnt+-1).
+ // Und nun noch die anderen Enden der Strecken
überprüfen (nPnt+-1).
// Ist dort eine Kurve (IsControl(nPnt+-2)) mit
SmoothJoin (nPnt+-1),
// so muss der entsprechende Kontrollpunkt (nPnt+-2)
angepasst werden.
if (!bBegPnt && !bPrevIsControl && !bPrevIsBegPnt &&
mpSdrPathDragData->aXP.IsSmooth(nPrevPnt)) {
diff --git a/main/svx/source/svdraw/svdorect.cxx
b/main/svx/source/svdraw/svdorect.cxx
index 3f8e3aac1c..3d34a393eb 100644
--- a/main/svx/source/svdraw/svdorect.cxx
+++ b/main/svx/source/svdraw/svdorect.cxx
@@ -140,19 +140,19 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle&
rRect1, long nRad1) const
{
XPolygon aXPoly(rRect1,nRad1,nRad1);
const sal_uInt16 nPointCount(aXPoly.GetPointCount());
- XPolygon aNeuPoly(nPointCount+1);
+ XPolygon aNewPoly(nPointCount+1);
sal_uInt16 nShift=nPointCount-2;
if (nRad1!=0) nShift=nPointCount-5;
sal_uInt16 j=nShift;
for (sal_uInt16 i=1; i<nPointCount; i++) {
- aNeuPoly[i]=aXPoly[j];
- aNeuPoly.SetFlags(i,aXPoly.GetFlags(j));
+ aNewPoly[i]=aXPoly[j];
+ aNewPoly.SetFlags(i,aXPoly.GetFlags(j));
j++;
if (j>=nPointCount) j=1;
}
- aNeuPoly[0]=rRect1.BottomCenter();
- aNeuPoly[nPointCount]=aNeuPoly[0];
- aXPoly=aNeuPoly;
+ aNewPoly[0]=rRect1.BottomCenter();
+ aNewPoly[nPointCount]=aNewPoly[0];
+ aXPoly=aNewPoly;
// Die Winkelangaben beziehen sich immer auf die linke obere Ecke von
!aRect!
if (aGeo.nShearWink!=0) ShearXPoly(aXPoly,aRect.TopLeft(),aGeo.nTan);
diff --git a/main/svx/source/svdraw/svdundo.cxx
b/main/svx/source/svdraw/svdundo.cxx
index 1678cf38ae..1870149cef 100644
--- a/main/svx/source/svdraw/svdundo.cxx
+++ b/main/svx/source/svdraw/svdundo.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"
@@ -32,8 +30,8 @@
#include <svx/svdlayer.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdview.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/scene3d.hxx>
#include <editeng/outlobj.hxx>
#include <svx/svdogrp.hxx>
@@ -49,13 +47,11 @@
// #124389#
#include <svx/svdotable.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
// iterates over all views and unmarks this SdrObject if it is marked
static void ImplUnmarkObject( SdrObject* pObj )
{
- SdrViewIter aIter( pObj );
- for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
+ SdrViewIter aIter( pObj );
+ for ( SdrView* pView = aIter.FirstView(); pView; pView =
aIter.NextView() )
{
pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True );
}
@@ -76,7 +72,7 @@ void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
{
SdrView* pV=PTR_CAST(SdrView,&rView);
if (pV!=NULL) SdrRepeat(*pV);
- DBG_ASSERT(pV!=NULL,"Repeat: Uebergebenes SfxRepeatTarget ist keine
SdrView");
+ DBG_ASSERT(pV!=NULL,"Repeat: Übergebenes SfxRepeatTarget ist keine
SdrView");
}
XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
@@ -226,17 +222,7 @@ XubString SdrUndoGroup::GetSdrRepeatComment(SdrView&
/*rView*/) const
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@@@ @@ @@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
+// OBJECTS
////////////////////////////////////////////////////////////////////////////////////////////////////
SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
@@ -273,8 +259,8 @@ void SdrUndoObj::GetDescriptionStringForObject( const
SdrObject& _rForObject, sa
void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString&
rStr, FASTBOOL bRepeat) const
{
- if ( pObj )
- GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
+ if ( pObj )
+ GetDescriptionStringForObject( *pObj, nStrCacheID, rStr,
bRepeat );
}
// #94278# common call method for evtl. page change when UNDO/REDO
@@ -296,18 +282,18 @@ void SdrUndoObj::ImpShowPageOfThisObject()
void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool&
rStyleSheetPool, SfxStyleSheet& rSheet)
{
- SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(),
rSheet.GetFamily());
+ SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(),
rSheet.GetFamily());
- if(!pThere)
- {
- // re-insert remembered style which was removed in the meantime. To do
this
- // without assertion, do it without parent and set parent after
insertion
- const UniString aParent(rSheet.GetParent());
-
- rSheet.SetParent(UniString());
- rStyleSheetPool.Insert(&rSheet);
- rSheet.SetParent(aParent);
- }
+ if(!pThere)
+ {
+ // re-insert remembered style which was removed in the
meantime. To do this
+ // without assertion, do it without parent and set parent after
insertion
+ const UniString aParent(rSheet.GetParent());
+
+ rSheet.SetParent(UniString());
+ rStyleSheetPool.Insert(&rSheet);
+ rSheet.SetParent(aParent);
+ }
}
SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1,
FASTBOOL bSaveText)
@@ -315,8 +301,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL
bStyleSheet1, FASTBO
pUndoSet(NULL),
pRedoSet(NULL),
pRepeatSet(NULL),
- mxUndoStyleSheet(),
- mxRedoStyleSheet(),
+ mxUndoStyleSheet(),
+ mxRedoStyleSheet(),
bHaveToTakeRedoSet(sal_True),
pTextUndo(NULL),
@@ -354,7 +340,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL
bStyleSheet1, FASTBO
pUndoSet = new SfxItemSet(pObj->GetMergedItemSet());
if(bStyleSheet)
- mxUndoStyleSheet = pObj->GetStyleSheet();
+ mxUndoStyleSheet = pObj->GetStyleSheet();
if(bSaveText)
{
@@ -393,7 +379,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
void SdrUndoAttrObj::Undo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObj);
+ E3DModifySceneSnapRectUpdater aUpdater(pObj);
sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
// #94278# Trigger PageChangeCall
@@ -428,17 +414,17 @@ void SdrUndoAttrObj::Undo()
if(bStyleSheet)
{
mxRedoStyleSheet = pObj->GetStyleSheet();
- SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet*
>(mxUndoStyleSheet.get());
+ SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet*
>(mxUndoStyleSheet.get());
- if(pSheet && pObj->GetModel() &&
pObj->GetModel()->GetStyleSheetPool())
- {
-
ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(),
*pSheet);
- pObj->SetStyleSheet(pSheet, sal_True);
- }
- else
- {
- OSL_ENSURE(false, "OOps, something went wrong in
SdrUndoAttrObj (!)");
- }
+ if(pSheet && pObj->GetModel() &&
pObj->GetModel()->GetStyleSheetPool())
+ {
+
ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(),
*pSheet);
+ pObj->SetStyleSheet(pSheet, sal_True);
+ }
+ else
+ {
+ OSL_ENSURE(false, "OOps, something went wrong
in SdrUndoAttrObj (!)");
+ }
}
sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -504,7 +490,7 @@ void SdrUndoAttrObj::Undo()
void SdrUndoAttrObj::Redo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObj);
+ E3DModifySceneSnapRectUpdater aUpdater(pObj);
sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
if(!pUndoGroup || bIs3DScene)
@@ -684,7 +670,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
if (pOL!=NULL && pOL->GetObjCount() && !rNewObj.ISA(E3dScene))
{
// Aha, Gruppenobjekt
- // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den
Undo anlegen
+ // AW: Aber keine 3D-Szene, dann nur für die Szene selbst den
Undo anlegen
pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
sal_uIntPtr nObjAnz=pOL->GetObjCount();
for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
@@ -771,10 +757,10 @@ SdrUndoObjList::~SdrUndoObjList()
{
if (pObj!=NULL && IsOwner())
{
- // Attribute muessen wieder in den regulaeren Pool
+ // Attribute müssen wieder in den regulären Pool
SetOwner(sal_False);
- // nun loeschen
+ // nun löschen
SdrObject::Free( pObj );
}
}
@@ -905,16 +891,16 @@ void SdrUndoDelObj::TryToFlushGraphicContent()
}
SdrUndoDelObj::SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect)
-: SdrUndoRemoveObj(rNewObj,bOrdNumDirect)
-{
- SetOwner(sal_True);
+: SdrUndoRemoveObj(rNewObj,bOrdNumDirect)
+{
+ SetOwner(sal_True);
- // #122985# if graphic object is deleted (but goes to undo) flush it's
graphic content
- // since it is potentially no longer needed
- TryToFlushGraphicContent();
+ // #122985# if graphic object is deleted (but goes to undo) flush its
graphic content
+ // since it is potentially no longer needed
+ TryToFlushGraphicContent();
}
-SdrUndoDelObj::~SdrUndoDelObj()
+SdrUndoDelObj::~SdrUndoDelObj()
{
}
@@ -931,9 +917,9 @@ void SdrUndoDelObj::Redo()
DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der
UndoAction");
SetOwner(sal_True);
- // #122985# if graphic object is deleted (but goes to undo) flush it's
graphic content
- // since it is potentially no longer needed
- TryToFlushGraphicContent();
+ // #122985# if graphic object is deleted (but goes to undo) flush its
graphic content
+ // since it is potentially no longer needed
+ TryToFlushGraphicContent();
}
XubString SdrUndoDelObj::GetComment() const
@@ -965,22 +951,22 @@ XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView&
/*rView*/) const
void SdrUndoNewObj::Undo()
{
SdrUndoInsertObj::Undo();
- DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der
UndoAction");
+ DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehört bereits der UndoAction");
SetOwner(sal_True);
}
void SdrUndoNewObj::Redo()
{
SdrUndoInsertObj::Redo();
- DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction");
+ DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehört nicht der UndoAction");
SetOwner(sal_False);
}
String SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
{
- String sComment;
- GetDescriptionStringForObject( _rForObject, STR_UndoInsertObj, sComment );
- return sComment;
+ String sComment;
+ GetDescriptionStringForObject( _rForObject, STR_UndoInsertObj, sComment
);
+ return sComment;
}
XubString SdrUndoNewObj::GetComment() const
@@ -1010,18 +996,18 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
{
if (pObj!=NULL && IsOldOwner())
{
- // Attribute muessen wieder in den regulaeren Pool
+ // Attribute müssen wieder in den regulären Pool
SetOldOwner(sal_False);
- // nun loeschen
+ // nun löschen
SdrObject::Free( pObj );
}
if (pNewObj!=NULL && IsNewOwner())
{
- // Attribute muessen wieder in den regulaeren Pool
+ // Attribute müssen wieder in den regulären Pool
SetNewOwner(sal_False);
- // nun loeschen
+ // nun löschen
SdrObject::Free( pNewObj );
}
}
@@ -1190,25 +1176,25 @@ void SdrUndoObjSetText::AfterSetText()
void SdrUndoObjSetText::Undo()
{
- // only works with SdrTextObj
- SdrTextObj* pTarget = dynamic_cast< SdrTextObj* >(pObj);
+ // only works with SdrTextObj
+ SdrTextObj* pTarget = dynamic_cast< SdrTextObj* >(pObj);
- if(!pTarget)
- {
- OSL_ENSURE(false, "SdrUndoObjSetText::Undo with SdrObject not based on
SdrTextObj (!)");
- return;
- }
+ if(!pTarget)
+ {
+ OSL_ENSURE(false, "SdrUndoObjSetText::Undo with SdrObject not
based on SdrTextObj (!)");
+ return;
+ }
- // #94278# Trigger PageChangeCall
- ImpShowPageOfThisObject();
+ // #94278# Trigger PageChangeCall
+ ImpShowPageOfThisObject();
- // alten Text sichern fuer Redo
+ // alten Text sichern für Redo
if(!bNewTextAvailable)
{
AfterSetText();
}
- // Text fuer Undo kopieren, denn SetOutlinerParaObject() ist
Eigentumsuebereignung
+ // Text für Undo kopieren, denn SetOutlinerParaObject() ist
Eigentumsübereignung
OutlinerParaObject* pText1 = pOldText;
if(pText1)
@@ -1249,7 +1235,7 @@ void SdrUndoObjSetText::Redo()
return;
}
- // Text fuer Undo kopieren, denn SetOutlinerParaObject() ist
Eigentumsuebereignung
+ // Text für Undo kopieren, denn SetOutlinerParaObject() ist
Eigentumsübereignung
OutlinerParaObject* pText1 = pNewText;
if(pText1)
@@ -1266,7 +1252,7 @@ void SdrUndoObjSetText::Redo()
pTarget->ActionChanged();
- // #124389# if it's a table, als oneed to relayout TextFrame
+ // #124389# if it's a table, also need to relayout TextFrame
if(0 != dynamic_cast< sdr::table::SdrTableObj* >(pTarget))
{
pTarget->NbcAdjustTextFrameWidthAndHeight();
@@ -1430,17 +1416,7 @@ String SdrUndoObjStrAttr::GetComment() const
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@@@ @@ @@ @@@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@@ @@@@ @@@@ @@@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@ @@ @@ @@@@@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
+// LAYER
////////////////////////////////////////////////////////////////////////////////////////////////////
SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin&
rNewLayerAdmin, SdrModel& rNewModel):
@@ -1516,7 +1492,7 @@ void SdrUndoMoveLayer::Undo()
#ifdef DBG_UTIL
SdrLayer* pCmpLayer=
#endif
- pLayerAdmin->RemoveLayer(nNeuPos);
+ pLayerAdmin->RemoveLayer(nNewPos);
DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Undo(): Removter Layer
ist != pLayer");
pLayerAdmin->InsertLayer(pLayer,nNum);
}
@@ -1528,7 +1504,7 @@ void SdrUndoMoveLayer::Redo()
#endif
pLayerAdmin->RemoveLayer(nNum);
DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Redo(): Removter Layer
ist != pLayer");
- pLayerAdmin->InsertLayer(pLayer,nNeuPos);
+ pLayerAdmin->InsertLayer(pLayer,nNewPos);
}
XubString SdrUndoMoveLayer::GetComment() const
@@ -1537,17 +1513,7 @@ XubString SdrUndoMoveLayer::GetComment() const
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@
-// @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@@@@ @@@@@ @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
+// PAGES
////////////////////////////////////////////////////////////////////////////////////////////////////
SdrUndoPage::SdrUndoPage(SdrPage& rNewPg)
@@ -1671,7 +1637,7 @@ void SdrUndoDelPage::Undo()
void SdrUndoDelPage::Redo()
{
ImpRemovePage(nPageNum);
- // Die MasterPage-Beziehungen werden ggf. von selbst geloesst
+ // Die MasterPage-Beziehungen werden ggf. von selbst gelöst
DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der
UndoAction");
bItsMine=sal_True;
}
@@ -1768,15 +1734,7 @@ XubString SdrUndoSetPageNum::GetComment() const
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@ @@ @@@@ @@@@ @@@@@@ @@@@@ @@@@@ @@@@@ @@@@ @@@@ @@@@@ @@@@
-// @@@ @@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@@@@@@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@@@@ @@@@@@ @@@@ @@ @@@@ @@@@@ @@@@@ @@@@@@ @@ @@@ @@@@ @@@@
-// @@ @ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
@@
-// @@ @@ @@ @@ @@@@ @@ @@@@@ @@ @@ @@ @@ @@ @@@@@ @@@@@ @@@@
-//
+// MASTERPAGES
////////////////////////////////////////////////////////////////////////////////////////////////////
SdrUndoPageMasterPage::SdrUndoPageMasterPage(SdrPage& rChangedPage)
@@ -1941,7 +1899,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectStrAttr(
SdrObject& rObject,
String sOldStr,
String sNewStr )
{
- return new SdrUndoObjStrAttr( rObject, eObjStrAttrType, sOldStr, sNewStr );
+ return new SdrUndoObjStrAttr( rObject, eObjStrAttrType, sOldStr,
sNewStr );
}
@@ -1956,9 +1914,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
@@ -1981,7 +1939,7 @@ SdrUndoAction*
SdrUndoFactory::CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16
{
return new SdrUndoSetPageNum( rNewPg, nOldPageNum1, nNewPageNum1 );
}
- // master page
+// master page
SdrUndoAction* SdrUndoFactory::CreateUndoPageRemoveMasterPage(SdrPage&
rChangedPage)
{
return new SdrUndoPageRemoveMasterPage( rChangedPage );
@@ -1992,4 +1950,4 @@ SdrUndoAction*
SdrUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChangedP
return new SdrUndoPageChangeMasterPage(rChangedPage);
}
-// eof
+/* vim: set noet sw=4 ts=4: */
