[Libreoffice-commits] core.git: lotuswordpro/source vbahelper/source xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sun May 1 09:53:30 UTC 2016
lotuswordpro/source/filter/lwplayout.cxx | 2 +-
lotuswordpro/source/filter/lwplayout.hxx | 4 ++--
vbahelper/source/vbahelper/vbashape.cxx | 14 +++++++-------
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 18 +++++++++---------
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 14 +++++++-------
5 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 931b6a153754cb2515650f6b6f46a4dd77c06a03
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Apr 30 14:48:32 2016 +0200
Fix typos in code
Change-Id: I408f630732a10567a3352e0c96f1289a1cf6ca81
Reviewed-on: https://gerrit.libreoffice.org/24534
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 3e80d8a..23e1a19 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1499,7 +1499,7 @@ void LwpLayout::Read()
sal_uInt8 nFlag = pStrm->QuickReaduInt8();
if (nFlag)
- m_Positon.ReadIndexed(pStrm);
+ m_Position.ReadIndexed(pStrm);
}
m_LayColumns.ReadIndexed(pStrm);
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 835d94d..a4b2117 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -429,7 +429,7 @@ protected:
void Read() override;
protected:
LwpUseWhen* m_pUseWhen;
- LwpObjectID m_Positon;
+ LwpObjectID m_Position;
LwpObjectID m_LayColumns;
LwpObjectID m_LayGutterStuff;
LwpObjectID m_LayJoinStuff;
@@ -457,7 +457,7 @@ public:
virtual bool IsUseOnAllEvenPages() override;
virtual bool IsUseOnAllOddPages() override;
virtual bool IsUseOnPage() override;
- LwpObjectID& GetPosition(){ return m_Positon;}
+ LwpObjectID& GetPosition(){ return m_Position;}
virtual rtl::Reference<LwpVirtualLayout> GetContainerLayout() override;
};
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index d6cce93..6e9f3f6 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -370,9 +370,9 @@ ScVbaShape::Delete() throw (uno::RuntimeException, std::exception)
void SAL_CALL
ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception)
{
- sal_Int32 nOrderPositon;
+ sal_Int32 nOrderPosition;
uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( "ZOrder" );
- aOrderPostion >>= nOrderPositon;
+ aOrderPostion >>= nOrderPosition;
switch( ZOrderCmd )
{
case office::MsoZOrderCmd::msoBringToFront:
@@ -382,14 +382,14 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exc
m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny( (sal_Int32)0 ) );
break;
case office::MsoZOrderCmd::msoBringForward:
- nOrderPositon += 1;
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny( nOrderPositon ) );
+ nOrderPosition += 1;
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny( nOrderPosition ) );
break;
case office::MsoZOrderCmd::msoSendBackward:
- if( nOrderPositon > 0 )
+ if( nOrderPosition > 0 )
{
- nOrderPositon -= 1;
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny( nOrderPositon ) );
+ nOrderPosition -= 1;
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny( nOrderPosition ) );
}
break;
// below two commands use with Writer for text and image object.
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index c77d0f7..6e59f83 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -655,7 +655,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
mrIndex += nRepeat;
}
-SchXMLPositonAttributesHelper::SchXMLPositonAttributesHelper( SvXMLImport& rImporter )
+SchXMLPositionAttributesHelper::SchXMLPositionAttributesHelper( SvXMLImport& rImporter )
: m_rImport( rImporter )
, m_aPosition(0,0)
, m_aSize(0,0)
@@ -668,28 +668,28 @@ SchXMLPositonAttributesHelper::SchXMLPositonAttributesHelper( SvXMLImport& rImpo
{
}
-SchXMLPositonAttributesHelper::~SchXMLPositonAttributesHelper()
+SchXMLPositionAttributesHelper::~SchXMLPositionAttributesHelper()
{
}
-bool SchXMLPositonAttributesHelper::hasSize() const
+bool SchXMLPositionAttributesHelper::hasSize() const
{
return m_bHasSizeWidth && m_bHasSizeHeight;
}
-bool SchXMLPositonAttributesHelper::hasPosition() const
+bool SchXMLPositionAttributesHelper::hasPosition() const
{
return m_bHasPositionX && m_bHasPositionY;
}
-bool SchXMLPositonAttributesHelper::hasPosSize() const
+bool SchXMLPositionAttributesHelper::hasPosSize() const
{
return hasPosition() && hasSize();
}
-bool SchXMLPositonAttributesHelper::isAutomatic() const
+bool SchXMLPositionAttributesHelper::isAutomatic() const
{
return m_bAutoSize || m_bAutoPosition;
}
-void SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
+void SchXMLPositionAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
if( XML_NAMESPACE_SVG == nPrefix )
{
@@ -720,7 +720,7 @@ void SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix
}
}
-void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
+void SchXMLPositionAttributesHelper::readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
{
if( pPropStyleContext && pStylesCtxt )
{
@@ -736,7 +736,7 @@ SchXMLCoordinateRegionContext::SchXMLCoordinateRegionContext(
SvXMLImport& rImport
, sal_uInt16 nPrefix
, const OUString& rLocalName
- , SchXMLPositonAttributesHelper& rPositioning )
+ , SchXMLPositionAttributesHelper& rPositioning )
: SvXMLImportContext( rImport, nPrefix, rLocalName )
, m_rPositioning( rPositioning )
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index c8066cb..91db789 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -54,11 +54,11 @@ private:
SchXML3DSceneAttributesHelper();
};
-class SchXMLPositonAttributesHelper
+class SchXMLPositionAttributesHelper
{
public:
- explicit SchXMLPositonAttributesHelper( SvXMLImport& rImporter );
- ~SchXMLPositonAttributesHelper();
+ explicit SchXMLPositionAttributesHelper( SvXMLImport& rImporter );
+ ~SchXMLPositionAttributesHelper();
void readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
void readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt );
@@ -123,8 +123,8 @@ private:
GlobalSeriesImportInfo m_aGlobalSeriesImportInfo;
SchXML3DSceneAttributesHelper maSceneImportHelper;
- SchXMLPositonAttributesHelper m_aOuterPositioning;//including axes and axes titles
- SchXMLPositonAttributesHelper m_aInnerPositioning;//excluding axes and axes titles
+ SchXMLPositionAttributesHelper m_aOuterPositioning;//including axes and axes titles
+ SchXMLPositionAttributesHelper m_aInnerPositioning;//excluding axes and axes titles
bool mbPercentStacked;
bool m_bAxisPositionAttributeImported;
OUString msAutoStyleName;
@@ -168,12 +168,12 @@ public:
SvXMLImport& rImport
, sal_uInt16 nPrefix
, const OUString& rLocalName
- , SchXMLPositonAttributesHelper& rPositioning );
+ , SchXMLPositionAttributesHelper& rPositioning );
virtual ~SchXMLCoordinateRegionContext();
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private:
- SchXMLPositonAttributesHelper& m_rPositioning;
+ SchXMLPositionAttributesHelper& m_rPositioning;
};
class SchXMLWallFloorContext : public SvXMLImportContext
More information about the Libreoffice-commits
mailing list