You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/05/17 15:19:44 UTC
[openoffice] branch AOO42X updated: Cleanup
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 e147e5f65a Cleanup
e147e5f65a is described below
commit e147e5f65a0f2f69d99e27e84e1e96a95272c0ae
Author: mseidel <ms...@apache.org>
AuthorDate: Wed May 17 17:13:57 2023 +0200
Cleanup
(cherry picked from commit 4d196ef4ae78ff6471489db4943d00e5f0bbde43)
---
.../source/svdraw/ActionDescriptionProvider.cxx | 94 +++++----
main/svx/source/svdraw/charthelper.cxx | 235 ++++++++++-----------
main/svx/source/svdraw/clonelist.cxx | 20 +-
main/svx/source/svdraw/gradtrns.cxx | 48 ++---
main/svx/source/svdraw/gradtrns.hxx | 13 +-
main/svx/source/svdraw/impgrfll.cxx | 80 ++++---
main/svx/source/svdraw/sdrpaintwindow.cxx | 97 +++++----
main/svx/source/svdraw/svdglev.cxx | 34 ++-
main/svx/source/svdraw/svdhdl.cxx | 23 +-
main/wizards/source/webwizard/webwizar.src | 2 +
10 files changed, 309 insertions(+), 337 deletions(-)
diff --git a/main/svx/source/svdraw/ActionDescriptionProvider.cxx b/main/svx/source/svdraw/ActionDescriptionProvider.cxx
index 9d9a8fcc87..0c38420981 100644
--- a/main/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/main/svx/source/svdraw/ActionDescriptionProvider.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -29,50 +29,52 @@
#include "svx/svdstr.hrc"
::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
- , const ::rtl::OUString& rObjectName )
+ , const ::rtl::OUString& rObjectName )
{
- sal_uInt16 nResID=0;
- switch( eActionType )
- {
- case INSERT:
- nResID=STR_UndoInsertObj;
- break;
- case DELETE:
- nResID= STR_EditDelete;
- break;
- case CUT:
- nResID= STR_ExchangeClpCut;
- break;
- case MOVE:
- nResID= STR_EditMove;
- break;
- case RESIZE:
- nResID= STR_EditResize;
- break;
- case ROTATE:
- nResID= STR_EditRotate;
- break;
- case TRANSFORM:
- nResID= STR_EditTransform;
- break;
- case FORMAT:
- nResID= STR_EditSetAttributes;
- break;
- case MOVE_TOTOP:
- nResID= STR_EditMovToTop;
- break;
- case MOVE_TOBOTTOM:
- nResID= STR_EditMovToBtm;
- break;
- case POS_SIZE:
- nResID = STR_EditPosSize;
- break;
- }
- if(!nResID)
- return rtl::OUString();
+ sal_uInt16 nResID=0;
+ switch( eActionType )
+ {
+ case INSERT:
+ nResID=STR_UndoInsertObj;
+ break;
+ case DELETE:
+ nResID= STR_EditDelete;
+ break;
+ case CUT:
+ nResID= STR_ExchangeClpCut;
+ break;
+ case MOVE:
+ nResID= STR_EditMove;
+ break;
+ case RESIZE:
+ nResID= STR_EditResize;
+ break;
+ case ROTATE:
+ nResID= STR_EditRotate;
+ break;
+ case TRANSFORM:
+ nResID= STR_EditTransform;
+ break;
+ case FORMAT:
+ nResID= STR_EditSetAttributes;
+ break;
+ case MOVE_TOTOP:
+ nResID= STR_EditMovToTop;
+ break;
+ case MOVE_TOBOTTOM:
+ nResID= STR_EditMovToBtm;
+ break;
+ case POS_SIZE:
+ nResID = STR_EditPosSize;
+ break;
+ }
+ if(!nResID)
+ return rtl::OUString();
- XubString aStr(ImpGetResStr(nResID));
+ XubString aStr(ImpGetResStr(nResID));
XubString aName(rObjectName);
aStr.SearchAndReplaceAscii("%1", aName);
- return rtl::OUString(aStr);
+ return rtl::OUString(aStr);
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/charthelper.cxx b/main/svx/source/svdraw/charthelper.cxx
index 690d2e88fb..0d0849d0f0 100644
--- a/main/svx/source/svdraw/charthelper.cxx
+++ b/main/svx/source/svdraw/charthelper.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,18 +7,20 @@
* 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"
@@ -37,133 +39,130 @@
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-//////////////////////////////////////////////////////////////////////////////
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
bool ChartHelper::IsChart(const svt::EmbeddedObjectRef& xObjRef)
{
- if(!xObjRef.is())
- {
- return false;
- }
-
- const SvGlobalName aObjClsId(xObjRef->getClassID());
-
- if(SvGlobalName(SO3_SCH_CLASSID_30) == aObjClsId
- || SvGlobalName(SO3_SCH_CLASSID_40) == aObjClsId
- || SvGlobalName(SO3_SCH_CLASSID_50) == aObjClsId
- || SvGlobalName(SO3_SCH_CLASSID_60) == aObjClsId)
- {
- return true;
- }
-
- return false;
+ if(!xObjRef.is())
+ {
+ return false;
+ }
+
+ const SvGlobalName aObjClsId(xObjRef->getClassID());
+
+ if(SvGlobalName(SO3_SCH_CLASSID_30) == aObjClsId
+ || SvGlobalName(SO3_SCH_CLASSID_40) == aObjClsId
+ || SvGlobalName(SO3_SCH_CLASSID_50) == aObjClsId
+ || SvGlobalName(SO3_SCH_CLASSID_60) == aObjClsId)
+ {
+ return true;
+ }
+
+ return false;
}
drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
- const uno::Reference< ::frame::XModel >& rXModel,
- basegfx::B2DRange& rRange)
+ const uno::Reference< ::frame::XModel >& rXModel,
+ basegfx::B2DRange& rRange)
{
- drawinglayer::primitive2d::Primitive2DSequence aRetval;
-
- if(rXModel.is())
- {
- try
- {
- const uno::Reference< lang::XMultiServiceFactory > xChartFact(rXModel, uno::UNO_QUERY_THROW);
- const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW);
- const uno::Reference< util::XUpdatable > xUpdatable(xChartView, uno::UNO_QUERY_THROW);
-
- if(xUpdatable.is())
- {
- xUpdatable->update();
-
- const uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier(rXModel, uno::UNO_QUERY_THROW);
- const uno::Reference< container::XIndexAccess > xShapeAccess(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW);
-
- if(xShapeAccess.is() && xShapeAccess->getCount())
- {
- const sal_Int32 nShapeCount(xShapeAccess->getCount());
- const uno::Reference< lang::XMultiServiceFactory > xMgr(::comphelper::getProcessServiceFactory());
- const uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory(
- xMgr->createInstance(
- String(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.graphic.PrimitiveFactory2D" ))),
- uno::UNO_QUERY);
-
- if(xPrimitiveFactory.is())
- {
- const uno::Sequence< beans::PropertyValue > aParams;
- uno::Reference< drawing::XShape > xShape;
-
- for(sal_Int32 a(0); a < nShapeCount; a++)
- {
- xShapeAccess->getByIndex(a) >>= xShape;
-
- if(xShape.is())
- {
- const drawinglayer::primitive2d::Primitive2DSequence aNew(
- xPrimitiveFactory->createPrimitivesFromXShape(
- xShape,
- aParams));
-
- drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(
- aRetval,
- aNew);
- }
- }
- }
- }
- }
- }
- catch(uno::Exception&)
- {
- OSL_ENSURE(false, "Unexpected exception!");
- }
-
- if(aRetval.hasElements())
- {
- const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
-
- rRange = drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(aRetval, aViewInformation2D);
- }
- }
-
- return aRetval;
+ drawinglayer::primitive2d::Primitive2DSequence aRetval;
+
+ if(rXModel.is())
+ {
+ try
+ {
+ const uno::Reference< lang::XMultiServiceFactory > xChartFact(rXModel, uno::UNO_QUERY_THROW);
+ const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW);
+ const uno::Reference< util::XUpdatable > xUpdatable(xChartView, uno::UNO_QUERY_THROW);
+
+ if(xUpdatable.is())
+ {
+ xUpdatable->update();
+
+ const uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier(rXModel, uno::UNO_QUERY_THROW);
+ const uno::Reference< container::XIndexAccess > xShapeAccess(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW);
+
+ if(xShapeAccess.is() && xShapeAccess->getCount())
+ {
+ const sal_Int32 nShapeCount(xShapeAccess->getCount());
+ const uno::Reference< lang::XMultiServiceFactory > xMgr(::comphelper::getProcessServiceFactory());
+ const uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory(
+ xMgr->createInstance(
+ String(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.graphic.PrimitiveFactory2D" ))),
+ uno::UNO_QUERY);
+
+ if(xPrimitiveFactory.is())
+ {
+ const uno::Sequence< beans::PropertyValue > aParams;
+ uno::Reference< drawing::XShape > xShape;
+
+ for(sal_Int32 a(0); a < nShapeCount; a++)
+ {
+ xShapeAccess->getByIndex(a) >>= xShape;
+
+ if(xShape.is())
+ {
+ const drawinglayer::primitive2d::Primitive2DSequence aNew(
+ xPrimitiveFactory->createPrimitivesFromXShape(
+ xShape,
+ aParams));
+
+ drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(
+ aRetval,
+ aNew);
+ }
+ }
+ }
+ }
+ }
+ }
+ catch(uno::Exception&)
+ {
+ OSL_ENSURE(false, "Unexpected exception!");
+ }
+
+ if(aRetval.hasElements())
+ {
+ const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+
+ rRange = drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(aRetval, aViewInformation2D);
+ }
+ }
+
+ return aRetval;
}
void ChartHelper::AdaptDefaultsForChart(
- const uno::Reference < embed::XEmbeddedObject > & xEmbObj,
- bool /* bNoFillStyle */,
- bool /* bNoLineStyle */)
+ const uno::Reference < embed::XEmbeddedObject > & xEmbObj,
+ bool /* bNoFillStyle */,
+ bool /* bNoLineStyle */)
{
- if( xEmbObj.is())
- {
- uno::Reference< chart2::XChartDocument > xChartDoc( xEmbObj->getComponent(), uno::UNO_QUERY );
- OSL_ENSURE( xChartDoc.is(), "Trying to set chart property to non-chart OLE" );
- if( !xChartDoc.is())
- return;
-
- try
- {
- // set background to transparent (none)
- uno::Reference< beans::XPropertySet > xPageProp( xChartDoc->getPageBackground());
- if( xPageProp.is())
- xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FillStyle")),
- uno::makeAny( drawing::FillStyle_NONE ));
- // set no border
- if( xPageProp.is())
- xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineStyle")),
- uno::makeAny( drawing::LineStyle_NONE ));
- }
- catch( const uno::Exception & )
- {
- OSL_ENSURE( false, "Exception caught in AdaptDefaultsForChart" );
- }
- }
+ if( xEmbObj.is())
+ {
+ uno::Reference< chart2::XChartDocument > xChartDoc( xEmbObj->getComponent(), uno::UNO_QUERY );
+ OSL_ENSURE( xChartDoc.is(), "Trying to set chart property to non-chart OLE" );
+ if( !xChartDoc.is())
+ return;
+
+ try
+ {
+ // set background to transparent (none)
+ uno::Reference< beans::XPropertySet > xPageProp( xChartDoc->getPageBackground());
+ if( xPageProp.is())
+ xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FillStyle")),
+ uno::makeAny( drawing::FillStyle_NONE ));
+ // set no border
+ if( xPageProp.is())
+ xPageProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineStyle")),
+ uno::makeAny( drawing::LineStyle_NONE ));
+ }
+ catch( const uno::Exception & )
+ {
+ OSL_ENSURE( false, "Exception caught in AdaptDefaultsForChart" );
+ }
+ }
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/clonelist.cxx b/main/svx/source/svdraw/clonelist.cxx
index 73e42159b4..e4f86d636f 100644
--- a/main/svx/source/svdraw/clonelist.cxx
+++ b/main/svx/source/svdraw/clonelist.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -25,7 +25,7 @@
#include "precompiled_svx.hxx"
// #i13033#
-// New mechanism to hold a ist of all original and cloned objects for later
+// New mechanism to hold a list of all original and cloned objects for later
// re-creating the connections for contained connectors
#include <clonelist.hxx>
#include <svx/svdoedge.hxx>
@@ -59,7 +59,7 @@ void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone)
const SdrObjList* pOriginalList = pOriginal->GetSubList();
SdrObjList* pCloneList = pClone->GetSubList();
- if(pOriginalList && pCloneList
+ if(pOriginalList && pCloneList
&& pOriginalList->GetObjCount() == pCloneList->GetObjCount())
{
for(sal_uInt32 a(0); a < pOriginalList->GetObjCount(); a++)
@@ -71,9 +71,9 @@ void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone)
}
}
-sal_uInt32 CloneList::Count() const
-{
- return maOriginalList.Count();
+sal_uInt32 CloneList::Count() const
+{
+ return maOriginalList.Count();
}
const SdrObject* CloneList::GetOriginal(sal_uInt32 nIndex) const
@@ -127,4 +127,4 @@ void CloneList::CopyConnections() const
}
}
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/gradtrns.cxx b/main/svx/source/svdraw/gradtrns.cxx
index 78ecd2fe76..70b22168ec 100644
--- a/main/svx/source/svdraw/gradtrns.cxx
+++ b/main/svx/source/svdraw/gradtrns.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -29,9 +29,8 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <vcl/salbtype.hxx> // FRound
+#include <vcl/salbtype.hxx> // FRound
-//////////////////////////////////////////////////////////////////////////////
void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, const SdrObject* pObj)
{
@@ -40,7 +39,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
if(100 != rG.aGradient.GetStartIntens())
{
const double fFact((double)rG.aGradient.GetStartIntens() / 100.0);
- rV.aCol1 = Color(rV.aCol1.getBColor() * fFact);
+ rV.aCol1 = Color(rV.aCol1.getBColor() * fFact);
}
// handle end color
@@ -48,7 +47,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
if(100 != rG.aGradient.GetEndIntens())
{
const double fFact((double)rG.aGradient.GetEndIntens() / 100.0);
- rV.aCol2 = Color(rV.aCol2.getBColor() * fFact);
+ rV.aCol2 = Color(rV.aCol2.getBColor() * fFact);
}
// calc the basic positions
@@ -75,8 +74,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
if(rG.aGradient.GetAngle())
{
const double fAngle = (double)rG.aGradient.GetAngle() * (F_PI180 / 10.0);
- const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aCenter, -fAngle));
-
+ const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aCenter, -fAngle));
+
aStartPos *= aTransformation;
aEndPos *= aTransformation;
}
@@ -94,12 +93,12 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
aFullVec.normalize();
aEndPos = aStartPos + (aFullVec * fLen);
}
-
+
if(rG.aGradient.GetAngle())
{
const double fAngle = (double)rG.aGradient.GetAngle() * (F_PI180 / 10.0);
- const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aCenter, -fAngle));
-
+ const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aCenter, -fAngle));
+
aStartPos *= aTransformation;
aEndPos *= aTransformation;
}
@@ -118,16 +117,16 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
aFullVec.normalize();
aStartPos = aEndPos + (aFullVec * fLen);
}
-
+
if(rG.aGradient.GetAngle())
{
const double fAngle = (double)rG.aGradient.GetAngle() * (F_PI180 / 10.0);
- const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aEndPos, -fAngle));
+ const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aEndPos, -fAngle));
aStartPos *= aTransformation;
aEndPos *= aTransformation;
}
-
+
if(rG.aGradient.GetXOffset() || rG.aGradient.GetYOffset())
{
basegfx::B2DPoint aOffset(
@@ -153,16 +152,16 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
aFullVec.normalize();
aStartPos = aEndPos + (aFullVec * fLen);
}
-
+
if(rG.aGradient.GetAngle())
{
const double fAngle = (double)rG.aGradient.GetAngle() * (F_PI180 / 10.0);
- const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aEndPos, -fAngle));
+ const basegfx::B2DHomMatrix aTransformation(basegfx::tools::createRotateAroundPoint(aEndPos, -fAngle));
aStartPos *= aTransformation;
aEndPos *= aTransformation;
}
-
+
if(rG.aGradient.GetXOffset() || rG.aGradient.GetYOffset())
{
basegfx::B2DPoint aOffset(
@@ -182,9 +181,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
rV.maPositionB = aEndPos;
}
-//////////////////////////////////////////////////////////////////////////////
-void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj,
+void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj,
sal_Bool bMoveSingle, sal_Bool bMoveFirst)
{
// fill old gradient to new gradient to have a base
@@ -221,9 +219,9 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
{
aFullVec = aEndPos - aCenter;
}
-
+
aFullVec.normalize();
-
+
double fNewFullAngle(atan2(aFullVec.getY(), aFullVec.getX()));
fNewFullAngle /= F_PI180;
fNewFullAngle *= -10.0;
@@ -307,7 +305,7 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
{
rG.aGradient.SetBorder((sal_uInt16)nNewBorder);
}
-
+
aFullVec.normalize();
double fNewFullAngle(atan2(aFullVec.getY(), aFullVec.getX()));
fNewFullAngle /= F_PI180;
@@ -531,4 +529,4 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
}
}
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/gradtrns.hxx b/main/svx/source/svdraw/gradtrns.hxx
index 7877ceb011..21e16fdaf5 100644
--- a/main/svx/source/svdraw/gradtrns.hxx
+++ b/main/svx/source/svdraw/gradtrns.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -50,11 +50,10 @@ class GradTransformer
public:
GradTransformer() {}
- void GradToVec(GradTransGradient& rG, GradTransVector& rV,
+ void GradToVec(GradTransGradient& rG, GradTransVector& rV,
const SdrObject* pObj);
- void VecToGrad(GradTransVector& rV, GradTransGradient& rG,
+ void VecToGrad(GradTransVector& rV, GradTransGradient& rG,
GradTransGradient& rGOld, const SdrObject* pObj, sal_Bool bMoveSingle, sal_Bool bMoveFirst);
};
#endif // _GRADTRANS_HXX
-
diff --git a/main/svx/source/svdraw/impgrfll.cxx b/main/svx/source/svdraw/impgrfll.cxx
index f8f10f2454..d6e4e20159 100644
--- a/main/svx/source/svdraw/impgrfll.cxx
+++ b/main/svx/source/svdraw/impgrfll.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -28,20 +28,19 @@
#include <vcl/outdev.hxx>
#include <vcl/bitmap.hxx>
-///////////////////////////////////////////////////////////////////////////////
-
-void ImpCalcBmpFillSizes( Size& rStartOffset,
- Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
- const MapMode& rOutputMapMode,
- const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
- const Size& rBmpOffPerCent,
- sal_Bool bBmpLogSize,
- sal_Bool bBmpTile,
- sal_Bool bBmpStretch,
- RECT_POINT eBmpRectPoint )
+
+void ImpCalcBmpFillSizes( Size& rStartOffset,
+ Size& rBmpOutputSize,
+ const Rectangle& rOutputRect,
+ const MapMode& rOutputMapMode,
+ const Bitmap& rFillBitmap,
+ const Size& rBmpSize,
+ const Size& rBmpPerCent,
+ const Size& rBmpOffPerCent,
+ sal_Bool bBmpLogSize,
+ sal_Bool bBmpTile,
+ sal_Bool bBmpStretch,
+ RECT_POINT eBmpRectPoint )
{
sal_Bool bOriginalSize = sal_False, bScaleSize = sal_False;
@@ -73,10 +72,10 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
// Falls keine gesetzt ist, nehmen wir Pixel
if( !aBmpPrefSize.Width() || !aBmpPrefSize.Height() )
- {
+ {
aBmpPrefSize = rFillBitmap.GetSizePixel();
- aBmpPrefMapMode = MAP_PIXEL;
- }
+ aBmpPrefMapMode = MAP_PIXEL;
+ }
if( bOriginalSize )
{
@@ -126,7 +125,7 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
// nur bei Kachelung die anderen Positionen berechnen
if( bBmpTile )
{
- Point aStartPoint;
+ Point aStartPoint;
// Grundposition der ersten Kachel berechen;
// Diese Position wird spaeter zur Berechnung der absoluten
@@ -199,10 +198,10 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
if( rBmpOffPerCent.Width() )
aStartPoint.X() += ( rBmpOutputSize.Width() * rBmpOffPerCent.Width() / 100 );
- if( rBmpOffPerCent.Height() )
+ if( rBmpOffPerCent.Height() )
aStartPoint.Y() += ( rBmpOutputSize.Height() * rBmpOffPerCent.Height() / 100 );
- // echten Startpunkt berechnen ( links oben )
+ // echten Startpunkt berechnen (links oben)
if( rBmpOutputSize.Width() && rBmpOutputSize.Height() )
{
const long nDiffX = aStartPoint.X() - rOutputRect.Left();
@@ -229,23 +228,22 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
}
}
- rStartOffset = Size( aStartPoint.X() - rOutputRect.Left(),
- aStartPoint.Y() - rOutputRect.Top() );
+ rStartOffset = Size( aStartPoint.X() - rOutputRect.Left(),
+ aStartPoint.Y() - rOutputRect.Top() );
+ }
+ else
+ {
+ if( bBmpStretch )
+ {
+ rStartOffset = Size(0, 0);
+ rBmpOutputSize = rOutputRect.GetSize();
+ }
+ else
+ {
+ rStartOffset = Size( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1,
+ ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
+ }
}
- else
- {
- if( bBmpStretch )
- {
- rStartOffset = Size(0, 0);
- rBmpOutputSize = rOutputRect.GetSize();
- }
- else
- {
- rStartOffset = Size( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1,
- ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- }
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/sdrpaintwindow.cxx b/main/svx/source/svdraw/sdrpaintwindow.cxx
index 5934e4dd2e..00ab0c0805 100644
--- a/main/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/main/svx/source/svdraw/sdrpaintwindow.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -29,7 +29,6 @@
#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrPreRenderDevice::SdrPreRenderDevice(OutputDevice& rOriginal)
: mrOutputDevice(rOriginal)
@@ -72,34 +71,34 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion)
mrOutputDevice.EnableMapMode(sal_False);
maPreRenderDevice.EnableMapMode(sal_False);
- RectangleVector aRectangles;
- aRegionPixel.GetRegionRectangles(aRectangles);
+ RectangleVector aRectangles;
+ aRegionPixel.GetRegionRectangles(aRectangles);
- for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); aRectIter++)
- {
- // for each rectangle, copy the area
- const Point aTopLeft(aRectIter->TopLeft());
- const Size aSize(aRectIter->GetSize());
+ for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); aRectIter++)
+ {
+ // for each rectangle, copy the area
+ const Point aTopLeft(aRectIter->TopLeft());
+ const Size aSize(aRectIter->GetSize());
- mrOutputDevice.DrawOutDev(
- aTopLeft, aSize,
- aTopLeft, aSize,
- maPreRenderDevice);
+ mrOutputDevice.DrawOutDev(
+ aTopLeft, aSize,
+ aTopLeft, aSize,
+ maPreRenderDevice);
#ifdef DBG_UTIL
- // #i74769#
- static bool bDoPaintForVisualControlRegion(false);
+ // #i74769#
+ static bool bDoPaintForVisualControlRegion(false);
- if(bDoPaintForVisualControlRegion)
- {
- const Color aColor((((((rand()&0x7f)|0x80)<<8L)|((rand()&0x7f)|0x80))<<8L)|((rand()&0x7f)|0x80));
+ if(bDoPaintForVisualControlRegion)
+ {
+ const Color aColor((((((rand()&0x7f)|0x80)<<8L)|((rand()&0x7f)|0x80))<<8L)|((rand()&0x7f)|0x80));
- mrOutputDevice.SetLineColor(aColor);
- mrOutputDevice.SetFillColor();
- mrOutputDevice.DrawRect(*aRectIter);
- }
+ mrOutputDevice.SetLineColor(aColor);
+ mrOutputDevice.SetFillColor();
+ mrOutputDevice.DrawRect(*aRectIter);
+ }
#endif
- }
+ }
// while(aRegionPixel.GetEnumRects(aRegionHandle, aRegionRectanglePixel))
// {
@@ -108,8 +107,8 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion)
// const Size aSize(aRegionRectanglePixel.GetSize());
//
// mrOutputDevice.DrawOutDev(
-// aTopLeft, aSize,
-// aTopLeft, aSize,
+// aTopLeft, aSize,
+// aTopLeft, aSize,
// maPreRenderDevice);
//
//#ifdef DBG_UTIL
@@ -131,7 +130,6 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion)
maPreRenderDevice.EnableMapMode(bMapModeWasEnabledSource);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrPaintWindow::impCreateOverlayManager()
{
@@ -144,10 +142,10 @@ void SdrPaintWindow::impCreateOverlayManager()
// decide which OverlayManager to use
if(GetPaintView().IsBufferedOverlayAllowed() && mbUseBuffer)
{
- // buffered OverlayManager, buffers it's background and refreshes from there
+ // buffered OverlayManager, buffers its background and refreshes from there
// for pure overlay changes (no system redraw). The 3rd parameter specifies
// if that refresh itself will use a 2nd vdev to avoid flickering.
- // Also hand over the evtl. existing old OverlayManager; this means to take over
+ // Also hand over the evtl. existing old OverlayManager; this means to take over
// the registered OverlayObjects from it
mpOverlayManager = new ::sdr::overlay::OverlayManagerBuffered(GetOutputDevice(), true);
}
@@ -155,19 +153,19 @@ void SdrPaintWindow::impCreateOverlayManager()
{
// unbuffered OverlayManager, just invalidates places where changes
// take place
- // Also hand over the evtl. existing old OverlayManager; this means to take over
+ // Also hand over the evtl. existing old OverlayManager; this means to take over
// the registered OverlayObjects from it
mpOverlayManager = new ::sdr::overlay::OverlayManager(GetOutputDevice());
}
OSL_ENSURE(mpOverlayManager, "SdrPaintWindow::SdrPaintWindow: Could not allocate an overlayManager (!)");
- // Request a repaint so that the buffered overlay manager fills
- // its buffer properly. This is a workaround for missing buffer
- // updates.
- Window* pWindow = dynamic_cast<Window*>(&GetOutputDevice());
- if (pWindow != NULL)
- pWindow->Invalidate();
+ // Request a repaint so that the buffered overlay manager fills
+ // its buffer properly. This is a workaround for missing buffer
+ // updates.
+ Window* pWindow = dynamic_cast<Window*>(&GetOutputDevice());
+ if (pWindow != NULL)
+ pWindow->Invalidate();
Color aColA(GetPaintView().getOptionsDrawinglayer().GetStripeColorA());
Color aColB(GetPaintView().getOptionsDrawinglayer().GetStripeColorB());
@@ -191,7 +189,7 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut)
mpOverlayManager(0L),
mpPreRenderDevice(0L),
mbTemporaryTarget(false), // #i72889#
- mbUseBuffer(true)
+ mbUseBuffer(true)
{
}
@@ -206,11 +204,11 @@ SdrPaintWindow::~SdrPaintWindow()
DestroyPreRenderDevice();
}
-::sdr::overlay::OverlayManager* SdrPaintWindow::GetOverlayManager() const
-{
+::sdr::overlay::OverlayManager* SdrPaintWindow::GetOverlayManager() const
+{
if(!mpOverlayManager)
{
- // Create buffered overlay manager by default.
+ // Create buffered overlay manager by default.
const_cast< SdrPaintWindow* >(this)->impCreateOverlayManager();
}
@@ -303,15 +301,14 @@ void SdrPaintWindow::HideOverlay(const Region& rRegion)
}
}
-const Region& SdrPaintWindow::GetRedrawRegion() const
-{
- return maRedrawRegion;
+const Region& SdrPaintWindow::GetRedrawRegion() const
+{
+ return maRedrawRegion;
}
-void SdrPaintWindow::SetRedrawRegion(const Region& rNew)
-{
- maRedrawRegion = rNew;
+void SdrPaintWindow::SetRedrawRegion(const Region& rNew)
+{
+ maRedrawRegion = rNew;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdglev.cxx b/main/svx/source/svdraw/svdglev.cxx
index 1e69352e4b..13e714988e 100644
--- a/main/svx/source/svdraw/svdglev.cxx
+++ b/main/svx/source/svdraw/svdglev.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -28,14 +28,13 @@
#include <math.h>
#include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc" // Namen aus der Resource
-#include "svx/svdglob.hxx" // StringCache
+#include "svx/svdstr.hrc" // Namen aus der Ressource
+#include "svx/svdglob.hxx" // StringCache
#include <svx/svdpagv.hxx>
#include <svx/svdglue.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdobj.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrGlueEditView::ImpClearVars()
{
@@ -51,7 +50,6 @@ SdrGlueEditView::~SdrGlueEditView()
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
{
@@ -84,7 +82,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst
(*pDoFunc)(rGP,pObj,p1,p2,p3,p4,p5);
}
}
- if (!bConst)
+ if (!bConst)
{
pObj->SetChanged();
pObj->BroadcastObjectChange();
@@ -95,7 +93,6 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst
if (!bConst && nMarkAnz!=0) pMod->SetChanged();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
{
@@ -134,7 +131,6 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bO
EndUndo();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
{
@@ -171,7 +167,6 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
EndUndo();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
{
@@ -227,7 +222,6 @@ void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign
EndUndo();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
{
@@ -278,7 +272,6 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
pMod->SetChanged();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrGlueEditView::ImpCopyMarkedGluePoints()
{
@@ -306,10 +299,10 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
{
- SdrGluePoint aNewGP((*pGPL)[nGlueIdx]); // GluePoint klonen
- sal_uInt16 nNewIdx=pGPL->Insert(aNewGP); // und einfuegen
- sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln
- pPts->Replace(nNewId,nPtNum); // und diesen markieren (anstelle des alten)
+ SdrGluePoint aNewGP((*pGPL)[nGlueIdx]); // Clone GluePoint
+ sal_uInt16 nNewIdx=pGPL->Insert(aNewGP); // and insert
+ sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln
+ pPts->Replace(nNewId,nPtNum); // und diesen markieren (anstelle des alten)
}
}
}
@@ -321,7 +314,6 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
pMod->SetChanged();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
{
@@ -356,7 +348,6 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
if (nMarkAnz!=0) pMod->SetChanged();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/)
{
@@ -376,7 +367,6 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy)
AdjustMarkHdl();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/)
{
@@ -395,7 +385,6 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction&
AdjustMarkHdl();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/)
{
@@ -416,3 +405,4 @@ void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nWink, bool
AdjustMarkHdl();
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/svdraw/svdhdl.cxx b/main/svx/source/svdraw/svdhdl.cxx
index 1a1bcb14d8..a8fdbedae7 100644
--- a/main/svx/source/svdraw/svdhdl.cxx
+++ b/main/svx/source/svdraw/svdhdl.cxx
@@ -71,7 +71,6 @@
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
-////////////////////////////////////////////////////////////////////////////////////////////////////
// #i15222#
// Due to the resource problems in Win95/98 with bitmap resources I
// will change this handle bitmap providing class. Old version was splitting
@@ -98,7 +97,7 @@ public:
const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0);
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
+
#define KIND_COUNT (14)
#define INDEX_COUNT (6)
#define INDIVIDUAL_COUNT (6)
@@ -279,7 +278,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
return maRealMarkers[0];
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrHdlBitmapSet& getSimpleSet()
{
@@ -299,7 +297,6 @@ SdrHdlBitmapSet& getHighContrastSet()
return *aHighContrastSet.get();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrHdl::SdrHdl():
pObj(NULL),
@@ -1004,7 +1001,7 @@ bool SdrHdl::isMouseOver() const
return mbMouseOver;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
+
// class SdrHdlColor
SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum)
@@ -1163,7 +1160,7 @@ void SdrHdlColor::SetSize(const Size& rNew)
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
+
// class SdrHdlGradient
SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad)
@@ -1346,7 +1343,6 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject,
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrHdlLine::~SdrHdlLine() {}
@@ -1405,7 +1401,6 @@ Pointer SdrHdlLine::GetPointer() const
return Pointer(POINTER_REFHAND);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrHdlBezWgt::~SdrHdlBezWgt() {}
@@ -1466,7 +1461,6 @@ void SdrHdlBezWgt::CreateB2dIAObject()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly)
{
@@ -1515,7 +1509,6 @@ void E3dVolumeMarker::CreateB2dIAObject()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
ImpEdgeHdl::~ImpEdgeHdl()
{
@@ -1638,7 +1631,6 @@ sal_Bool ImpEdgeHdl::IsHorzDrag() const
return sal_False;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
ImpMeasureHdl::~ImpMeasureHdl()
{
@@ -1712,7 +1704,6 @@ Pointer ImpMeasureHdl::GetPointer() const
return Pointer(POINTER_NOTALLOWED);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) :
SdrHdl(rRect.TopLeft(),HDL_MOVE),
@@ -1776,7 +1767,6 @@ void ImpTextframeHdl::CreateB2dIAObject()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
class ImpSdrHdlListSorter: public ContainerSorter {
public:
@@ -1931,7 +1921,7 @@ extern "C" int __LOADONCALLAPI ImplSortHdlFunc( const void* pVoid1, const void*
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
+
// #97016# II
void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
@@ -2125,7 +2115,6 @@ void SdrHdlList::ResetFocusHdl()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
SdrHdlList::SdrHdlList(SdrMarkView* pV)
: mnFocusIndex(CONTAINER_ENTRY_NOTFOUND),
@@ -2479,7 +2468,6 @@ void SdrCropHdl::CreateB2dIAObject()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
// with the correction of crop handling I could get rid of the extra mirroring flag, adapted stuff
// accordingly
@@ -2685,5 +2673,4 @@ void SdrCropViewHdl::CreateB2dIAObject()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/wizards/source/webwizard/webwizar.src b/main/wizards/source/webwizard/webwizar.src
index 16da131c75..21f0cc9b1a 100644
--- a/main/wizards/source/webwizard/webwizar.src
+++ b/main/wizards/source/webwizard/webwizar.src
@@ -124,4 +124,6 @@ String WEBERROR + 7
Text [ en-US ] = "An error occurred while running the AutoPilot." ;
};
+*/
+
// ********************************************************************** EOF