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 8f16a93e53 Fixed typos, cleanup
8f16a93e53 is described below
commit 8f16a93e53a119c94f83c6f9c22e158409754b14
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Mar 27 21:27:20 2025 +0100
Fixed typos, cleanup
(cherry picked from commit c64e43daf4d868cd69bdcfc2b096656257af5a06)
---
.../source/ui/inc/querycontainerwindow.hxx | 32 ++--
.../source/primitive3d/sdrextrudelathetools3d.cxx | 136 +++++++-------
.../complex/loadAllDocuments/StatusIndicator.java | 15 +-
.../java/mod/_sfx/StandaloneDocumentInfo.java | 12 +-
main/sal/inc/osl/conditn.h | 17 +-
main/sc/qa/complex/dataPilot/_XNamed.java | 16 +-
main/sc/qa/complex/dataPilot/_XPropertySet.java | 24 ++-
main/sc/source/filter/excel/xeformula.cxx | 160 ++++++++--------
main/svx/inc/svx/sdrpaintwindow.hxx | 27 ++-
.../source/sdr/contact/viewcontactofgraphic.cxx | 205 ++++++++++-----------
main/sw/source/filter/ww8/ww8graf2.cxx | 32 ++--
.../com/sun/star/wizards/db/DBMetaData.java | 11 +-
12 files changed, 331 insertions(+), 356 deletions(-)
diff --git a/main/dbaccess/source/ui/inc/querycontainerwindow.hxx
b/main/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 188ed8933e..50fd16af42 100644
--- a/main/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/main/dbaccess/source/ui/inc/querycontainerwindow.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,39 +7,37 @@
* 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 DBAUI_QUERYCONTAINERWINDOW_HXX
#define DBAUI_QUERYCONTAINERWINDOW_HXX
#ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
#endif
-#ifndef _SV_SPLIT_HXX
+#ifndef _SV_SPLIT_HXX
#include <vcl/split.hxx>
#endif
#ifndef DBAUI_DATAVIEW_HXX
#include "dataview.hxx"
#endif
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
#endif
#ifndef DBAUI_QUERYVIEWSWITCH_HXX
#include "QueryViewSwitch.hxx"
#endif
-#ifndef _SV_DOCKWIN_HXX
+#ifndef _SV_DOCKWIN_HXX
#include <vcl/dockwin.hxx>
#endif
@@ -52,7 +50,7 @@ namespace dbaui
//=====================================================================
//= OBeamer
//=====================================================================
- // tempoaray class until the beamer is implemented
+ // temporary class until the beamer is implemented
class OBeamer : public DockingWindow
{
public:
@@ -106,12 +104,12 @@ namespace dbaui
::rtl::OUString getStatement()
{ return m_pViewSwitch->getStatement(
); }
void setStatement( const ::rtl::OUString& _rsStatement )
{ m_pViewSwitch->setStatement( _rsStatement ); }
- void initialize()
{ m_pViewSwitch->initialize(); }
- void SaveUIConfig()
{
m_pViewSwitch->SaveUIConfig(); }
- bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) {
return m_pViewSwitch->reset( _pErrorInfo ); }
+ void initialize()
{ m_pViewSwitch->initialize(); }
+ void SaveUIConfig()
{
m_pViewSwitch->SaveUIConfig(); }
+ bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo )
{ return m_pViewSwitch->reset( _pErrorInfo ); }
- bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo );
- void forceInitialView();
+ bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo );
+ void forceInitialView();
virtual void GetFocus();
@@ -119,7 +117,7 @@ namespace dbaui
// re-arrange the controls belonging to the document itself
virtual void resizeAll( const Rectangle& _rPlayground );
- // arrange dericed classes controls in the rectangle given
+ // arrange derived classes controls in the rectangle given
virtual void resizeDocumentView(Rectangle& _rPlayground);
};
// end of temp classes
@@ -129,3 +127,5 @@ namespace dbaui
//.........................................................................
#endif // DBAUI_QUERYCONTAINERWINDOW_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
b/main/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 8e194f1b88..7c6ae52773 100644
--- a/main/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/main/drawinglayer/source/primitive3d/sdrextrudelathetools3d.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_drawinglayer.hxx"
@@ -39,7 +37,6 @@
#include <drawinglayer/geometry/viewinformation3d.hxx>
#include <numeric>
-//////////////////////////////////////////////////////////////////////////////
// decompositon helpers for extrude/lathe (rotation) objects
namespace
@@ -48,11 +45,11 @@ namespace
// common helpers
basegfx::B2DPolyPolygon impScalePolyPolygonOnCenter(
- const basegfx::B2DPolyPolygon& rSource,
+ const basegfx::B2DPolyPolygon& rSource,
double fScale)
{
basegfx::B2DPolyPolygon aRetval(rSource);
-
+
if(!basegfx::fTools::equalZero(fScale))
{
const basegfx::B2DRange
aRange(basegfx::tools::getRange(rSource));
@@ -69,9 +66,9 @@ namespace
}
void impGetOuterPolyPolygon(
- basegfx::B2DPolyPolygon& rPolygon,
- basegfx::B2DPolyPolygon& rOuterPolyPolygon,
- double fOffset,
+ basegfx::B2DPolyPolygon& rPolygon,
+ basegfx::B2DPolyPolygon& rOuterPolyPolygon,
+ double fOffset,
bool bCharacterMode)
{
rOuterPolyPolygon = rPolygon;
@@ -107,12 +104,12 @@ namespace
}
void impAddInBetweenFill(
- basegfx::B3DPolyPolygon& rTarget,
- const basegfx::B3DPolyPolygon& rPolA,
+ basegfx::B3DPolyPolygon& rTarget,
+ const basegfx::B3DPolyPolygon& rPolA,
const basegfx::B3DPolyPolygon& rPolB,
- double fTexVerStart,
- double fTexVerStop,
- bool bCreateNormals,
+ double fTexVerStart,
+ double fTexVerStop,
+ bool bCreateNormals,
bool bCreateTextureCoordinates)
{
OSL_ENSURE(rPolA.count() == rPolB.count(),
"impAddInBetweenFill: unequally sized polygons (!)");
@@ -144,7 +141,7 @@ namespace
{
const sal_uInt32 nIndexA(b);
const sal_uInt32 nIndexB((b + 1L) %
nPointCount);
-
+
const basegfx::B3DPoint
aStartA(aSubA.getB3DPoint(nIndexA));
const basegfx::B3DPoint
aEndA(aSubA.getB3DPoint(nIndexB));
const basegfx::B3DPoint
aStartB(aSubB.getB3DPoint(nIndexA));
@@ -172,7 +169,7 @@ namespace
const double
fEdgeLengthA(basegfx::B3DVector(aEndA - aStartA).getLength());
fPolygonPosA += fEdgeLengthA;
const double
fRelTexAR(fPolygonPosA * fTexHorMultiplicatorA);
-
+
const double
fRelTexBL(fPolygonPosB * fTexHorMultiplicatorB);
const double
fEdgeLengthB(basegfx::B3DVector(aEndB - aStartB).getLength());
fPolygonPosB += fEdgeLengthB;
@@ -191,7 +188,7 @@ namespace
}
void impSetNormal(
- basegfx::B3DPolyPolygon& rCandidate,
+ basegfx::B3DPolyPolygon& rCandidate,
const basegfx::B3DVector& rNormal)
{
for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
@@ -208,8 +205,8 @@ namespace
}
void impCreateInBetweenNormals(
- basegfx::B3DPolyPolygon& rPolA,
- basegfx::B3DPolyPolygon& rPolB,
+ basegfx::B3DPolyPolygon& rPolA,
+ basegfx::B3DPolyPolygon& rPolB,
bool bSmoothHorizontalNormals)
{
OSL_ENSURE(rPolA.count() == rPolB.count(),
"sdrExtrudePrimitive3D: unequally sized polygons (!)");
@@ -291,8 +288,8 @@ namespace
}
void impMixNormals(
- basegfx::B3DPolyPolygon& rPolA,
- const basegfx::B3DPolyPolygon& rPolB,
+ basegfx::B3DPolyPolygon& rPolA,
+ const basegfx::B3DPolyPolygon& rPolB,
double fWeightA)
{
const double fWeightB(1.0 - fWeightA);
@@ -357,14 +354,14 @@ namespace drawinglayer
namespace primitive3d
{
void createLatheSlices(
- Slice3DVector& rSliceVector,
- const basegfx::B2DPolyPolygon& rSource,
- double fBackScale,
- double fDiagonal,
- double fRotation,
- sal_uInt32 nSteps,
- bool bCharacterMode,
- bool bCloseFront,
+ Slice3DVector& rSliceVector,
+ const basegfx::B2DPolyPolygon& rSource,
+ double fBackScale,
+ double fDiagonal,
+ double fRotation,
+ sal_uInt32 nSteps,
+ bool bCharacterMode,
+ bool bCloseFront,
bool bCloseBack)
{
if(basegfx::fTools::equalZero(fRotation) || 0L ==
nSteps)
@@ -450,13 +447,13 @@ namespace drawinglayer
}
void createExtrudeSlices(
- Slice3DVector& rSliceVector,
- const basegfx::B2DPolyPolygon& rSource,
- double fBackScale,
- double fDiagonal,
- double fDepth,
- bool bCharacterMode,
- bool bCloseFront,
+ Slice3DVector& rSliceVector,
+ const basegfx::B2DPolyPolygon& rSource,
+ double fBackScale,
+ double fDiagonal,
+ double fDepth,
+ bool bCharacterMode,
+ bool bCloseFront,
bool bCloseBack)
{
if(basegfx::fTools::equalZero(fDepth))
@@ -496,7 +493,7 @@ namespace drawinglayer
aTransformFront.translate(0.0, 0.0,
fDepth);
rSliceVector.push_back(Slice3D(aOuterFront, aTransformFront,
SLICETYPE3D_FRONTCAP));
}
-
+
if(bCloseBack)
{
const double fOffset(fDepth * fDiagonal
* 0.5);
@@ -526,7 +523,7 @@ namespace drawinglayer
{
basegfx::B3DPolyPolygon aRetval;
const sal_uInt32 nNumSlices(rSliceVector.size());
-
+
if(nNumSlices)
{
const sal_uInt32
nSlideSubPolygonCount(rSliceVector[0].getB3DPolyPolygon().count());
@@ -538,11 +535,11 @@ namespace drawinglayer
for(sal_uInt32 c(0); c <
nSubPolygonPointCount; c++)
{
basegfx::B3DPolygon aNew;
-
+
for(sal_uInt32 d(0); d <
nNumSlices; d++)
{
- const bool bSamePolygonCount(nSlideSubPolygonCount
== rSliceVector[d].getB3DPolyPolygon().count());
- const bool bSamePointCount(nSubPolygonPointCount
== rSliceVector[d].getB3DPolyPolygon().getB3DPolygon(b).count());
+ const bool
bSamePolygonCount(nSlideSubPolygonCount ==
rSliceVector[d].getB3DPolyPolygon().count());
+ const bool
bSamePointCount(nSubPolygonPointCount ==
rSliceVector[d].getB3DPolyPolygon().getB3DPolygon(b).count());
if(bSamePolygonCount && bSamePointCount)
{
@@ -568,30 +565,30 @@ namespace drawinglayer
{
basegfx::B3DPolyPolygon aRetval;
const sal_uInt32 nNumSlices(rSliceVector.size());
-
- for(sal_uInt32 a(0L); a < nNumSlices; a++)
- {
- aRetval.append(rSliceVector[a].getB3DPolyPolygon());
- }
+
+ for(sal_uInt32 a(0L); a < nNumSlices; a++)
+ {
+
aRetval.append(rSliceVector[a].getB3DPolyPolygon());
+ }
return aRetval;
}
void extractPlanesFromSlice(
- ::std::vector< basegfx::B3DPolyPolygon >& rFill,
+ ::std::vector< basegfx::B3DPolyPolygon >& rFill,
const Slice3DVector& rSliceVector,
- bool bCreateNormals,
- bool bSmoothHorizontalNormals,
- bool bSmoothNormals,
- bool bSmoothLids,
+ bool bCreateNormals,
+ bool bSmoothHorizontalNormals,
+ bool bSmoothNormals,
+ bool bSmoothLids,
bool bClosed,
- double fSmoothNormalsMix,
- double fSmoothLidsMix,
- bool bCreateTextureCoordinates,
+ double fSmoothNormalsMix,
+ double fSmoothLidsMix,
+ bool bCreateTextureCoordinates,
const basegfx::B2DHomMatrix& rTexTransform)
{
const sal_uInt32 nNumSlices(rSliceVector.size());
-
+
if(nNumSlices)
{
// common parameters
@@ -599,7 +596,7 @@ namespace drawinglayer
basegfx::B3DPolyPolygon aEdgeRounding;
sal_uInt32 a;
- // tetxture parameters
+ // texture parameters
double fInvTexHeight(1.0);
double fTexHeightPos(0.0);
double fTexStart(0.0);
@@ -641,8 +638,8 @@ namespace drawinglayer
}
}
- if(nLoopCount)
- {
+ if(nLoopCount)
+ {
for(a = 0L; a < nLoopCount; a++)
{
const Slice3D&
rSliceA(rSliceVector[a]);
@@ -657,7 +654,7 @@ namespace drawinglayer
{
impCreateInBetweenNormals(aPolB, aPolA, bSmoothHorizontalNormals);
}
-
+
{
const sal_uInt32
nIndPrev((a + nNumSlices - 1L) % nNumSlices);
const Slice3D&
rSlicePrev(rSliceVector[nIndPrev]);
@@ -729,7 +726,7 @@ namespace drawinglayer
}
}
}
-
+
if(bHasSlant)
{
if(bCreateTextureCoordinates)
@@ -899,14 +896,14 @@ namespace drawinglayer
}
void createReducedOutlines(
- const geometry::ViewInformation3D& rViewInformation,
+ const geometry::ViewInformation3D& rViewInformation,
const basegfx::B3DHomMatrix& rObjectTransform,
- const basegfx::B3DPolygon& rLoopA,
- const basegfx::B3DPolygon& rLoopB,
+ const basegfx::B3DPolygon& rLoopA,
+ const basegfx::B3DPolygon& rLoopB,
basegfx::B3DPolyPolygon& rTarget)
{
const sal_uInt32 nPointCount(rLoopA.count());
-
+
// with idetic polygons there are no outlines
if(rLoopA != rLoopB)
{
@@ -976,7 +973,7 @@ namespace drawinglayer
aToBeAdded.append(rLoopB.getB3DPoint(nIndexLeft));
rTarget.append(aToBeAdded);
}
-
+
if(fMaxRight != 0.0)
{
basegfx::B3DPolygon
aToBeAdded;
@@ -992,5 +989,4 @@ namespace drawinglayer
} // end of namespace primitive3d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/qa/complex/loadAllDocuments/StatusIndicator.java
b/main/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 2b74a58e56..37cb5c4549 100644
--- a/main/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/main/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -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.
- *
+ *
*************************************************************/
-
package complex.loadAllDocuments;
// __________ Imports __________
@@ -198,7 +197,7 @@ public class StatusIndicator implements
com.sun.star.task.XStatusIndicator
m_bWasUsed = true;
// m_aProtocol.itWasUsed();
- m_sText = new String();
+ m_sText = new String();
m_nValue = 0;
}
impl_show();
@@ -209,7 +208,7 @@ public class StatusIndicator implements
com.sun.star.task.XStatusIndicator
/**
* Internal helper to show the status.
* Currently it's implement as normal text out on stdout.
- * But of course other thimngs are possible here too.
+ * But of course other things are possible here too.
* e.g. a dialog
*/
private void impl_show()
@@ -226,7 +225,7 @@ public class StatusIndicator implements
com.sun.star.task.XStatusIndicator
// not supported yet!
} */
}
-
+
public boolean wasUsed() {
return m_bWasUsed;
}
diff --git a/main/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
b/main/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
index 47f81e11fc..406b6b32cb 100644
--- a/main/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
+++ b/main/qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo.java
@@ -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.
- *
+ *
*************************************************************/
-
-
package mod._sfx;
import java.io.PrintWriter;
@@ -75,7 +73,7 @@ public class StandaloneDocumentInfo extends TestCase {
String destUrl = null ;
/**
- * Copies file 'SfxStandaloneDocInfoObject.sdw' to tempopary
+ * Copies file 'SfxStandaloneDocInfoObject.sdw' to temporary
* location (overwriting the old file if exists).
*/
protected void initialize( TestParameters tParam, PrintWriter log ) {
diff --git a/main/sal/inc/osl/conditn.h b/main/sal/inc/osl/conditn.h
index 1c52a14677..025fa95908 100644
--- a/main/sal/inc/osl/conditn.h
+++ b/main/sal/inc/osl/conditn.h
@@ -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,21 +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 _OSL_CONDITION_H_
#define _OSL_CONDITION_H_
@@ -34,8 +31,8 @@ extern "C" {
typedef void* oslCondition;
typedef enum {
- osl_cond_result_ok, /* successful completion */
- osl_cond_result_error, /* error occurred, check osl_getLastSocketError()
for details */
+ osl_cond_result_ok, /* successful completion */
+ osl_cond_result_error, /* error occurred, check
osl_getLastSocketError() for details */
osl_cond_result_timeout, /* blocking operation timed out */
osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslConditionResult;
@@ -68,7 +65,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition);
If condition has been destroyed prematurely, wait() will
return with False.
@param Condition handle to a created condition.
- @param pTimeout Tiemout value or NULL for infinite waiting
+ @param pTimeout Timeout value or NULL for infinite waiting
@return False if system-call failed.
*/
oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const
TimeValue* pTimeout);
diff --git a/main/sc/qa/complex/dataPilot/_XNamed.java
b/main/sc/qa/complex/dataPilot/_XNamed.java
index 02aee6f2ba..7fc7875f5c 100644
--- a/main/sc/qa/complex/dataPilot/_XNamed.java
+++ b/main/sc/qa/complex/dataPilot/_XNamed.java
@@ -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.
- *
+ *
*************************************************************/
-
-
package complex.dataPilot;
import com.sun.star.container.XNamed;
@@ -48,9 +46,9 @@ import lib.TestParameters;
public class _XNamed {
/**
- * The object that is testsed.
+ * The object that is tested.
*/
- public XNamed oObj = null;
+ public XNamed oObj = null;
/**
* The test parameters
@@ -61,7 +59,7 @@ public class _XNamed {
* The log writer
*/
// private LogWriter log = null;
-
+
/**
* Constructor: gets the object to test, a logger and the test parameters
* @param xObj The test object
diff --git a/main/sc/qa/complex/dataPilot/_XPropertySet.java
b/main/sc/qa/complex/dataPilot/_XPropertySet.java
index 47f1ed0d2f..0961a3ab59 100644
--- a/main/sc/qa/complex/dataPilot/_XPropertySet.java
+++ b/main/sc/qa/complex/dataPilot/_XPropertySet.java
@@ -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.
- *
+ *
*************************************************************/
-
-
package complex.dataPilot;
import com.sun.star.beans.Property;
@@ -56,10 +54,10 @@ import util.utils;
public class _XPropertySet {
/**
- * The object that is testsed.
+ * The object that is tested.
*/
private XPropertySet oObj = null;
-
+
/**
* The test parameters
*/
@@ -75,7 +73,7 @@ public class _XPropertySet {
*/
boolean propertyChanged = false;
-
+
/**
* The own property change listener
*/
@@ -145,7 +143,7 @@ public class _XPropertySet {
// this.log = log;
this.param = param;
}
-
+
/**
* Tests method <code>getPropertySetInfo</code>. After test completed
* call {@link #getPropsToTest} method to retrieve different kinds
@@ -246,7 +244,7 @@ public class _XPropertySet {
vetoableChanged = false;
boolean result = true;
-
+
if ( PTT.constrained.equals("none") ) {
System.out.println("*** No constrained properties found ***");
} else {
@@ -302,7 +300,7 @@ public class _XPropertySet {
Object gValue = null;
Object sValue = null;
-
+
boolean result = true;
if ( PTT.normal.equals("none") ) {
@@ -396,7 +394,7 @@ public class _XPropertySet {
propertyChanged = false;
boolean result = true;
-
+
if ( PTT.bound.equals("none") ) {
System.out.println("*** No bound properties found ***");
} else {
diff --git a/main/sc/source/filter/excel/xeformula.cxx
b/main/sc/source/filter/excel/xeformula.cxx
index 5e3172afc6..b89d7b9158 100644
--- a/main/sc/source/filter/excel/xeformula.cxx
+++ b/main/sc/source/filter/excel/xeformula.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_scfilt.hxx"
@@ -46,11 +44,11 @@ using namespace ::formula;
// External reference log =====================================================
XclExpRefLogEntry::XclExpRefLogEntry() :
- mpUrl( 0 ),
- mpFirstTab( 0 ),
- mpLastTab( 0 ),
- mnFirstXclTab( EXC_TAB_DELETED ),
- mnLastXclTab( EXC_TAB_DELETED )
+ mpUrl( 0 ),
+ mpFirstTab( 0 ),
+ mpLastTab( 0 ),
+ mnFirstXclTab( EXC_TAB_DELETED ),
+ mnLastXclTab( EXC_TAB_DELETED )
{
}
@@ -59,16 +57,16 @@ XclExpRefLogEntry::XclExpRefLogEntry() :
namespace {
/** Wrapper structure for a processed Calc formula token with additional
- settings (whitespaces). */
+ settings (whitespaces). */
struct XclExpScToken
{
- const FormulaToken* mpScToken; /// Currently processed Calc token.
- sal_uInt8 mnSpaces; /// Number of spaces before the
Calc token.
+ const FormulaToken* mpScToken; // Currently processed Calc token.
+ sal_uInt8 mnSpaces; // Number of spaces before the Calc token.
- inline explicit XclExpScToken() : mpScToken( 0 ), mnSpaces( 0 ) {}
- inline bool Is() const { return mpScToken != 0; }
- inline StackVar GetType() const { return mpScToken ?
mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
- inline OpCode GetOpCode() const { return mpScToken ?
mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
+ inline explicit XclExpScToken() : mpScToken( 0 ), mnSpaces( 0 ) {}
+ inline bool Is() const { return mpScToken != 0; }
+ inline StackVar GetType() const { return mpScToken ?
mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
+ inline OpCode GetOpCode() const { return mpScToken ?
mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
};
// ----------------------------------------------------------------------------
@@ -76,9 +74,9 @@ struct XclExpScToken
/** Effective token class conversion types. */
enum XclExpClassConv
{
- EXC_CLASSCONV_ORG, /// Keep original class of the token.
- EXC_CLASSCONV_VAL, /// Convert ARR tokens to VAL class (REF
remains uncahnged).
- EXC_CLASSCONV_ARR /// Convert VAL tokens to ARR class (REF
remains uncahnged).
+ EXC_CLASSCONV_ORG, // Keep original class of the token.
+ EXC_CLASSCONV_VAL, // Convert ARR tokens to VAL class (REF
remains unchanged).
+ EXC_CLASSCONV_ARR // Convert VAL tokens to ARR class (REF
remains unchanged).
};
// ----------------------------------------------------------------------------
@@ -86,26 +84,26 @@ enum XclExpClassConv
/** Token class conversion and position of a token in the token array. */
struct XclExpTokenConvInfo
{
- sal_uInt16 mnTokPos; /// Position of the token in the token
array.
- XclFuncParamConv meConv; /// Token class conversion type.
- bool mbValType; /// Data type (false = REFTYPE, true =
VALTYPE).
+ sal_uInt16 mnTokPos; // Position of the token in the
token array.
+ XclFuncParamConv meConv; // Token class conversion type.
+ bool mbValType; // Data type (false = REFTYPE, true
= VALTYPE).
};
/** Vector of token position and conversion for all operands of an operator,
- or for all parameters of a function. */
+ or for all parameters of a function. */
struct XclExpOperandList : public ::std::vector< XclExpTokenConvInfo >
{
- inline explicit XclExpOperandList() { reserve( 2 ); }
- void AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv
eConv, bool bValType );
+ inline explicit XclExpOperandList() { reserve( 2 ); }
+ void AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv
eConv, bool bValType );
};
void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv
eConv, bool bValType )
{
- resize( size() + 1 );
- XclExpTokenConvInfo& rConvInfo = back();
- rConvInfo.mnTokPos = nTokPos;
- rConvInfo.meConv = eConv;
- rConvInfo.mbValType = bValType;
+ resize( size() + 1 );
+ XclExpTokenConvInfo& rConvInfo = back();
+ rConvInfo.mnTokPos = nTokPos;
+ rConvInfo.meConv = eConv;
+ rConvInfo.mbValType = bValType;
}
typedef ScfRef< XclExpOperandList > XclExpOperandListRef;
@@ -116,19 +114,19 @@ typedef ::std::vector< XclExpOperandListRef >
XclExpOperandListVector;
/** Encapsulates all data needed for a call to an external function (macro,
add-in). */
struct XclExpExtFuncData
{
- String maFuncName; /// Name of the function.
- bool mbVBasic; /// True = Visual Basic macro call.
- bool mbHidden; /// True = Create hidden defined
name.
+ String maFuncName; // Name of the function.
+ bool mbVBasic; // True = Visual Basic macro
call.
+ bool mbHidden; // True = Create hidden defined
name.
- inline explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden(
false ) {}
- void Set( const String& rFuncName, bool bVBasic, bool
bHidden );
+ inline explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden(
false ) {}
+ void Set( const String& rFuncName, bool bVBasic, bool
bHidden );
};
void XclExpExtFuncData::Set( const String& rFuncName, bool bVBasic, bool
bHidden )
{
- maFuncName = rFuncName;
- mbVBasic = bVBasic;
- mbHidden = bHidden;
+ maFuncName = rFuncName;
+ mbVBasic = bVBasic;
+ mbHidden = bHidden;
}
// ----------------------------------------------------------------------------
@@ -167,12 +165,12 @@ public:
inline void AppendAttrPos( sal_uInt16 nPos ) {
maAttrPosVec.push_back( nPos ); }
private:
- ScfUInt16Vec maAttrPosVec; /// Token array positions of tAttr
tokens.
- const XclExpScToken& mrTokData; /// Data about processed function
name token.
- const XclFunctionInfo& mrFuncInfo; /// Constant data about processed
function.
- XclExpExtFuncData maExtFuncData; /// Data for external functions
(macro, add-in).
- XclExpOperandListRef mxOperands; /// Class conversion and position
of all parameters.
- const XclFuncParamInfo* mpParamInfo; /// Information for current
parameter.
+ ScfUInt16Vec maAttrPosVec; // Token array positions of tAttr
tokens.
+ const XclExpScToken& mrTokData; // Data about processed function
name token.
+ const XclFunctionInfo& mrFuncInfo; // Constant data about processed
function.
+ XclExpExtFuncData maExtFuncData; // Data for external functions
(macro, add-in).
+ XclExpOperandListRef mxOperands; // Class conversion and position
of all parameters.
+ const XclFuncParamInfo* mpParamInfo; // Information for current
parameter.
};
XclExpFuncData::XclExpFuncData( const XclExpScToken& rTokData,
@@ -236,20 +234,20 @@ void XclExpFuncData::FinishParam( sal_uInt16 nTokPos )
/** Type of token class handling. */
enum XclExpFmlaClassType
{
- EXC_CLASSTYPE_CELL, /// Cell formula, shared formula.
- EXC_CLASSTYPE_ARRAY, /// Array formula, conditional formatting,
data validation.
- EXC_CLASSTYPE_NAME /// Defined name, range list.
+ EXC_CLASSTYPE_CELL, // Cell formula, shared formula.
+ EXC_CLASSTYPE_ARRAY, // Array formula, conditional formatting, data
validation.
+ EXC_CLASSTYPE_NAME // Defined name, range list.
};
/** Configuration data of the formula compiler. */
struct XclExpCompConfig
{
- XclFormulaType meType; /// Type of the formula to be created.
- XclExpFmlaClassType meClassType; /// Token class handling type.
- bool mbLocalLinkMgr; /// True = local (per-sheet) link
manager, false = global.
- bool mbFromCell; /// True = Any kind of cell formula
(cell, array, shared).
- bool mb3DRefOnly; /// True = Only 3D references allowed
(e.g. names).
- bool mbAllowArrays; /// True = Allow inline arrays.
+ XclFormulaType meType; // Type of the formula to be created.
+ XclExpFmlaClassType meClassType; // Token class handling type.
+ bool mbLocalLinkMgr; // True = local (per-sheet) link
manager, false = global.
+ bool mbFromCell; // True = Any kind of cell formula
(cell, array, shared).
+ bool mb3DRefOnly; // True = Only 3D references allowed
(e.g. names).
+ bool mbAllowArrays; // True = Allow inline arrays.
};
/** The table containing configuration data for all formula types. */
@@ -275,20 +273,20 @@ struct XclExpCompData
{
typedef ScfRef< ScTokenArray > ScTokenArrayRef;
- const XclExpCompConfig& mrCfg; /// Configuration for current
formula type.
- ScTokenArrayRef mxOwnScTokArr; /// Own clone of a Calc token
array.
- XclTokenArrayIterator maTokArrIt; /// Iterator in Calc token array.
- XclExpLinkManager* mpLinkMgr; /// Link manager for current
context (local/global).
- XclExpRefLog* mpRefLog; /// Log for external references.
- const ScAddress* mpScBasePos; /// Current cell position of the
formula.
-
- ScfUInt8Vec maTokVec; /// Byte vector containing token
data.
- ScfUInt8Vec maExtDataVec; /// Byte vector containing
extended data (arrays, stacked NLRs).
- XclExpOperandListVector maOpListVec; /// Formula structure, maps
operators to their operands.
- ScfUInt16Vec maOpPosStack; /// Stack with positions of
operand tokens waiting for an operator.
- bool mbStopAtSep; /// True = Stop subexpression
creation at an ocSep token.
- bool mbVolatile; /// True = Formula contains
volatile function.
- bool mbOk; /// Current state of the compiler.
+ const XclExpCompConfig& mrCfg; // Configuration for current
formula type.
+ ScTokenArrayRef mxOwnScTokArr; // Own clone of a Calc token array.
+ XclTokenArrayIterator maTokArrIt; // Iterator in Calc token array.
+ XclExpLinkManager* mpLinkMgr; // Link manager for current
context (local/global).
+ XclExpRefLog* mpRefLog; // Log for external references.
+ const ScAddress* mpScBasePos; // Current cell position of the
formula.
+
+ ScfUInt8Vec maTokVec; // Byte vector containing token
data.
+ ScfUInt8Vec maExtDataVec; // Byte vector containing extended
data (arrays, stacked NLRs).
+ XclExpOperandListVector maOpListVec; // Formula structure, maps
operators to their operands.
+ ScfUInt16Vec maOpPosStack; // Stack with positions of operand
tokens waiting for an operator.
+ bool mbStopAtSep; // True = Stop subexpression
creation at an ocSep token.
+ bool mbVolatile; // True = Formula contains
volatile function.
+ bool mbOk; // Current state of the compiler.
explicit XclExpCompData( const XclExpCompConfig* pCfg );
};
@@ -476,17 +474,17 @@ private:
typedef ScfRef< XclExpCompData > XclExpCompDataRef;
typedef ::std::vector< XclExpCompDataRef >
XclExpCompDataVector;
- XclExpCompConfigMap maCfgMap; /// Compiler configuration map for all
formula types.
- XclFunctionProvider maFuncProv; /// Excel function data provider.
- XclExpCompDataRef mxData; /// Working data for current formula.
- XclExpCompDataVector maDataStack; /// Stack for working data, when
compiler is called recursively.
- const XclBiff meBiff; /// Cached BIFF version to save
GetBiff() calls.
- const SCsCOL mnMaxAbsCol; /// Maximum column index.
- const SCsROW mnMaxAbsRow; /// Maximum row index.
- const SCsCOL mnMaxScCol; /// Maximum column index in Calc
itself.
- const SCsROW mnMaxScRow; /// Maximum row index in Calc itself.
- const sal_uInt16 mnMaxColMask; /// Mask to delete invalid bits in
column fields.
- const sal_uInt16 mnMaxRowMask; /// Mask to delete invalid bits in row
fields.
+ XclExpCompConfigMap maCfgMap; // Compiler configuration map for all
formula types.
+ XclFunctionProvider maFuncProv; // Excel function data provider.
+ XclExpCompDataRef mxData; // Working data for current formula.
+ XclExpCompDataVector maDataStack; // Stack for working data, when
compiler is called recursively.
+ const XclBiff meBiff; // Cached BIFF version to save
GetBiff() calls.
+ const SCsCOL mnMaxAbsCol; // Maximum column index.
+ const SCsROW mnMaxAbsRow; // Maximum row index.
+ const SCsCOL mnMaxScCol; // Maximum column index in Calc itself.
+ const SCsROW mnMaxScRow; // Maximum row index in Calc itself.
+ const sal_uInt16 mnMaxColMask; // Mask to delete invalid bits in
column fields.
+ const sal_uInt16 mnMaxRowMask; // Mask to delete invalid bits in row
fields.
};
// ----------------------------------------------------------------------------
@@ -2650,3 +2648,5 @@ XclTokenArrayRef
XclExpFormulaCompiler::CreateNameXFormula(
}
// ============================================================================
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/inc/svx/sdrpaintwindow.hxx
b/main/svx/inc/svx/sdrpaintwindow.hxx
index 5b5c48a4be..03be5cbeb7 100644
--- a/main/svx/inc/svx/sdrpaintwindow.hxx
+++ b/main/svx/inc/svx/sdrpaintwindow.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 _SDRPAINTWINDOW_HXX
#define _SDRPAINTWINDOW_HXX
@@ -29,7 +27,6 @@
#endif
#include "svx/svxdllapi.h"
-////////////////////////////////////////////////////////////////////////////////////////////////////
// predeclarations
class SdrPaintView;
@@ -87,14 +84,14 @@ private:
// #i72889# flag if this is only a temporary target for repaint,
default is false
unsigned
mbTemporaryTarget : 1;
- /** Remember whether the mpOverlayManager supports buffering. Using
- this flags expensive dynamic_casts on mpOverlayManager in order to
- detect this.
- */
- bool mbUseBuffer;
+ /** Remember whether the mpOverlayManager supports buffering. Using
+ this flags expensive dynamic_casts on mpOverlayManager in order
to
+ detect this.
+ */
+ bool mbUseBuffer;
// helpers
- void impCreateOverlayManager();
+ void impCreateOverlayManager();
public:
SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut);
@@ -135,7 +132,7 @@ public:
const Region& GetRedrawRegion() const;
void SetRedrawRegion(const Region& rNew);
- // #i72889# read/write access to TempoparyTarget
+ // #i72889# read/write access to TemporaryTarget
bool getTemporaryTarget() const { return (bool)mbTemporaryTarget; }
void setTemporaryTarget(bool bNew) { if(bNew !=
(bool)mbTemporaryTarget) mbTemporaryTarget = bNew; }
@@ -149,3 +146,5 @@ typedef ::std::vector< SdrPaintWindow* >
SdrPaintWindowVector;
////////////////////////////////////////////////////////////////////////////////////////////////////
#endif //_SDRPAINTWINDOW_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
b/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 0fceeb7edc..accc268853 100644
--- a/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/main/svx/source/sdr/contact/viewcontactofgraphic.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"
#include <svx/sdr/contact/viewcontactofgraphic.hxx>
@@ -55,8 +53,6 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
namespace sdr
{
namespace contact
@@ -82,12 +78,12 @@ namespace sdr
void ViewContactOfGraphic::flushGraphicObjects()
{
- // #i102380# The graphic is swapped out. To let that
have an effect ist is necessary to
+ // #i102380# The graphic is swapped out. To let that
have an effect it is necessary to
// delete copies of the GraphicObject which are not
swapped out and have no SwapHandler set
- // (this is what happnes when the GraphicObject gets
copied to a SdrGrafPrimitive2D). This
+ // (this is what happens when the GraphicObject gets
copied to a SdrGrafPrimitive2D). This
// is best achieved for the VC by clearing the local
decomposition cache. It would be possible
- // to also do this for the VOC cache, but that VOCs
exist exactly expresss that the object
- // gets visualised, so this would be wrong.
+ // to also do this for the VOC cache, but that VOCs
exist exactly express that the object
+ // gets visualized, so this would be wrong.
flushViewIndependentPrimitive2DSequence();
}
@@ -96,61 +92,61 @@ namespace sdr
const
drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const
{
drawinglayer::primitive2d::Primitive2DSequence xRetval;
- GraphicObject aEmptyGraphicObject;
+ GraphicObject aEmptyGraphicObject;
GraphicAttr aEmptyGraphicAttr;
-
- // SdrGrafPrimitive2D without content in original size which
carries all eventual attributes and texts
- const drawinglayer::primitive2d::Primitive2DReference
xReferenceA(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
- rObjectMatrix,
- rAttribute,
- aEmptyGraphicObject,
+
+ // SdrGrafPrimitive2D without content in original size
which carries all eventual attributes and texts
+ const drawinglayer::primitive2d::Primitive2DReference
xReferenceA(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
+ rObjectMatrix,
+ rAttribute,
+ aEmptyGraphicObject,
aEmptyGraphicAttr));
- xRetval =
drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1);
-
- // SdrGrafPrimitive2D with content (which is the preview graphic)
scaled to smaller size and
- // without attributes
- basegfx::B2DHomMatrix aSmallerMatrix;
-
- // #i94431# for some reason, i forgot to take the PrefMapMode of
the graphic
- // into account. Since EmptyPresObj's are only used in
Draw/Impress, it is
- // safe to assume 100th mm as target.
+ xRetval =
drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1);
+
+ // SdrGrafPrimitive2D with content (which is the
preview graphic) scaled to smaller size and
+ // without attributes
+ basegfx::B2DHomMatrix aSmallerMatrix;
+
+ // #i94431# for some reason, i forgot to take the
PrefMapMode of the graphic
+ // into account. Since EmptyPresObj's are only used in
Draw/Impress, it is
+ // safe to assume 100th mm as target.
Size aPrefSize(GetGrafObject().GetGrafPrefSize());
- if(MAP_PIXEL == GetGrafObject().GetGrafPrefMapMode().GetMapUnit())
- {
- aPrefSize =
Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MAP_100TH_MM);
- }
- else
- {
- aPrefSize =
Application::GetDefaultDevice()->LogicToLogic(aPrefSize,
GetGrafObject().GetGrafPrefMapMode(), MAP_100TH_MM);
- }
-
+ if(MAP_PIXEL ==
GetGrafObject().GetGrafPrefMapMode().GetMapUnit())
+ {
+ aPrefSize =
Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MAP_100TH_MM);
+ }
+ else
+ {
+ aPrefSize =
Application::GetDefaultDevice()->LogicToLogic(aPrefSize,
GetGrafObject().GetGrafPrefMapMode(), MAP_100TH_MM);
+ }
+
// decompose object matrix to get single values
basegfx::B2DVector aScale, aTranslate;
double fRotate, fShearX;
rObjectMatrix.decompose(aScale, aTranslate, fRotate,
fShearX);
-
+
const double fOffsetX((aScale.getX() -
aPrefSize.getWidth()) / 2.0);
- const double fOffsetY((aScale.getY() - aPrefSize.getHeight()) /
2.0);
+ const double fOffsetY((aScale.getY() -
aPrefSize.getHeight()) / 2.0);
- if(basegfx::fTools::moreOrEqual(fOffsetX, 0.0) &&
basegfx::fTools::moreOrEqual(fOffsetY, 0.0))
- {
- // create the EmptyPresObj fallback
visualisation. The fallback graphic
+ if(basegfx::fTools::moreOrEqual(fOffsetX, 0.0) &&
basegfx::fTools::moreOrEqual(fOffsetY, 0.0))
+ {
+ // create the EmptyPresObj fallback
visualization. The fallback graphic
// is already provided in rGraphicObject in
this case, use it
aSmallerMatrix =
basegfx::tools::createScaleTranslateB2DHomMatrix(aPrefSize.getWidth(),
aPrefSize.getHeight(), fOffsetX, fOffsetY);
aSmallerMatrix =
basegfx::tools::createShearXRotateTranslateB2DHomMatrix(fShearX, fRotate,
aTranslate)
* aSmallerMatrix;
const GraphicObject& rGraphicObject =
GetGrafObject().GetGraphicObject(false);
- const GraphicAttr aLocalGrafInfo;
- const drawinglayer::primitive2d::Primitive2DReference
xReferenceB(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
- aSmallerMatrix,
- drawinglayer::attribute::SdrLineFillShadowTextAttribute(),
- rGraphicObject,
- aLocalGrafInfo));
-
-
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval,
xReferenceB);
- }
+ const GraphicAttr aLocalGrafInfo;
+ const
drawinglayer::primitive2d::Primitive2DReference xReferenceB(new
drawinglayer::primitive2d::SdrGrafPrimitive2D(
+ aSmallerMatrix,
+
drawinglayer::attribute::SdrLineFillShadowTextAttribute(),
+ rGraphicObject,
+ aLocalGrafInfo));
+
+
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval,
xReferenceB);
+ }
return xRetval;
}
@@ -160,21 +156,21 @@ namespace sdr
const
drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const
{
drawinglayer::primitive2d::Primitive2DSequence xRetval;
- GraphicObject aEmptyGraphicObject;
+ GraphicObject aEmptyGraphicObject;
GraphicAttr aEmptyGraphicAttr;
-
- // SdrGrafPrimitive2D without content in original size which
carries all eventual attributes and texts
- const drawinglayer::primitive2d::Primitive2DReference
xReferenceA(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
- rObjectMatrix,
- rAttribute,
- aEmptyGraphicObject,
+
+ // SdrGrafPrimitive2D without content in original size
which carries all eventual attributes and texts
+ const drawinglayer::primitive2d::Primitive2DReference
xReferenceA(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
+ rObjectMatrix,
+ rAttribute,
+ aEmptyGraphicObject,
aEmptyGraphicAttr));
- xRetval =
drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1);
+ xRetval =
drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1);
if(rAttribute.getLine().isDefault())
{
// create a surrounding frame when no linestyle
given
- const Color
aColor(Application::GetSettings().GetStyleSettings().GetShadowColor());
+ const Color
aColor(Application::GetSettings().GetStyleSettings().GetShadowColor());
const basegfx::BColor
aBColor(aColor.getBColor());
basegfx::B2DPolygon
aOutline(basegfx::tools::createUnitPolygon());
aOutline.transform(rObjectMatrix);
@@ -216,19 +212,19 @@ namespace sdr
{
aPrefSize =
Application::GetDefaultDevice()->LogicToLogic(aPrefSize,
aDraftBitmap.GetPrefMapMode(), MAP_100TH_MM);
}
-
- const double fBitmapScaling(2.0);
+
+ const double fBitmapScaling(2.0);
const double fWidth(aPrefSize.getWidth() *
fBitmapScaling);
const double fHeight(aPrefSize.getHeight() *
fBitmapScaling);
-
- if(basegfx::fTools::more(fWidth, 1.0)
+
+ if(basegfx::fTools::more(fWidth, 1.0)
&& basegfx::fTools::more(fHeight, 1.0)
&& basegfx::fTools::lessOrEqual(fWidth,
aScale.getX())
&&
basegfx::fTools::lessOrEqual(fHeight, aScale.getY()))
{
const basegfx::B2DHomMatrix
aBitmapMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
fWidth, fHeight, fShearX,
fRotate, aTranslate.getX(), aTranslate.getY()));
-
+
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval,
drawinglayer::primitive2d::Primitive2DReference(
new
drawinglayer::primitive2d::BitmapPrimitive2D(
@@ -243,13 +239,13 @@ namespace sdr
// Build the text for the draft object
XubString aDraftText = GetGrafObject().GetFileName();
-
+
if(!aDraftText.Len())
{
aDraftText = GetGrafObject().GetName();
aDraftText.AppendAscii(" ...");
}
-
+
if(aDraftText.Len() && GetGrafObject().GetModel())
{
// #i103255# Goal is to produce TextPrimitives which hold the
given text as
@@ -295,7 +291,7 @@ namespace sdr
const drawinglayer::geometry::ViewInformation2D
aViewInformation2D;
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(
- xRetval,
+ xRetval,
aBlockTextPrimitive.get2DDecomposition(aViewInformation2D));
}
}
@@ -323,11 +319,11 @@ namespace sdr
aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(),
rCrop.GetRight(), rCrop.GetBottom());
- // we have content if graphic is not completely transparent
- const bool bHasContent(255L != aLocalGrafInfo.GetTransparency());
+ // we have content if graphic is not completely
transparent
+ const bool bHasContent(255L !=
aLocalGrafInfo.GetTransparency());
drawinglayer::attribute::SdrLineFillShadowTextAttribute
aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
- rItemSet,
+ rItemSet,
GetGrafObject().getText(0),
bHasContent));
@@ -335,8 +331,8 @@ namespace sdr
// which will use the primitive data we just create in
the near future
const Rectangle& rRectangle =
GetGrafObject().GetGeoRect();
const ::basegfx::B2DRange aObjectRange(
- rRectangle.Left(), rRectangle.Top(),
- rRectangle.Right(), rRectangle.Bottom());
+ rRectangle.Left(), rRectangle.Top(),
+ rRectangle.Right(), rRectangle.Bottom());
// look for mirroring
const GeoStat& rGeoStat(GetGrafObject().GetGeoStat());
@@ -349,7 +345,7 @@ namespace sdr
// set mirror flags at LocalGrafInfo. Take into account
that the geometry in
// aObjectRange is already changed and rotated when
bRota180 is used. To rebuild
- // that old behaviour (as long as part of the model
data), correct the H/V flags
+ // that old behavior (as long as part of the model
data), correct the H/V flags
// accordingly. The created bitmapPrimitive WILL use
the rotation, too.
if(bRota180)
{
@@ -365,14 +361,14 @@ namespace sdr
}
// fill object matrix
- const double fShearX(rGeoStat.nShearWink ? tan((36000 -
rGeoStat.nShearWink) * F_PI18000) : 0.0);
- const double fRotate(nDrehWink ? (36000 - nDrehWink) * F_PI18000 :
0.0);
+ const double fShearX(rGeoStat.nShearWink ? tan((36000 -
rGeoStat.nShearWink) * F_PI18000) : 0.0);
+ const double fRotate(nDrehWink ? (36000 - nDrehWink) *
F_PI18000 : 0.0);
const basegfx::B2DHomMatrix
aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
- aObjectRange.getWidth(),
aObjectRange.getHeight(),
- fShearX, fRotate,
+ aObjectRange.getWidth(),
aObjectRange.getHeight(),
+ fShearX, fRotate,
aObjectRange.getMinX(),
aObjectRange.getMinY()));
- // get the current, unchenged graphic obect from
SdrGrafObj
+ // get the current, unchanged graphic object from
SdrGrafObj
const GraphicObject& rGraphicObject =
GetGrafObject().GetGraphicObject(false);
if(visualisationUsesPresObj())
@@ -384,8 +380,8 @@ namespace sdr
else if(visualisationUsesDraft())
{
// #i102380# The graphic is swapped out. To not
force a swap-in here, there is a mechanism
- // which shows a swapped-out-visualisation (which
gets created here now) and an asynchronious
- // visual update mechanism for swapped-out grapgics
when they were loaded (see AsynchGraphicLoadingEvent
+ // which shows a swapped-out-visualization (which
gets created here now) and an asynchronous
+ // visual update mechanism for swapped-out graphics
when they were loaded (see AsynchGraphicLoadingEvent
// and ViewObjectContactOfGraphic implementation).
Not forcing the swap-in here allows faster
// (non-blocking) processing here and thus in the
effect e.g. fast scrolling through pages
xRetval = createVIP2DSForDraft(aObjectMatrix,
aAttribute);
@@ -396,49 +392,48 @@ namespace sdr
// SdrGrafPrimitive2D constructor will force a full swap-in of
the graphic
const drawinglayer::primitive2d::Primitive2DReference
xReference(
new drawinglayer::primitive2d::SdrGrafPrimitive2D(
- aObjectMatrix,
- aAttribute,
- rGraphicObject,
+ aObjectMatrix,
+ aAttribute,
+ rGraphicObject,
aLocalGrafInfo));
xRetval =
drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
// always append an invisible outline for the cases
where no visible content exists
-
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval,
+
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval,
drawinglayer::primitive2d::createHiddenGeometryPrimitives2D(
false, aObjectMatrix));
return xRetval;
}
- bool ViewContactOfGraphic::visualisationUsesPresObj() const
- {
- return GetGrafObject().IsEmptyPresObj();
- }
+ bool ViewContactOfGraphic::visualisationUsesPresObj() const
+ {
+ return GetGrafObject().IsEmptyPresObj();
+ }
- bool ViewContactOfGraphic::visualisationUsesDraft() const
- {
- // no draft when already PresObj
- if(visualisationUsesPresObj())
- return false;
+ bool ViewContactOfGraphic::visualisationUsesDraft() const
+ {
+ // no draft when already PresObj
+ if(visualisationUsesPresObj())
+ return false;
- // draft when swapped out
+ // draft when swapped out
const GraphicObject& rGraphicObject =
GetGrafObject().GetGraphicObject(false);
- static bool bAllowReplacements(true);
+ static bool bAllowReplacements(true);
- if(rGraphicObject.IsSwappedOut() && bAllowReplacements)
- return true;
+ if(rGraphicObject.IsSwappedOut() && bAllowReplacements)
+ return true;
- // draft when no graphic
- if(GRAPHIC_NONE == rGraphicObject.GetType() || GRAPHIC_DEFAULT ==
rGraphicObject.GetType())
- return true;
+ // draft when no graphic
+ if(GRAPHIC_NONE == rGraphicObject.GetType() ||
GRAPHIC_DEFAULT == rGraphicObject.GetType())
+ return true;
- return false;
- }
+ return false;
+ }
} // end of namespace contact
} // end of namespace sdr
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/ww8graf2.cxx
b/main/sw/source/filter/ww8/ww8graf2.cxx
index f9f532b7f3..20fe0976a6 100644
--- a/main/sw/source/filter/ww8/ww8graf2.cxx
+++ b/main/sw/source/filter/ww8/ww8graf2.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,24 +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_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <iterator>
#include <hintids.hxx>
@@ -129,7 +125,7 @@ sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId,
sal_uInt16 nFound = GetEscherObjectIdx(nSpId);
// Match the ordering position from the ShapeOrders to the ordering of all
// objects in the document, there is a complexity when escherobjects
- // contain inlines objects, we need to consider thsose as part of the
+ // contain inlines objects, we need to consider those as part of the
// escher count
sal_uLong nRet=0;
myeiter aIter = maEscherLayer.begin();
@@ -191,8 +187,8 @@ void wwZOrderer::InsertTextLayerObject(SdrObject* pObject)
}
else
{
- //If we are inside an escher objects, place us just after that
- //escher obj, and increment its inline count
+ // If we are inside an escher objects, place us just after that
+ // escher obj, and increment its inline count
sal_uInt16 nIdx = maIndexes.top();
myeiter aEnd = MapEscherIdxToIter(nIdx);
@@ -537,7 +533,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
// and the current PaM point's behind the position if
// it is anchored in content; because this anchor add
// a character into the textnode.
- // IussueZilla task 2806
+ // IssueZilla task 2806
if (FLY_AS_CHAR ==
pFlyFmtOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
{
@@ -602,9 +598,9 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
if( pRecord )
{
- //A graphic of this type in this location is always
- //inline, and uses the pic in the same mould as ww6
- //graphics.
+ // A graphic of this type in this location is always
+ // inline, and uses the pic in the same mould as ww6
+ // graphics.
if (pWFlyPara && pWFlyPara->bGrafApo)
{
WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, true);
@@ -622,8 +618,8 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
aAttrSet.Put(aFlySet);
}
- //Modified for i120717,for graf importing from MS Word
2003 binary format,
- //there is no border distance.
+ // Modified for i120717,for graf importing from MS Word
2003 binary format,
+ // there is no border distance.
/*Rectangle aInnerDist( pRecord->nDxTextLeft,
pRecord->nDyTextTop, pRecord->nDxTextRight,
pRecord->nDyTextBottom );*/
@@ -819,4 +815,4 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS,
WW8_FSPA * pFSPA )
}
#endif // defined __WW8_NEEDS_COPY
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/wizards/com/sun/star/wizards/db/DBMetaData.java
b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
index 0a57e3780e..4582fb065e 100644
--- a/main/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/main/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -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.
- *
+ *
*************************************************************/
-
package com.sun.star.wizards.db;
import com.sun.star.awt.XWindow;
@@ -417,7 +416,7 @@ public class DBMetaData
WidthList[15][0] = DataType.TIME; // == 92;
WidthList[16][0] = DataType.TIMESTAMP; // == 93;
// NumericTypes are all types where aggregate functions can be
performed on.
- // Similarly to a major competitor date/time/timmestamp fields are not
included
+ // Similarly to a major competitor date/time/timestamp fields are not
included
}
