[Libreoffice-commits] core.git: xmloff/inc xmloff/source
Takeshi Abe
tabe at fixedpoint.jp
Sat Oct 12 10:39:07 PDT 2013
xmloff/inc/MultiPropertySetHelper.hxx | 4
xmloff/inc/anim.hxx | 4
xmloff/source/chart/SchXMLTableContext.cxx | 6
xmloff/source/chart/SchXMLTableContext.hxx | 2
xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx | 2
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx | 2
xmloff/source/draw/animexp.cxx | 232 +++++++++----------
xmloff/source/draw/animimp.cxx | 2
xmloff/source/draw/eventimp.cxx | 2
xmloff/source/draw/shapeexport2.cxx | 2
xmloff/source/style/MultiPropertySetHelper.cxx | 4
xmloff/source/text/txtftne.cxx | 16 -
xmloff/source/text/txtparae.cxx | 6
xmloff/source/text/txtsecte.cxx | 2
14 files changed, 143 insertions(+), 143 deletions(-)
New commits:
commit d22ee5be41ffa0ac5a075c68a00b9b9eb6b8d376
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Oct 13 02:34:47 2013 +0900
sal_Bool to bool
Change-Id: I3db66690f9eaa809bcbf2257804d319aaec0f975
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 452ff19..c73ebd7 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -96,7 +96,7 @@ public:
* Return whether hasProperties was called
* (i.e. if we are ready to call getValues)
*/
- sal_Bool checkedProperties();
+ bool checkedProperties();
/**
* Get values from the XMultiPropertySet.
@@ -147,7 +147,7 @@ public:
const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> &,
- sal_Bool bTryMulti = sal_False );
+ bool bTryMulti = false );
/**
* Get a value from the XMultiPropertySet on demand.
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 9e1a0e5..8f81891 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -89,8 +89,8 @@ extern SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[];
extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
-void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, sal_Bool& bIn );
-::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool bIn );
+void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
+::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
#endif // _XMLOFF_ANIM_HXX
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index b3189a5..ad0b7cd 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -652,7 +652,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
}
}
- mbReadText = sal_True;
+ mbReadText = true;
SchXMLCell aCell;
aCell.eType = eValueType;
@@ -664,7 +664,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
aCell.fValue = fData;
// dont read text from following <text:p> or <text:list> element
- mbReadText = sal_False;
+ mbReadText = false;
}
mrTable.aData[ mrTable.nRowIndex ].push_back( aCell );
@@ -687,7 +687,7 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
rCell.aComplexString = Sequence< OUString >();
rCell.eType = SCH_CELL_TYPE_COMPLEX_STRING;
pContext = new SchXMLTextListContext( GetImport(), rLocalName, rCell.aComplexString );
- mbReadText = sal_False;//don't apply text from <text:p>
+ mbReadText = false;//don't apply text from <text:p>
}
// <text:p> element - read text (and range from text:id old version)
else if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_P ) )
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index f6b212b..09d2fa7 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -172,7 +172,7 @@ private:
SchXMLTable& mrTable;
OUString maCellContent;
OUString maRangeId;
- sal_Bool mbReadText;
+ bool mbReadText;
public:
SchXMLTableCellContext( SchXMLImportHelper& rImpHelper,
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index 3b82f7a..1243011 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
@@ -83,7 +83,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue,
bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue,
const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- bool bResult = sal_False;
+ bool bResult = false;
OUStringBuffer sValueBuffer;
if( m_bCrossingValue )
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 7e89743..7b95f63 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -75,7 +75,7 @@ bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue,
rValue <<= eType;
- return sal_True;
+ return true;
}
bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue,
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 2bc55ba..f9b287b 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -53,125 +53,125 @@ const struct Effect
XMLEffect meKind;
XMLEffectDirection meDirection;
sal_Int16 mnStartScale;
- sal_Bool mbIn;
+ bool mbIn;
}
AnimationEffectMap[] =
{
- { EK_none, ED_none, -1, sal_True }, // AnimationEffect_NONE
- { EK_fade, ED_from_left, -1, sal_True }, // AnimationEffect_FADE_FROM_LEFT
- { EK_fade, ED_from_top, -1, sal_True }, // AnimationEffect_FADE_FROM_TOP
- { EK_fade, ED_from_right, -1, sal_True }, // AnimationEffect_FADE_FROM_RIGHT
- { EK_fade, ED_from_bottom, -1, sal_True }, // AnimationEffect_FADE_FROM_BOTTOM
- { EK_fade, ED_to_center, -1, sal_True }, // AnimationEffect_FADE_TO_CENTER
- { EK_fade, ED_from_center, -1, sal_True }, // AnimationEffect_FADE_FROM_CENTER
- { EK_move, ED_from_left, -1, sal_True }, // AnimationEffect_MOVE_FROM_LEFT
- { EK_move, ED_from_top, -1, sal_True }, // AnimationEffect_MOVE_FROM_TOP
- { EK_move, ED_from_right, -1, sal_True }, // AnimationEffect_MOVE_FROM_RIGHT
- { EK_move, ED_from_bottom, -1, sal_True }, // AnimationEffect_MOVE_FROM_BOTTOM
- { EK_stripes, ED_vertical, -1, sal_True }, // AnimationEffect_VERTICAL_STRIPES
- { EK_stripes, ED_horizontal, -1, sal_True }, // AnimationEffect_HORIZONTAL_STRIPES
- { EK_fade, ED_clockwise, -1, sal_True }, // AnimationEffect_CLOCKWISE
- { EK_fade, ED_cclockwise, -1, sal_True }, // AnimationEffect_COUNTERCLOCKWISE
- { EK_fade, ED_from_upperleft, -1, sal_True }, // AnimationEffect_FADE_FROM_UPPERLEFT
- { EK_fade, ED_from_upperright, -1, sal_True }, // AnimationEffect_FADE_FROM_UPPERRIGHT
- { EK_fade, ED_from_lowerleft, -1, sal_True }, // AnimationEffect_FADE_FROM_LOWERLEFT
- { EK_fade, ED_from_lowerright, -1, sal_True }, // AnimationEffect_FADE_FROM_LOWERRIGHT
- { EK_close,ED_vertical, -1, sal_True }, // AnimationEffect_CLOSE_VERTICAL
- { EK_close,ED_horizontal, -1, sal_True }, // AnimationEffect_CLOSE_HORIZONTAL
- { EK_open, ED_vertical, -1, sal_True }, // AnimationEffect_OPEN_VERTICAL
- { EK_open, ED_horizontal, -1, sal_True }, // AnimationEffect_OPEN_HORIZONTAL
- { EK_move, ED_path, -1, sal_True }, // AnimationEffect_PATH
- { EK_move, ED_to_left, -1, sal_False },// AnimationEffect_MOVE_TO_LEFT
- { EK_move, ED_to_top, -1, sal_False },// AnimationEffect_MOVE_TO_TOP
- { EK_move, ED_to_right, -1, sal_False },// AnimationEffect_MOVE_TO_RIGHT
- { EK_move, ED_to_bottom, -1, sal_False },// AnimationEffect_MOVE_TO_BOTTOM
- { EK_fade, ED_spiral_inward_left, -1, sal_True }, // AnimationEffect_SPIRALIN_LEFT
- { EK_fade, ED_spiral_inward_right, -1, sal_True }, // AnimationEffect_SPIRALIN_RIGHT
- { EK_fade, ED_spiral_outward_left, -1, sal_True }, // AnimationEffect_SPIRALOUT_LEFT
- { EK_fade, ED_spiral_outward_right, -1, sal_True }, // AnimationEffect_SPIRALOUT_RIGHT
- { EK_dissolve, ED_none, -1, sal_True }, // AnimationEffect_DISSOLVE
- { EK_wavyline, ED_from_left, -1, sal_True }, // AnimationEffect_WAVYLINE_FROM_LEFT
- { EK_wavyline, ED_from_top, -1, sal_True }, // AnimationEffect_WAVYLINE_FROM_TOP
- { EK_wavyline, ED_from_right, -1, sal_True }, // AnimationEffect_WAVYLINE_FROM_RIGHT
- { EK_wavyline, ED_from_bottom, -1, sal_True }, // AnimationEffect_WAVYLINE_FROM_BOTTOM
- { EK_random, ED_none, -1, sal_True }, // AnimationEffect_RANDOM
- { EK_lines, ED_vertical, -1, sal_True }, // AnimationEffect_VERTICAL_LINES
- { EK_lines, ED_horizontal, -1, sal_True }, // AnimationEffect_HORIZONTAL_LINES
- { EK_laser, ED_from_left, -1, sal_True }, // AnimationEffect_LASER_FROM_LEFT
- { EK_laser, ED_from_top, -1, sal_True }, // AnimationEffect_LASER_FROM_TOP
- { EK_laser, ED_from_right, -1, sal_True }, // AnimationEffect_LASER_FROM_RIGHT
- { EK_laser, ED_from_bottom, -1, sal_True }, // AnimationEffect_LASER_FROM_BOTTOM
- { EK_laser, ED_from_upperleft, -1, sal_True }, // AnimationEffect_LASER_FROM_UPPERLEFT
- { EK_laser, ED_from_upperright, -1, sal_True }, // AnimationEffect_LASER_FROM_UPPERRIGHT
- { EK_laser, ED_from_lowerleft, -1, sal_True }, // AnimationEffect_LASER_FROM_LOWERLEFT
- { EK_laser, ED_from_lowerright, -1, sal_True }, // AnimationEffect_LASER_FROM_LOWERRIGHT
- { EK_appear,ED_none, -1, sal_True }, // AnimationEffect_APPEAR
- { EK_hide, ED_none, -1, sal_False },// AnimationEffect_HIDE
- { EK_move, ED_from_upperleft, -1, sal_True }, // AnimationEffect_MOVE_FROM_UPPERLEFT
- { EK_move, ED_from_upperright, -1, sal_True }, // AnimationEffect_MOVE_FROM_UPPERRIGHT
- { EK_move, ED_from_lowerright, -1, sal_True }, // AnimationEffect_MOVE_FROM_LOWERRIGHT
- { EK_move, ED_from_lowerleft, -1, sal_True }, // AnimationEffect_MOVE_FROM_LOWERLEFT
- { EK_move, ED_to_upperleft, -1, sal_False },// AnimationEffect_MOVE_TO_UPPERLEFT
- { EK_move, ED_to_upperright, -1, sal_False },// AnimationEffect_MOVE_TO_UPPERRIGHT
- { EK_move, ED_to_lowerright, -1, sal_False },// AnimationEffect_MOVE_TO_LOWERRIGHT
- { EK_move, ED_to_lowerleft, -1, sal_False },// AnimationEffect_MOVE_TO_LOWERLEFT
- { EK_move_short, ED_from_left, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_LEFT
- { EK_move_short, ED_from_upperleft, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_UPPERLEFT
- { EK_move_short, ED_from_top, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_TOP
- { EK_move_short, ED_from_upperright,-1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_UPPERRIGHT
- { EK_move_short, ED_from_right, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_RIGHT
- { EK_move_short, ED_from_lowerright,-1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_LOWERRIGHT
- { EK_move_short, ED_from_bottom, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_BOTTOM
- { EK_move_short, ED_from_lowerleft, -1, sal_True }, // AnimationEffect_MOVE_SHORT_FROM_LOWERLEFT
- { EK_move_short, ED_to_left, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_LEFT
- { EK_move_short, ED_to_upperleft, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_UPPERLEFT
- { EK_move_short, ED_to_top, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_TOP
- { EK_move_short, ED_to_upperright, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_UPPERRIGHT
- { EK_move_short, ED_to_right, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_RIGHT
- { EK_move_short, ED_to_lowerright, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_LOWERRIGHT
- { EK_move_short, ED_to_bottom, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_BOTTOM
- { EK_move_short, ED_to_lowerleft, -1, sal_False },// AnimationEffect_MOVE_SHORT_TO_LOWERLEFT
- { EK_checkerboard, ED_vertical, -1, sal_True }, // AnimationEffect_VERTICAL_CHECKERBOARD
- { EK_checkerboard, ED_horizontal, -1, sal_True }, // AnimationEffect_HORIZONTAL_CHECKERBOARD
- { EK_rotate, ED_horizontal, -1, sal_True }, // AnimationEffect_HORIZONTAL_ROTATE
- { EK_rotate, ED_vertical, -1, sal_True }, // AnimationEffect_VERTICAL_ROTATE
- { EK_stretch,ED_horizontal, -1, sal_True }, // AnimationEffect_HORIZONTAL_STRETCH
- { EK_stretch,ED_vertical, -1, sal_True }, // AnimationEffect_VERTICAL_STRETCH
- { EK_stretch,ED_from_left, -1, sal_True }, // AnimationEffect_STRETCH_FROM_LEFT
- { EK_stretch,ED_from_upperleft, -1, sal_True }, // AnimationEffect_STRETCH_FROM_UPPERLEFT
- { EK_stretch,ED_from_top, -1, sal_True }, // AnimationEffect_STRETCH_FROM_TOP
- { EK_stretch,ED_from_upperright,-1, sal_True }, // AnimationEffect_STRETCH_FROM_UPPERRIGHT
- { EK_stretch,ED_from_right, -1, sal_True }, // AnimationEffect_STRETCH_FROM_RIGHT
- { EK_stretch,ED_from_lowerright,-1, sal_True }, // AnimationEffect_STRETCH_FROM_LOWERRIGHT
- { EK_stretch,ED_from_bottom, -1, sal_True }, // AnimationEffect_STRETCH_FROM_BOTTOM
- { EK_stretch,ED_from_lowerleft, -1, sal_True }, // AnimationEffect_STRETCH_FROM_LOWERLEFT
- { EK_move, ED_none, 0, sal_True }, // AnimationEffect_ZOOM_IN
- { EK_move, ED_none, 50, sal_True }, // AnimationEffect_ZOOM_IN_SMALL
- { EK_move, ED_spiral_inward_left, 0, sal_True }, // AnimationEffect_ZOOM_IN_SPIRAL
- { EK_move, ED_none, 400, sal_True }, // AnimationEffect_ZOOM_OUT
- { EK_move, ED_none, 200, sal_True }, // AnimationEffect_ZOOM_OUT_SMALL
- { EK_move, ED_spiral_inward_left, 400, sal_True }, // AnimationEffect_ZOOM_OUT_SPIRAL
- { EK_move, ED_from_left, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_LEFT
- { EK_move, ED_from_upperleft, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_UPPERLEFT
- { EK_move, ED_from_top, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_TOP
- { EK_move, ED_from_upperright, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_UPPERRIGHT
- { EK_move, ED_from_right, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_RIGHT
- { EK_move, ED_from_lowerright, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_LOWERRIGHT
- { EK_move, ED_from_bottom, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_BOTTOM
- { EK_move, ED_from_lowerleft, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_LOWERLEFT
- { EK_move, ED_from_center, 0, sal_True }, // AnimationEffect_ZOOM_IN_FROM_CENTER
- { EK_move, ED_from_left, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_LEFT
- { EK_move, ED_from_upperleft, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_UPPERLEFT
- { EK_move, ED_from_top, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_TOP
- { EK_move, ED_from_upperright,400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_UPPERRIGHT
- { EK_move, ED_from_right, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_RIGHT
- { EK_move, ED_from_lowerright,400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT
- { EK_move, ED_from_bottom, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_BOTTOM
- { EK_move, ED_from_lowerleft, 400, sal_True }, // AnimationEffect_ZOOM_OUT_FROM_LOWERLEFT
- { EK_move, ED_from_center, 400, sal_True } // AnimationEffect_ZOOM_OUT_FROM_CENTER
+ { EK_none, ED_none, -1, true }, // AnimationEffect_NONE
+ { EK_fade, ED_from_left, -1, true }, // AnimationEffect_FADE_FROM_LEFT
+ { EK_fade, ED_from_top, -1, true }, // AnimationEffect_FADE_FROM_TOP
+ { EK_fade, ED_from_right, -1, true }, // AnimationEffect_FADE_FROM_RIGHT
+ { EK_fade, ED_from_bottom, -1, true }, // AnimationEffect_FADE_FROM_BOTTOM
+ { EK_fade, ED_to_center, -1, true }, // AnimationEffect_FADE_TO_CENTER
+ { EK_fade, ED_from_center, -1, true }, // AnimationEffect_FADE_FROM_CENTER
+ { EK_move, ED_from_left, -1, true }, // AnimationEffect_MOVE_FROM_LEFT
+ { EK_move, ED_from_top, -1, true }, // AnimationEffect_MOVE_FROM_TOP
+ { EK_move, ED_from_right, -1, true }, // AnimationEffect_MOVE_FROM_RIGHT
+ { EK_move, ED_from_bottom, -1, true }, // AnimationEffect_MOVE_FROM_BOTTOM
+ { EK_stripes, ED_vertical, -1, true }, // AnimationEffect_VERTICAL_STRIPES
+ { EK_stripes, ED_horizontal, -1, true }, // AnimationEffect_HORIZONTAL_STRIPES
+ { EK_fade, ED_clockwise, -1, true }, // AnimationEffect_CLOCKWISE
+ { EK_fade, ED_cclockwise, -1, true }, // AnimationEffect_COUNTERCLOCKWISE
+ { EK_fade, ED_from_upperleft, -1, true }, // AnimationEffect_FADE_FROM_UPPERLEFT
+ { EK_fade, ED_from_upperright, -1, true }, // AnimationEffect_FADE_FROM_UPPERRIGHT
+ { EK_fade, ED_from_lowerleft, -1, true }, // AnimationEffect_FADE_FROM_LOWERLEFT
+ { EK_fade, ED_from_lowerright, -1, true }, // AnimationEffect_FADE_FROM_LOWERRIGHT
+ { EK_close,ED_vertical, -1, true }, // AnimationEffect_CLOSE_VERTICAL
+ { EK_close,ED_horizontal, -1, true }, // AnimationEffect_CLOSE_HORIZONTAL
+ { EK_open, ED_vertical, -1, true }, // AnimationEffect_OPEN_VERTICAL
+ { EK_open, ED_horizontal, -1, true }, // AnimationEffect_OPEN_HORIZONTAL
+ { EK_move, ED_path, -1, true }, // AnimationEffect_PATH
+ { EK_move, ED_to_left, -1, false },// AnimationEffect_MOVE_TO_LEFT
+ { EK_move, ED_to_top, -1, false },// AnimationEffect_MOVE_TO_TOP
+ { EK_move, ED_to_right, -1, false },// AnimationEffect_MOVE_TO_RIGHT
+ { EK_move, ED_to_bottom, -1, false },// AnimationEffect_MOVE_TO_BOTTOM
+ { EK_fade, ED_spiral_inward_left, -1, true }, // AnimationEffect_SPIRALIN_LEFT
+ { EK_fade, ED_spiral_inward_right, -1, true }, // AnimationEffect_SPIRALIN_RIGHT
+ { EK_fade, ED_spiral_outward_left, -1, true }, // AnimationEffect_SPIRALOUT_LEFT
+ { EK_fade, ED_spiral_outward_right, -1, true }, // AnimationEffect_SPIRALOUT_RIGHT
+ { EK_dissolve, ED_none, -1, true }, // AnimationEffect_DISSOLVE
+ { EK_wavyline, ED_from_left, -1, true }, // AnimationEffect_WAVYLINE_FROM_LEFT
+ { EK_wavyline, ED_from_top, -1, true }, // AnimationEffect_WAVYLINE_FROM_TOP
+ { EK_wavyline, ED_from_right, -1, true }, // AnimationEffect_WAVYLINE_FROM_RIGHT
+ { EK_wavyline, ED_from_bottom, -1, true }, // AnimationEffect_WAVYLINE_FROM_BOTTOM
+ { EK_random, ED_none, -1, true }, // AnimationEffect_RANDOM
+ { EK_lines, ED_vertical, -1, true }, // AnimationEffect_VERTICAL_LINES
+ { EK_lines, ED_horizontal, -1, true }, // AnimationEffect_HORIZONTAL_LINES
+ { EK_laser, ED_from_left, -1, true }, // AnimationEffect_LASER_FROM_LEFT
+ { EK_laser, ED_from_top, -1, true }, // AnimationEffect_LASER_FROM_TOP
+ { EK_laser, ED_from_right, -1, true }, // AnimationEffect_LASER_FROM_RIGHT
+ { EK_laser, ED_from_bottom, -1, true }, // AnimationEffect_LASER_FROM_BOTTOM
+ { EK_laser, ED_from_upperleft, -1, true }, // AnimationEffect_LASER_FROM_UPPERLEFT
+ { EK_laser, ED_from_upperright, -1, true }, // AnimationEffect_LASER_FROM_UPPERRIGHT
+ { EK_laser, ED_from_lowerleft, -1, true }, // AnimationEffect_LASER_FROM_LOWERLEFT
+ { EK_laser, ED_from_lowerright, -1, true }, // AnimationEffect_LASER_FROM_LOWERRIGHT
+ { EK_appear,ED_none, -1, true }, // AnimationEffect_APPEAR
+ { EK_hide, ED_none, -1, false },// AnimationEffect_HIDE
+ { EK_move, ED_from_upperleft, -1, true }, // AnimationEffect_MOVE_FROM_UPPERLEFT
+ { EK_move, ED_from_upperright, -1, true }, // AnimationEffect_MOVE_FROM_UPPERRIGHT
+ { EK_move, ED_from_lowerright, -1, true }, // AnimationEffect_MOVE_FROM_LOWERRIGHT
+ { EK_move, ED_from_lowerleft, -1, true }, // AnimationEffect_MOVE_FROM_LOWERLEFT
+ { EK_move, ED_to_upperleft, -1, false },// AnimationEffect_MOVE_TO_UPPERLEFT
+ { EK_move, ED_to_upperright, -1, false },// AnimationEffect_MOVE_TO_UPPERRIGHT
+ { EK_move, ED_to_lowerright, -1, false },// AnimationEffect_MOVE_TO_LOWERRIGHT
+ { EK_move, ED_to_lowerleft, -1, false },// AnimationEffect_MOVE_TO_LOWERLEFT
+ { EK_move_short, ED_from_left, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_LEFT
+ { EK_move_short, ED_from_upperleft, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_UPPERLEFT
+ { EK_move_short, ED_from_top, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_TOP
+ { EK_move_short, ED_from_upperright,-1, true }, // AnimationEffect_MOVE_SHORT_FROM_UPPERRIGHT
+ { EK_move_short, ED_from_right, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_RIGHT
+ { EK_move_short, ED_from_lowerright,-1, true }, // AnimationEffect_MOVE_SHORT_FROM_LOWERRIGHT
+ { EK_move_short, ED_from_bottom, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_BOTTOM
+ { EK_move_short, ED_from_lowerleft, -1, true }, // AnimationEffect_MOVE_SHORT_FROM_LOWERLEFT
+ { EK_move_short, ED_to_left, -1, false },// AnimationEffect_MOVE_SHORT_TO_LEFT
+ { EK_move_short, ED_to_upperleft, -1, false },// AnimationEffect_MOVE_SHORT_TO_UPPERLEFT
+ { EK_move_short, ED_to_top, -1, false },// AnimationEffect_MOVE_SHORT_TO_TOP
+ { EK_move_short, ED_to_upperright, -1, false },// AnimationEffect_MOVE_SHORT_TO_UPPERRIGHT
+ { EK_move_short, ED_to_right, -1, false },// AnimationEffect_MOVE_SHORT_TO_RIGHT
+ { EK_move_short, ED_to_lowerright, -1, false },// AnimationEffect_MOVE_SHORT_TO_LOWERRIGHT
+ { EK_move_short, ED_to_bottom, -1, false },// AnimationEffect_MOVE_SHORT_TO_BOTTOM
+ { EK_move_short, ED_to_lowerleft, -1, false },// AnimationEffect_MOVE_SHORT_TO_LOWERLEFT
+ { EK_checkerboard, ED_vertical, -1, true }, // AnimationEffect_VERTICAL_CHECKERBOARD
+ { EK_checkerboard, ED_horizontal, -1, true }, // AnimationEffect_HORIZONTAL_CHECKERBOARD
+ { EK_rotate, ED_horizontal, -1, true }, // AnimationEffect_HORIZONTAL_ROTATE
+ { EK_rotate, ED_vertical, -1, true }, // AnimationEffect_VERTICAL_ROTATE
+ { EK_stretch,ED_horizontal, -1, true }, // AnimationEffect_HORIZONTAL_STRETCH
+ { EK_stretch,ED_vertical, -1, true }, // AnimationEffect_VERTICAL_STRETCH
+ { EK_stretch,ED_from_left, -1, true }, // AnimationEffect_STRETCH_FROM_LEFT
+ { EK_stretch,ED_from_upperleft, -1, true }, // AnimationEffect_STRETCH_FROM_UPPERLEFT
+ { EK_stretch,ED_from_top, -1, true }, // AnimationEffect_STRETCH_FROM_TOP
+ { EK_stretch,ED_from_upperright,-1, true }, // AnimationEffect_STRETCH_FROM_UPPERRIGHT
+ { EK_stretch,ED_from_right, -1, true }, // AnimationEffect_STRETCH_FROM_RIGHT
+ { EK_stretch,ED_from_lowerright,-1, true }, // AnimationEffect_STRETCH_FROM_LOWERRIGHT
+ { EK_stretch,ED_from_bottom, -1, true }, // AnimationEffect_STRETCH_FROM_BOTTOM
+ { EK_stretch,ED_from_lowerleft, -1, true }, // AnimationEffect_STRETCH_FROM_LOWERLEFT
+ { EK_move, ED_none, 0, true }, // AnimationEffect_ZOOM_IN
+ { EK_move, ED_none, 50, true }, // AnimationEffect_ZOOM_IN_SMALL
+ { EK_move, ED_spiral_inward_left, 0, true }, // AnimationEffect_ZOOM_IN_SPIRAL
+ { EK_move, ED_none, 400, true }, // AnimationEffect_ZOOM_OUT
+ { EK_move, ED_none, 200, true }, // AnimationEffect_ZOOM_OUT_SMALL
+ { EK_move, ED_spiral_inward_left, 400, true }, // AnimationEffect_ZOOM_OUT_SPIRAL
+ { EK_move, ED_from_left, 0, true }, // AnimationEffect_ZOOM_IN_FROM_LEFT
+ { EK_move, ED_from_upperleft, 0, true }, // AnimationEffect_ZOOM_IN_FROM_UPPERLEFT
+ { EK_move, ED_from_top, 0, true }, // AnimationEffect_ZOOM_IN_FROM_TOP
+ { EK_move, ED_from_upperright, 0, true }, // AnimationEffect_ZOOM_IN_FROM_UPPERRIGHT
+ { EK_move, ED_from_right, 0, true }, // AnimationEffect_ZOOM_IN_FROM_RIGHT
+ { EK_move, ED_from_lowerright, 0, true }, // AnimationEffect_ZOOM_IN_FROM_LOWERRIGHT
+ { EK_move, ED_from_bottom, 0, true }, // AnimationEffect_ZOOM_IN_FROM_BOTTOM
+ { EK_move, ED_from_lowerleft, 0, true }, // AnimationEffect_ZOOM_IN_FROM_LOWERLEFT
+ { EK_move, ED_from_center, 0, true }, // AnimationEffect_ZOOM_IN_FROM_CENTER
+ { EK_move, ED_from_left, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_LEFT
+ { EK_move, ED_from_upperleft, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_UPPERLEFT
+ { EK_move, ED_from_top, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_TOP
+ { EK_move, ED_from_upperright,400, true }, // AnimationEffect_ZOOM_OUT_FROM_UPPERRIGHT
+ { EK_move, ED_from_right, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_RIGHT
+ { EK_move, ED_from_lowerright,400, true }, // AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT
+ { EK_move, ED_from_bottom, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_BOTTOM
+ { EK_move, ED_from_lowerleft, 400, true }, // AnimationEffect_ZOOM_OUT_FROM_LOWERLEFT
+ { EK_move, ED_from_center, 400, true } // AnimationEffect_ZOOM_OUT_FROM_CENTER
};
-void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, sal_Bool& bIn )
+void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn )
{
if( eEffect < AnimationEffect_NONE || eEffect > AnimationEffect_ZOOM_OUT_FROM_CENTER )
{
@@ -347,7 +347,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
xProps->getPropertyValue( mpImpl->msEffect ) >>= eEffect;
if( eEffect != AnimationEffect_NONE )
{
- sal_Bool bIn = sal_True;
+ bool bIn = true;
SdXMLImplSetEffect( eEffect, aEffect.meEffect, aEffect.meDirection, aEffect.mnStartScale, bIn );
aEffect.meKind = bIn ? XMLE_SHOW : XMLE_HIDE;
@@ -377,7 +377,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
xProps->getPropertyValue( mpImpl->msTextEffect ) >>= eEffect;
if( eEffect != AnimationEffect_NONE )
{
- sal_Bool bIn = sal_True;
+ bool bIn = true;
SdXMLImplSetEffect( eEffect, aEffect.meEffect, aEffect.meDirection, aEffect.mnStartScale, bIn );
aEffect.meKind = bIn ? XMLE_SHOW : XMLE_HIDE;
aEffect.mbTextEffect = sal_True;
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 3c73c03..3e464a8 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -111,7 +111,7 @@ SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool /*bIn*/ )
+AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool /*bIn*/ )
{
switch( eKind )
{
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 36e4156..4f435a0 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -440,7 +440,7 @@ void SdXMLEventContext::EndElement()
case ClickAction_VANISH:
pProperties->Name = OUString( "Effect" );
pProperties->Handle = -1;
- pProperties->Value <<= ImplSdXMLgetEffect( meEffect, meDirection, mnStartScale, sal_True );
+ pProperties->Value <<= ImplSdXMLgetEffect( meEffect, meDirection, mnStartScale, true );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 9cd10f8..781bdab 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -408,7 +408,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
XMLEffect eKind;
XMLEffectDirection eDirection;
sal_Int16 nStartScale;
- sal_Bool bIn;
+ bool bIn;
SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index 298f729..06ce388 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -107,7 +107,7 @@ void MultiPropertySetHelper::hasProperties(
}
}
-sal_Bool MultiPropertySetHelper::checkedProperties()
+bool MultiPropertySetHelper::checkedProperties()
{
return (NULL != pSequenceIndex);
}
@@ -147,7 +147,7 @@ void MultiPropertySetHelper::getValues(
const Any& MultiPropertySetHelper::getValue( sal_Int16 nIndex,
const Reference< XPropertySet> & rPropSet,
- sal_Bool bTryMulti )
+ bool bTryMulti )
{
if( !pValues )
{
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 867397f..43c3d94 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -228,8 +228,8 @@ static void lcl_exportString(
const OUString& sProperty,
sal_uInt16 nPrefix,
enum XMLTokenEnum eElement,
- sal_Bool bEncodeName,
- sal_Bool bOmitIfEmpty)
+ bool bEncodeName,
+ bool bOmitIfEmpty)
{
DBG_ASSERT( eElement != XML_TOKEN_INVALID, "need element token");
@@ -255,33 +255,33 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
lcl_exportString( GetExport(), rFootnoteConfig,
sParaStyleName,
XML_NAMESPACE_TEXT, XML_DEFAULT_STYLE_NAME,
- sal_True, sal_True);
+ true, true);
// citation style
lcl_exportString( GetExport(), rFootnoteConfig,
sCharStyleName,
XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME,
- sal_True, sal_True);
+ true, true);
// citation body style
lcl_exportString( GetExport(), rFootnoteConfig,
sAnchorCharStyleName,
XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME,
- sal_True, sal_True);
+ true, true);
// page style
lcl_exportString( GetExport(), rFootnoteConfig,
sPageStyleName,
XML_NAMESPACE_TEXT, XML_MASTER_PAGE_NAME,
- sal_True, sal_True );
+ true, true );
// prefix
lcl_exportString( GetExport(), rFootnoteConfig, sPrefix,
- XML_NAMESPACE_STYLE, XML_NUM_PREFIX, sal_False, sal_True);
+ XML_NAMESPACE_STYLE, XML_NUM_PREFIX, false, true);
// suffix
lcl_exportString( GetExport(), rFootnoteConfig, sSuffix,
- XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, sal_False, sal_True);
+ XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false, true);
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e8aa453..877d714 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -620,7 +620,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
if( rPropSetHelper.hasProperty( NUMBERING_RULES_AUTO ) )
{
Reference < XIndexReplace > xNumRule(rPropSetHelper.getValue( NUMBERING_RULES_AUTO,
- rPropSet, sal_True ), uno::UNO_QUERY);
+ rPropSet, true ), uno::UNO_QUERY);
if( xNumRule.is() && xNumRule->getCount() )
{
Reference < XNamed > xNamed( xNumRule, UNO_QUERY );
@@ -666,12 +666,12 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
if( rPropSetHelper.hasProperty( PARA_STYLE_NAME_AUTO ) )
{
rPropSetHelper.getValue( PARA_STYLE_NAME_AUTO, rPropSet,
- sal_True ) >>= sParent;
+ true ) >>= sParent;
}
if( rPropSetHelper.hasProperty( PARA_CONDITIONAL_STYLE_NAME_AUTO ) )
{
rPropSetHelper.getValue( PARA_CONDITIONAL_STYLE_NAME_AUTO,
- rPropSet, sal_True ) >>= sCondParent;
+ rPropSet, true ) >>= sCondParent;
}
break;
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 2ac90d8..d0dd1e3 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -105,7 +105,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
if( rPropSetHelper.hasProperty( nTextSectionId ))
{
xNextSection.set(rPropSetHelper.getValue( nTextSectionId , xPropSet,
- sal_True ), uno::UNO_QUERY);
+ true ), uno::UNO_QUERY);
}
// else: no current section
}
More information about the Libreoffice-commits
mailing list