[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx | 58 +--
1 file changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 8fd03963cdaa0ffd9a5fbe0f56d6e4c2700e7883
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Apr 18 14:01:56 2012 +0200
oox: fix doxygen syntax to avoid misleading output in vml::ClientData
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index d11e34a..82c0f3e 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -139,35 +139,35 @@ protected:
/** Excel specific shape client data (such as cell anchor). */
struct ClientData
{
-::rtl::OUString maAnchor; /// Cell anchor as comma-separated
string.
-::rtl::OUString maFmlaMacro;/// Link to macro associated to
the control.
-::rtl::OUString maFmlaPict; /// Target cell range of picture
links.
-::rtl::OUString maFmlaLink; /// Link to value cell associated
to the control.
-::rtl::OUString maFmlaRange;/// Link to cell range used as
data source for the control.
-::rtl::OUString maFmlaGroup;/// Link to value cell associated
to a group of option buttons.
-sal_Int32 mnObjType; /// Type of the shape.
-sal_Int32 mnTextHAlign; /// Horizontal text alignment.
-sal_Int32 mnTextVAlign; /// Vertical text alignment.
-sal_Int32 mnCol; /// Column index for spreadsheet
cell note.
-sal_Int32 mnRow; /// Row index for spreadsheet cell
note.
-sal_Int32 mnChecked; /// State for checkboxes and
option buttons.
-sal_Int32 mnDropStyle;/// Drop down box style (read-only
or editable).
-sal_Int32 mnDropLines;/// Number of lines in drop down
box.
-sal_Int32 mnVal; /// Current value of spin buttons
and scroll bars.
-sal_Int32 mnMin; /// Minimum value of spin buttons
and scroll bars.
-sal_Int32 mnMax; /// Maximum value of spin buttons
and scroll bars.
-sal_Int32 mnInc; /// Small increment of spin
buttons and scroll bars.
-sal_Int32 mnPage; /// Large increment of spin
buttons and scroll bars.
-sal_Int32 mnSelType; /// Listbox selection type.
-sal_Int32 mnVTEdit; /// Data type of the textbox.
-boolmbPrintObject; /// True = print the object.
-boolmbVisible; /// True = cell note is visible.
-boolmbDde; /// True = object is linked
through DDE.
-boolmbNo3D; /// True = flat style, false = 3D
style.
-boolmbNo3D2;/// True = flat style, false = 3D
style (listboxes and dropdowns).
-boolmbMultiLine;/// True = textbox allows line
breaks.
-boolmbVScroll; /// True = textbox has a vertical
scrollbar.
-boolmbSecretEdit; /// True = textbox is a password
edit field.
+::rtl::OUString maAnchor; /// Cell anchor as
comma-separated string.
+::rtl::OUString maFmlaMacro;/// Link to macro associated to
the control.
+::rtl::OUString maFmlaPict; /// Target cell range of picture
links.
+::rtl::OUString maFmlaLink; /// Link to value cell associated
to the control.
+::rtl::OUString maFmlaRange;/// Link to cell range used as
data source for the control.
+::rtl::OUString maFmlaGroup;/// Link to value cell associated
to a group of option buttons.
+sal_Int32 mnObjType; /// Type of the shape.
+sal_Int32 mnTextHAlign; /// Horizontal text alignment.
+sal_Int32 mnTextVAlign; /// Vertical text alignment.
+sal_Int32 mnCol; /// Column index for spreadsheet
cell note.
+sal_Int32 mnRow; /// Row index for spreadsheet
cell note.
+sal_Int32 mnChecked; /// State for checkboxes and
option buttons.
+sal_Int32 mnDropStyle;/// Drop down box style
(read-only or editable).
+sal_Int32 mnDropLines;/// Number of lines in drop down
box.
+sal_Int32 mnVal; /// Current value of spin buttons
and scroll bars.
+sal_Int32 mnMin; /// Minimum value of spin buttons
and scroll bars.
+sal_Int32 mnMax; /// Maximum value of spin buttons
and scroll bars.
+sal_Int32 mnInc; /// Small increment of spin
buttons and scroll bars.
+sal_Int32 mnPage; /// Large increment of spin
buttons and scroll bars.
+sal_Int32 mnSelType;
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 99deffbeba414443ec7e0961501d5dcbc475b07d Author: Miklos Vajna vmik...@suse.cz Date: Thu Apr 12 14:16:38 2012 +0200 oox: fix doxygen syntax to avoid misleading output in ShapeModel diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index c6c6cb6..d11e34a 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -182,13 +182,13 @@ struct ShapeModel typedef ::std::auto_ptr ClientDataClientDataPtr; SAL_WNODEPRECATED_DECLARATIONS_POP -::rtl::OUString maType; /// Shape template with default properties. -PointVector maPoints; /// Points for the polyline shape. -TextBoxPtr mxTextBox; /// Text contents and properties. -ClientDataPtr mxClientData; /// Excel specific client data. -::rtl::OUString maLegacyDiagramPath;/// Legacy Diagram Fragment Path -::rtl::OUString maFrom; /// Start point for line shape. -::rtl::OUString maTo; /// End point for line shape. +::rtl::OUString maType; /// Shape template with default properties. +PointVector maPoints; /// Points for the polyline shape. +TextBoxPtr mxTextBox; /// Text contents and properties. +ClientDataPtr mxClientData; /// Excel specific client data. +::rtl::OUString maLegacyDiagramPath;/// Legacy Diagram Fragment Path +::rtl::OUString maFrom; /// Start point for line shape. +::rtl::OUString maTo; /// End point for line shape. explicitShapeModel(); ~ShapeModel(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/dump/dumperbase.hxx | 18 --
oox/inc/oox/dump/oledumper.hxx | 21 ---
oox/source/dump/dumperbase.cxx | 107 -
oox/source/dump/oledumper.cxx | 114
unusedcode.easy | 17 -
5 files changed, 277 deletions(-)
New commits:
commit 07ff032c805835355ff0dff75b8ad534dfb770e9
Author: Petr Vorel petr.vo...@gmail.com
Date: Mon Apr 2 11:40:06 2012 +0200
remove unused code (oox)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7f18220..a099886 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -395,7 +395,6 @@ public:
// token list -
static void appendToken( ::rtl::OUStringBuffer rStr, const
::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64
nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendIndex( ::rtl::OUStringBuffer rStr, const
::rtl::OUString rIdx );
static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64
nIdx );
@@ -1074,9 +1073,6 @@ public:
voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32
nColRow2 );
voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 );
voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 );
-voidwriteAddress( const Address rPos );
-voidwriteRange( const Range rRange );
-voidwriteRangeList( const RangeList rRanges );
template typename Type
inline void writeDec( Type nData, sal_Int32 nWidth = 0,
sal_Unicode cFill = ' ' )
@@ -1349,17 +1345,6 @@ protected:
voidwriteArrayItem( const String rName, const sal_uInt8*
pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
voidwriteDateTimeItem( const String rName, const
::com::sun::star::util::DateTime rDateTime );
voidwriteGuidItem( const String rName, const
::rtl::OUString rGuid );
-voidwriteColIndexItem( const String rName, sal_Int32 nCol
);
-voidwriteRowIndexItem( const String rName, sal_Int32 nRow
);
-voidwriteColRangeItem( const String rName, sal_Int32
nCol1, sal_Int32 nCol2 );
-voidwriteRowRangeItem( const String rName, sal_Int32
nRow1, sal_Int32 nRow2 );
-voidwriteAddressItem( const String rName, const Address
rPos );
-voidwriteRangeItem( const String rName, const Range
rRange );
-voidwriteRangeListItem( const String rName, const
RangeList rRanges );
-voidwriteTokenAddressItem( const String rName, const
TokenAddress rPos, bool bNameMode );
-voidwriteTokenAddress3dItem( const String rName, const
::rtl::OUString rRef, const TokenAddress rPos, bool bNameMode );
-voidwriteTokenRangeItem( const String rName, const
TokenRange rRange, bool bNameMode );
-voidwriteTokenRange3dItem( const String rName, const
::rtl::OUString rRef, const TokenRange rRange, bool bNameMode );
template typename Type
voidaddNameToItem( Type nData, const NameListWrapper
rListWrp );
@@ -1753,9 +1738,6 @@ protected:
const OutputObjectBase rParent,
const BinaryInputStreamRef rxStrm,
rtl_TextEncoding eTextEnc );
-voidconstruct(
-const InputObjectBase rParent,
-rtl_TextEncoding eTextEnc );
virtual boolimplIsValid() const;
virtual voidimplDump();
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 4d3ceaa..64d3d5c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -84,27 +84,6 @@ protected:
};
//
-
-class StdHlinkObject : public OleInputObjectBase
-{
-public:
-explicitStdHlinkObject( const InputObjectBase rParent );
-
-protected:
-virtual voidimplDump();
-
-private:
-::rtl::OUString dumpHyperlinkString( const String rName, bool
bUnicode );
-
-booldumpGuidAndMoniker();
-voiddumpUrlMoniker();
-voiddumpFileMoniker();
-voiddumpItemMoniker();
-voiddumpAntiMoniker();
-voiddumpCompositeMoniker();
-};
-
-//
//
class OleStreamObject : public OleInputObjectBase
[Libreoffice-commits] .: oox/inc
oox/inc/oox/export/vmlexport.hxx |5 + 1 file changed, 5 insertions(+) New commits: commit d825e23cc447b86604a89b08cb09dca82c16925d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sun Apr 1 19:15:28 2012 +0200 include guard diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx index f748755..0667a57 100644 --- a/oox/inc/oox/export/vmlexport.hxx +++ b/oox/inc/oox/export/vmlexport.hxx @@ -26,6 +26,9 @@ * / +#ifndef _OOX_EXPORT_VMLEXPORT_HXX_ +#define _OOX_EXPORT_VMLEXPORT_HXX_ + #include oox/dllapi.h #include sax/fshelper.hxx #include filter/msfilter/escherex.hxx @@ -118,4 +121,6 @@ private: } // namespace oox +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b9f79762f07448b7100bb09acd1f4ee748b32a2e Author: Miklos Vajna vmik...@suse.cz Date: Wed Mar 28 10:36:18 2012 +0200 ShapeTypeModel::maFlip: correct bogus doxygen comment diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index c4ab2cd..c6c6cb6 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -81,7 +81,7 @@ struct ShapeTypeModel ::rtl::OUString maMarginTop;/// Y position of the shape bounding box to shape anchor (number with unit). ::rtl::OUString maPositionVerticalRelative; /// The Y position is relative to this. ::rtl::OUString maRotation; /// Rotation of the shape, in degrees. -::rtl::OUString maFlip; /// Rotation of the shape, in degrees. +::rtl::OUString maFlip; /// Flip type of the shape (can be x or y). sal_BoolmbAutoHeight; /// If true, the height value is a minimum value (mostly used for textboxes) StrokeModel maStrokeModel; /// Border line formatting. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 2452e28a068803ad1ca910798339303cc52e45be
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Mar 26 13:07:03 2012 +0200
oox: fix doxygen syntax to avoid misleading output in ShapeTypeModel
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 8c68337..946af36 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -66,27 +66,27 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4;
/** The shape model structure contains all properties shared by all types of
shapes. */
struct ShapeTypeModel
{
-::rtl::OUString maShapeId; /// Unique identifier of the
shape.
-::rtl::OUString maShapeName;/// Name of the shape, if
present.
-OptValue sal_Int32 moShapeType; /// Builtin shape type
identifier.
-
-OptValue Int32Pair moCoordPos; /// Top-left position of
coordinate system for children scaling.
-OptValue Int32Pair moCoordSize; /// Size of coordinate system
for children scaling.
-::rtl::OUString maPosition; /// Position type of the shape.
-::rtl::OUString maLeft; /// X position of the shape
bounding box (number with unit).
-::rtl::OUString maTop; /// Y position of the shape
bounding box (number with unit).
-::rtl::OUString maWidth;/// Width of the shape
bounding box (number with unit).
-::rtl::OUString maHeight; /// Height of the shape
bounding box (number with unit).
-::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
-::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
-::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
-sal_BoolmbAutoHeight; /// If true, the height value
is a minimum value (mostly used for textboxes)
-
-StrokeModel maStrokeModel; /// Border line formatting.
-FillModel maFillModel;/// Shape fill formatting.
-
-OptValue ::rtl::OUString moGraphicPath; /// Path to a graphic for this
shape.
-OptValue ::rtl::OUString moGraphicTitle; /// Title of the graphic.
+::rtl::OUString maShapeId; /// Unique identifier of the
shape.
+::rtl::OUString maShapeName;/// Name of the shape, if
present.
+OptValue sal_Int32 moShapeType; /// Builtin shape type
identifier.
+
+OptValue Int32Pair moCoordPos; /// Top-left position of
coordinate system for children scaling.
+OptValue Int32Pair moCoordSize; /// Size of coordinate system
for children scaling.
+::rtl::OUString maPosition; /// Position type of the
shape.
+::rtl::OUString maLeft; /// X position of the shape
bounding box (number with unit).
+::rtl::OUString maTop; /// Y position of the shape
bounding box (number with unit).
+::rtl::OUString maWidth;/// Width of the shape
bounding box (number with unit).
+::rtl::OUString maHeight; /// Height of the shape
bounding box (number with unit).
+::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
+::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
+::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
+sal_BoolmbAutoHeight; /// If true, the height value
is a minimum value (mostly used for textboxes)
+
+StrokeModel maStrokeModel; /// Border line formatting.
+FillModel maFillModel;/// Shape fill formatting.
+
+OptValue ::rtl::OUString moGraphicPath; /// Path to a graphic for
this shape.
+OptValue ::rtl::OUString moGraphicTitle; /// Title of the graphic.
explicitShapeTypeModel();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/vml/vmlshape.hxx |1 +
oox/source/token/properties.txt|2 ++
oox/source/vml/vmlshape.cxx|9 -
oox/source/vml/vmlshapecontext.cxx |1 +
4 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 3751ab6910d06ca01d1980fce40792560afc9ebb
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Mar 23 15:28:29 2012 +0100
n#751573: docx, no mso-fit-shape-to-text means the textbox size is fixed
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 37e9c09..8c68337 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -80,6 +80,7 @@ struct ShapeTypeModel
::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
+sal_BoolmbAutoHeight; /// If true, the height value
is a minimum value (mostly used for textboxes)
StrokeModel maStrokeModel; /// Border line formatting.
FillModel maFillModel;/// Shape fill formatting.
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 560f879..97555c8 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -180,6 +180,7 @@ FooterIsDynamicHeight
FooterIsOn
FooterIsShared
FormulaConvention
+FrameIsAutomaticHeight
Function
GapwidthSequence
Geometry3D
@@ -418,6 +419,7 @@ Size
Size100thMM
SizePixel
SizeProtect
+SizeType
SkipDuplicates
SortInfo
Sound
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index bdecb8b..ec34f0e 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -113,7 +113,8 @@ Rectangle lclGetAbsRect( const Rectangle rRelRect, const
Rectangle rShapeRect,
//
-ShapeTypeModel::ShapeTypeModel()
+ShapeTypeModel::ShapeTypeModel():
+mbAutoHeight( sal_False )
{
}
@@ -368,6 +369,12 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
Reference XShape xShape = mrDrawing.createAndInsertXShape( maService,
rxShapes, rShapeRect );
convertShapeProperties( xShape );
+if ( maService.equalsAscii( com.sun.star.text.TextFrame ) )
+{
+PropertySet( xShape ).setAnyProperty( PROP_FrameIsAutomaticHeight,
makeAny( maTypeModel.mbAutoHeight ) );
+PropertySet( xShape ).setAnyProperty( PROP_SizeType, makeAny(
maTypeModel.mbAutoHeight ? SizeType::MIN : SizeType::FIX ) );
+}
+
// Import Legacy Fragments (if any)
if( xShape.is() !maShapeModel.maLegacyDiagramPath.isEmpty() )
{
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index 91703fc..12d2dc4 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -347,6 +347,7 @@ void ShapeTypeContext::setStyle( const OUString rStyle )
else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
margin-left ) ) ) mrTypeModel.maMarginLeft = aValue;
else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
margin-top ) ) )mrTypeModel.maMarginTop = aValue;
else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
mso-position-vertical-relative ) ) ) mrTypeModel.maPositionVerticalRelative =
aValue;
+else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
mso-fit-shape-to-text ) ) ) mrTypeModel.mbAutoHeight = sal_True;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source sw/source writerfilter/source
oox/inc/oox/drawingml/drawingmltypes.hxx |2 +-
oox/inc/oox/vml/vmlshape.hxx |1 +
oox/source/token/properties.txt |1 +
oox/source/vml/vmlshape.cxx | 14 +-
oox/source/vml/vmlshapecontext.cxx|1 +
sw/source/core/layout/anchoreddrawobject.cxx |7 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +++
7 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit 51cfbf0cfaec395a99a00f2c20fcba96de9a4427
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Mar 22 10:34:24 2012 +0100
n#751054 fix VML import of absolutely positioned pictures
There were multiple issues here:
- convertEmuToHmm() not handling negative values
- position:absolute style property being ignored
- mso-position-vertical-relative is not converted to
text::RelOrientation
- SwAnchoredDrawObject::_SetPositioningAttr() re-positioning already
positioned objects
- DomainMapper_Impl::PushShapeContext() inserting positioned objects as
character
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx
b/oox/inc/oox/drawingml/drawingmltypes.hxx
index 600b1bc..71174b3 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -156,7 +156,7 @@ inline sal_Int64 convertHmmToEmu( sal_Int32 nValue )
/** Converts the passed 64-bit integer value from EMUs to 1/100 mm. */
inline sal_Int32 convertEmuToHmm( sal_Int64 nValue )
{
-return getLimitedValue sal_Int32, sal_Int64 ( (nValue + EMU_PER_HMM / 2)
/ EMU_PER_HMM, 0, SAL_MAX_INT32 );
+return getLimitedValue sal_Int32, sal_Int64 ( (nValue + EMU_PER_HMM / 2)
/ EMU_PER_HMM, SAL_MIN_INT32, SAL_MAX_INT32 );
}
//
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 1998a02..37e9c09 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -79,6 +79,7 @@ struct ShapeTypeModel
::rtl::OUString maHeight; /// Height of the shape
bounding box (number with unit).
::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
+::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
StrokeModel maStrokeModel; /// Border line formatting.
FillModel maFillModel;/// Shape fill formatting.
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 176ae08..560f879 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -498,6 +498,7 @@ VerticalAlign
VerticalSplitMode
VerticalSplitPositionTwips
VertOrientPosition
+VertOrientRelation
ViewBox
Visible
VisibleFlag
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c2fbd65..bdecb8b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -42,6 +42,7 @@
#include com/sun/star/text/XTextContent.hpp
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextFrame.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
#include rtl/math.hxx
#include rtl/ustrbuf.hxx
#include oox/drawingml/shapepropertymap.hxx
@@ -59,6 +60,7 @@
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Any;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
namespace oox {
@@ -524,11 +526,21 @@ Reference XShape ComplexShape::implConvertAndInsert(
const Reference XShapes
if( xShape.is() )
{
OUString aGraphicUrl =
rFilter.getGraphicHelper().importEmbeddedGraphicObject( aGraphicPath );
+PropertySet aPropSet( xShape );
if( !aGraphicUrl.isEmpty() )
{
-PropertySet aPropSet( xShape );
aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl );
}
+// If the shape has an absolute position, set the properties
accordingly.
+if
(maTypeModel.maPosition.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(absolute)))
+{
+aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
+aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
+}
+if
(maTypeModel.maPositionVerticalRelative.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(page)))
+{
+aPropSet.setProperty(PROP_VertOrientRelation,
text::RelOrientation::PAGE_FRAME);
+}
}
return xShape;
}
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index e0e38ce..91703fc 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++
[Libreoffice-commits] .: oox/inc oox/source sd/source unusedcode.easy
oox/inc/oox/helper/binaryinputstream.hxx |4
oox/inc/oox/helper/modelobjecthelper.hxx |3 ---
oox/inc/oox/helper/propertymap.hxx |1 -
oox/inc/oox/helper/propertyset.hxx | 14 +++---
oox/source/drawingml/customshapeproperties.cxx |1 -
oox/source/helper/binaryinputstream.cxx|8
oox/source/helper/modelobjecthelper.cxx| 13 -
oox/source/helper/propertymap.cxx |5 -
oox/source/helper/propertyset.cxx | 24
sd/source/filter/eppt/epptooxml.hxx|2 --
sd/source/filter/eppt/pptx-epptooxml.cxx | 16
unusedcode.easy|6 --
12 files changed, 3 insertions(+), 94 deletions(-)
New commits:
commit 2bdac353ce7e28611b546bcc8a5ea236c891f944
Author: Petr Vorel petr.vo...@gmail.com
Date: Sat Mar 3 02:16:31 2012 +0100
remove unused code
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx
b/oox/inc/oox/helper/binaryinputstream.hxx
index 5add5f4..6e952a2 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -164,10 +164,6 @@ public:
template typename Type
voidskipArray( sal_Int32 nElemCount );
-/** Reads a NUL-terminated byte character array and returns the string.
- */
-::rtl::OString readNulCharArray();
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
::rtl::OUString readNulUnicodeArray();
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx
b/oox/inc/oox/helper/modelobjecthelper.hxx
index 86459ec..10131de 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -56,9 +56,6 @@ public:
/** Returns true, if the object with the passed name exists in the
container. */
boolhasObject( const ::rtl::OUString rObjName ) const;
-/** Returns the object with the passed name from the container. */
-::com::sun::star::uno::Any getObject( const ::rtl::OUString rObjName )
const;
-
/** Inserts the passed object into the container, returns its final name.
*/
::rtl::OUString insertObject(
const ::rtl::OUString rObjName,
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index 2696d49..dabd2e4 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -102,7 +102,6 @@ public:
#if OSL_DEBUG_LEVEL 0
#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
- void dump();
#endif
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
diff --git a/oox/inc/oox/helper/propertyset.hxx
b/oox/inc/oox/helper/propertyset.hxx
index fd0c1a7..14ca79b 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -50,9 +50,9 @@ class PropertyMap;
com.sun.star.beans.XPropertySet interface then). The reference to the
property set will be kept as long as the instance of this class is alive.
-The functions getProperties() and setProperties() try to handle all passed
-values at once, using the com.sun.star.beans.XMultiPropertySet interface.
-If the implementation does not support the XMultiPropertySet interface, all
+The functions setProperties() tries to handle all passed values at once,
+using the com.sun.star.beans.XMultiPropertySet interface. If the
+implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop.
*/
class PropertySet
@@ -103,14 +103,6 @@ public:
@return true = property contains true; false = property contains
false or error occurred. */
inline bool getBoolProperty( sal_Int32 nPropId ) const
{ bool bValue = false; return getProperty( bValue,
nPropId ) bValue; }
-
-/** Gets the specified properties from the property set. Tries to use the
XMultiPropertySet interface.
-@param orValues (out-parameter) The related property values.
-@param rPropNames The property names. MUST be ordered alphabetically.
*/
-voidgetProperties(
-::com::sun::star::uno::Sequence
::com::sun::star::uno::Any orValues,
-const ::com::sun::star::uno::Sequence
::rtl::OUString rPropNames ) const;
-
// Set properties -
/** Puts the passed any into the property set. */
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index ab99e82..29844b8 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/fillproperties.hxx |4 +++-
oox/source/drawingml/fillproperties.cxx |4
oox/source/drawingml/graphicshapecontext.cxx |3 +++
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit d082cb2060bbfab7d630b63423b90e449b36150f
Author: Muthu Subramanian sumu...@suse.com
Date: Mon Mar 5 19:09:45 2012 +0530
n747499: Wav/Audio files import - stub.
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx
b/oox/inc/oox/drawingml/fillproperties.hxx
index 9f7c154..b528eae 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -34,6 +34,7 @@
#include com/sun/star/geometry/IntegerRectangle2D.hpp
#include oox/drawingml/color.hxx
#include oox/helper/helper.hxx
+#include oox/drawingml/embeddedwavaudiofile.hxx
namespace oox {
class GraphicHelper;
@@ -135,7 +136,8 @@ struct FillProperties
struct GraphicProperties
{
-BlipFillProperties maBlipProps;/// Properties for the graphic.
+BlipFillProperties maBlipProps;/// Properties for the
graphic.
+EmbeddedWAVAudioFilemaAudio;/// Audio file details
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const GraphicProperties rSourceProps );
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index ad6cf4b..0a49985 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -444,6 +444,10 @@ void GraphicProperties::pushToPropMap( PropertyMap
rPropMap, const GraphicHelpe
sal_Int16 nContrast = getLimitedValue sal_Int16, sal_Int32 (
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
if( nContrast != 0 )
rPropMap[ PROP_AdjustContrast ] = nContrast;
+
+// TODO: Audio content, yet to be implemented
+if( !maAudio.msEmbed.isEmpty() )
+rPropMap[ PROP_Sound ] = maAudio.msEmbed;
}
//
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index 016fbf3..f01854c 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -76,6 +76,9 @@ Reference XFastContextHandler
GraphicShapeContext::createFastChildContext( sa
case XML_blipFill:
xRet.set( new BlipFillContext( *this, xAttribs,
mpShapePtr-getGraphicProperties().maBlipProps ) );
break;
+case XML_wavAudioFile:
+getEmbeddedWAVAudioFile( getRelations(), xAttribs,
mpShapePtr-getGraphicProperties().maAudio );
+break;
}
if ((getNamespace( aElementToken ) == NMSP_vml) mpShapePtr)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/xls/drawingmanager.hxx |3 ---
oox/source/xls/drawingmanager.cxx |5 -
unusedcode.easy|1 -
3 files changed, 9 deletions(-)
New commits:
commit d4c467f7d37d47a798ac3880ad30ceca6e60ea8c
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Feb 27 20:07:47 2012 +0100
Remove unused code in BiffObjLineModel.
diff --git a/oox/inc/oox/xls/drawingmanager.hxx
b/oox/inc/oox/xls/drawingmanager.hxx
index 4ec80d7..758c60e 100644
--- a/oox/inc/oox/xls/drawingmanager.hxx
+++ b/oox/inc/oox/xls/drawingmanager.hxx
@@ -59,9 +59,6 @@ struct BiffObjLineModel
boolmbAuto; /// True = automatic line format.
explicitBiffObjLineModel();
-
-/** Returns true, if the line formatting is visible (automatic or
explicit). */
-boolisVisible() const;
};
//
diff --git a/oox/source/xls/drawingmanager.cxx
b/oox/source/xls/drawingmanager.cxx
index d8cf3b1..afadd1f 100644
--- a/oox/source/xls/drawingmanager.cxx
+++ b/oox/source/xls/drawingmanager.cxx
@@ -191,11 +191,6 @@ BiffObjLineModel::BiffObjLineModel() :
{
}
-bool BiffObjLineModel::isVisible() const
-{
-return mbAuto || (mnStyle != BIFF_OBJ_LINE_NONE);
-}
-
BiffInputStream operator( BiffInputStream rStrm, BiffObjLineModel rModel )
{
sal_uInt8 nFlags;
diff --git a/unusedcode.easy b/unusedcode.easy
index b7e4e92..14cd110 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1060,7 +1060,6 @@ oox::xls::BiffHelper::calcRkFromDouble(int, double)
oox::xls::BiffInputStream::sizeBase() const
oox::xls::BiffInputStream::skipByteString(bool)
oox::xls::BiffInputStream::skipUniString()
-oox::xls::BiffObjLineModel::isVisible() const
oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream,
unsigned short)
oox::xls::BiffOutputStream::endRecord()
oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/xls/biffinputstream.hxx | 28 -
oox/source/xls/biffinputstream.cxx | 40
2 files changed, 68 deletions(-)
New commits:
commit 37eb6211b2703c062aa391054bd2d3ed7b3a56f7
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Feb 27 20:32:50 2012 +0100
Remove unused code in BiffInputStream.
diff --git a/oox/inc/oox/xls/biffinputstream.hxx
b/oox/inc/oox/xls/biffinputstream.hxx
index 2f6f537..c05186c 100644
--- a/oox/inc/oox/xls/biffinputstream.hxx
+++ b/oox/inc/oox/xls/biffinputstream.hxx
@@ -254,8 +254,6 @@ public:
/** Returns the absolute position in the wrapped binary stream. */
sal_Int64 tellBase() const;
-/** Returns the total size of the wrapped binary stream. */
-sal_Int64 sizeBase() const;
// BinaryInputStream interface (stream read access) ---
@@ -295,13 +293,6 @@ public:
*/
::rtl::OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding
eTextEnc, bool bAllowNulChars = false );
-/** Ignores 8/16 bit string length and character array.
-@param b16BitLen
-True = Read 16-bit string length field before the character array.
-False = Read 8-bit string length field before the character array.
- */
-voidskipByteString( bool b16BitLen );
-
// Unicode strings
/** Reads nChars characters of a BIFF8 string, and returns the string.
@@ -332,25 +323,6 @@ public:
*/
::rtl::OUString readUniString( bool bAllowNulChars = false );
-/** Ignores nChars characters of a BIFF8 string.
-@param nChars Number of characters to skip in the stream.
-@param b16BitChars
-True = The character array contains 16-bit characters.
-False = The character array contains truncated 8-bit characters.
- */
-voidskipUniStringChars( sal_uInt16 nChars, bool
b16BitChars );
-
-/** Ignores 8-bit flags, extended header, nChar characters, extended data
-of a BIFF8 string.
-@param nChars Number of characters to skip in the stream.
- */
-voidskipUniStringBody( sal_uInt16 nChars );
-
-/** Ignores 16-bit character count, 8-bit flags, extended header, character
-array, extended data of a BIFF8 string.
- */
-voidskipUniString();
-
//
private:
/** Initializes all members after base stream has been seeked to new
record. */
diff --git a/oox/source/xls/biffinputstream.cxx
b/oox/source/xls/biffinputstream.cxx
index 5634ae4..d238bb3 100644
--- a/oox/source/xls/biffinputstream.cxx
+++ b/oox/source/xls/biffinputstream.cxx
@@ -291,11 +291,6 @@ sal_Int64 BiffInputStream::tellBase() const
return maRecBuffer.getBaseStream().tell();
}
-sal_Int64 BiffInputStream::sizeBase() const
-{
-return maRecBuffer.getBaseStream().size();
-}
-
// BinaryInputStream interface (stream read access) ---
sal_Int32 BiffInputStream::readData( StreamDataSequence orData, sal_Int32
nBytes, size_t nAtomSize )
@@ -368,11 +363,6 @@ OUString BiffInputStream::readByteStringUC( bool
b16BitLen, rtl_TextEncoding eTe
return OStringToOUString( readByteString( b16BitLen, bAllowNulChars ),
eTextEnc );
}
-void BiffInputStream::skipByteString( bool b16BitLen )
-{
-skip( b16BitLen ? readuInt16() : readuInt8() );
-}
-
// Unicode strings
OUString BiffInputStream::readUniStringChars( sal_uInt16 nChars, bool
b16BitChars, bool bAllowNulChars )
@@ -418,36 +408,6 @@ OUString BiffInputStream::readUniString( bool
bAllowNulChars )
return readUniStringBody( readuInt16(), bAllowNulChars );
}
-void BiffInputStream::skipUniStringChars( sal_uInt16 nChars, bool b16BitChars )
-{
-sal_Int32 nCharsLeft = nChars;
-while( !mbEof (nCharsLeft 0) )
-{
-// skip the character array
-sal_Int32 nSkipSize = b16BitChars ? getMaxRawReadSize( 2 * nCharsLeft,
2 ) : getMaxRawReadSize( nCharsLeft, 1 );
-skip( nSkipSize );
-
-// prepare for next CONTINUE record
-nCharsLeft -= (b16BitChars ? (nSkipSize / 2) : nSkipSize);
-if( nCharsLeft 0 )
-jumpToNextStringContinue( b16BitChars );
-}
-}
-
-void BiffInputStream::skipUniStringBody( sal_uInt16 nChars )
-{
-bool b16BitChars;
-sal_Int32 nAddSize;
-readUniStringHeader( b16BitChars, nAddSize );
-skipUniStringChars( nChars, b16BitChars );
-skip( nAddSize );
-}
-
-void BiffInputStream::skipUniString()
-{
-skipUniStringBody( readuInt16() );
-}
-
// private
void BiffInputStream::setupRecord()
___
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/helper/propertymap.hxx |2 ++
oox/source/helper/propertymap.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 15af96ffec893cd2b1df734fd61e79feae5e2976
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Feb 24 10:08:04 2012 +0100
oox: guard dbgutil-only methods with ifdef
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index eda19e4..2696d49 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -100,8 +100,10 @@ public:
makePropertySet() const;
#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dump();
+#endif
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
#endif
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 8923d9c..dcc3a83 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -431,6 +431,7 @@ static void lclDumpAnyValue( Any value)
fprintf (stderr,??? unhandled type %s\n,
USS(value.getValueTypeName()));
}
+#ifdef DBG_UTIL
void PropertyMap::dump( Reference XPropertySet rXPropSet )
{
Reference XPropertySetInfo info = rXPropSet-getPropertySetInfo ();
@@ -454,6 +455,7 @@ void PropertyMap::dump()
{
dump( Reference XPropertySet ( makePropertySet(), UNO_QUERY ) );
}
+#endif
static void printLevel (int level)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/helper/attributelist.hxx | 14 ---
oox/inc/oox/helper/propertymap.hxx |5 ---
oox/inc/oox/xls/commentsbuffer.hxx |2 -
oox/inc/oox/xls/drawingbase.hxx |2 -
oox/inc/oox/xls/formulaparser.hxx|6
oox/inc/oox/xls/sheetdatabuffer.hxx | 14 ---
oox/inc/oox/xls/stylesbuffer.hxx |4 ---
oox/source/helper/attributelist.cxx | 24 ---
oox/source/helper/propertymap.cxx| 35 ---
oox/source/xls/commentsbuffer.cxx| 44 ---
oox/source/xls/drawingbase.cxx |9 ---
oox/source/xls/formulaparser.cxx | 27 -
oox/source/xls/sheetdatabuffer.cxx | 41
oox/source/xls/stylesbuffer.cxx | 12 -
unusedcode.easy | 15 ---
15 files changed, 254 deletions(-)
New commits:
commit 660cb78cd6900ffebe215ad4b3913bbe35ac9883
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Feb 23 21:22:21 2012 +0100
unusedcode: remove something from oox
diff --git a/oox/inc/oox/helper/attributelist.hxx
b/oox/inc/oox/helper/attributelist.hxx
index bf6524c..d0a0600 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -122,12 +122,6 @@ public:
/** Returns the 32-bit signed integer value of the specified attribute
(hexadecimal). */
OptValue sal_Int32 getIntegerHex( sal_Int32 nAttrToken ) const;
-/** Returns the 32-bit unsigned integer value of the specified attribute
(hexadecimal). */
-OptValue sal_uInt32 getUnsignedHex( sal_Int32 nAttrToken ) const;
-
-/** Returns the 64-bit signed integer value of the specified attribute
(hexadecimal). */
-OptValue sal_Int64 getHyperHex( sal_Int32 nAttrToken ) const;
-
/** Returns the boolean value of the specified attribute. */
OptValue bool getBool( sal_Int32 nAttrToken ) const;
@@ -168,14 +162,6 @@ public:
or the passed default value if the attribute is missing or not
convertible. */
sal_Int32 getIntegerHex( sal_Int32 nAttrToken, sal_Int32
nDefault ) const;
-/** Returns the 32-bit unsigned integer value of the specified attribute
(hexadecimal),
-or the passed default value if the attribute is missing or not
convertible. */
-sal_uInt32 getUnsignedHex( sal_Int32 nAttrToken, sal_uInt32
nDefault ) const;
-
-/** Returns the 64-bit signed integer value of the specified attribute
(hexadecimal),
-or the passed default value if the attribute is missing or not
convertible. */
-sal_Int64 getHyperHex( sal_Int32 nAttrToken, sal_Int64 nDefault
) const;
-
/** Returns the boolean value of the specified attribute, or the passed
default value if the attribute is missing or not convertible to bool.
*/
boolgetBool( sal_Int32 nAttrToken, bool bDefault ) const;
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index 37b723e..0542de6 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -68,9 +68,6 @@ public:
inline bool hasProperty( sal_Int32 nPropId ) const
{ return find( nPropId ) != end(); }
-/** Returns the property value of the specified property, or 0 if not
found. */
-const ::com::sun::star::uno::Any* getProperty( sal_Int32 nPropId ) const;
-
/** Sets the specified property to the passed value. Does nothing, if the
identifier is invalid. */
inline bool setAnyProperty( sal_Int32 nPropId, const
::com::sun::star::uno::Any rValue )
@@ -103,8 +100,6 @@ public:
makePropertySet() const;
#if OSL_DEBUG_LEVEL 0
- static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
- void dump();
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
#endif
diff --git a/oox/inc/oox/xls/commentsbuffer.hxx
b/oox/inc/oox/xls/commentsbuffer.hxx
index a0017ef..b873193 100644
--- a/oox/inc/oox/xls/commentsbuffer.hxx
+++ b/oox/inc/oox/xls/commentsbuffer.hxx
@@ -71,8 +71,6 @@ public:
voidimportComment( const AttributeList rAttribs );
/** Imports a cell comment Properties from the passed attributes of the
comment element. */
voidimportCommentPr( const AttributeList rAttribs );
-/** Imports the anchor points in CommentPr */
-voidimportAnchor( bool bFrom, sal_Int32 nWhich, const
::rtl::OUString rChars );
/** Imports a cell comment from the passed stream of a COMMENT record. */
voidimportComment( SequenceInputStream rStrm );
/** Imports a cell comment from the passed stream of a NOTE record. */
diff --git a/oox/inc/oox/xls/drawingbase.hxx
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/helper/propertymap.hxx |2 ++
oox/source/helper/propertymap.cxx | 24
2 files changed, 26 insertions(+)
New commits:
commit 29b1914fad754ed94e61179f09aac50f1657f2e0
Author: Eike Rathke er...@redhat.com
Date: Fri Feb 24 01:03:55 2012 +0100
reintroduced dump methods that are needed if OSL_DEBUG_LEVEL 0
* Partly reverted commit 660cb78cd6900ffebe215ad4b3913bbe35ac9883 to
preserve
the oox::PropertyMap::dump() methods that are needed by
oox::PropertySet::dump() when building dbgutil.
* Did not remove the oox::PropertySet::dump() as well because all is part of
the oox dumper, I guess we don't want to remove that in it's entirety ...
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index 0542de6..eda19e4 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -100,6 +100,8 @@ public:
makePropertySet() const;
#if OSL_DEBUG_LEVEL 0
+ static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
+ void dump();
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
#endif
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 955d867..8923d9c 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -431,6 +431,30 @@ static void lclDumpAnyValue( Any value)
fprintf (stderr,??? unhandled type %s\n,
USS(value.getValueTypeName()));
}
+void PropertyMap::dump( Reference XPropertySet rXPropSet )
+{
+Reference XPropertySetInfo info = rXPropSet-getPropertySetInfo ();
+Sequence Property props = info-getProperties ();
+
+OSL_TRACE(dump props, len: %d, props.getLength ());
+
+for (int i=0; i props.getLength (); i++) {
+OString name = OUStringToOString( props [i].Name,
RTL_TEXTENCODING_UTF8);
+fprintf (stderr,%30s = , name.getStr() );
+
+try {
+lclDumpAnyValue (rXPropSet-getPropertyValue( props [i].Name ));
+} catch (const Exception) {
+fprintf (stderr,unable to get '%s' value\n, USS(props [i].Name));
+}
+}
+}
+
+void PropertyMap::dump()
+{
+dump( Reference XPropertySet ( makePropertySet(), UNO_QUERY ) );
+}
+
static void printLevel (int level)
{
for (int i=0; ilevel; i++)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/xls/unitconverter.hxx |1 -
oox/source/xls/formulabase.cxx|3 ---
oox/source/xls/unitconverter.cxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit c2ad01cc22d79aeed31d97220430d9a9fd4fd2b1
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 13 20:12:57 2012 +0400
remove unused fields
diff --git a/oox/inc/oox/xls/unitconverter.hxx
b/oox/inc/oox/xls/unitconverter.hxx
index a6ae756..e3cd263 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/oox/inc/oox/xls/unitconverter.hxx
@@ -110,7 +110,6 @@ private:
DoubleVectormaCoeffs; /// Coefficients for unit
conversion.
OoxErrorCodeMap maOoxErrCodes; /// Maps error code strings to
BIFF error constants.
-BiffErrorCodeMapmaBiffErrCodes; /// Maps BIFF error constants to
error code strings.
sal_Int32 mnNullDate; /// Nulldate of this workbook
(number of days since -01-01).
};
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 0b10950..98925d7 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -833,7 +833,6 @@ struct FunctionProviderImpl
typedef RefMap sal_uInt16, FunctionInfo FuncIdMap;
FunctionInfoVector maFuncs;/// All function infos in one list.
-FuncNameMap maOdfFuncs; /// Maps ODF function names to
function data.
FuncNameMap maOoxFuncs; /// Maps OOXML function names to
function data.
FuncIdMap maBiff12Funcs; /// Maps BIFF12 function indexes
to function data.
FuncIdMap maBiffFuncs;/// Maps BIFF2-BIFF8 function
indexes to function data.
@@ -931,8 +930,6 @@ void FunctionProviderImpl::initFunc( const FunctionData
rFuncData, sal_uInt8 nM
// insert the function info into the member maps
maFuncs.push_back( xFuncInfo );
-if( !xFuncInfo-maOdfFuncName.isEmpty() )
-maOdfFuncs[ xFuncInfo-maOdfFuncName ] = xFuncInfo;
if( !xFuncInfo-maOoxFuncName.isEmpty() )
maOoxFuncs[ xFuncInfo-maOoxFuncName ] = xFuncInfo;
if( xFuncInfo-mnBiff12FuncId != NOID )
diff --git a/oox/source/xls/unitconverter.cxx b/oox/source/xls/unitconverter.cxx
index 2438023..636fb72 100644
--- a/oox/source/xls/unitconverter.cxx
+++ b/oox/source/xls/unitconverter.cxx
@@ -239,7 +239,6 @@ sal_uInt8 UnitConverter::calcBiffErrorCode( const OUString
rErrorCode ) const
void UnitConverter::addErrorCode( sal_uInt8 nErrorCode, const OUString
rErrorCode )
{
maOoxErrCodes[ rErrorCode ] = nErrorCode;
-maBiffErrCodes[ nErrorCode ] = rErrorCode;
}
double UnitConverter::getCoefficient( Unit eUnit ) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/xls/formulabase.hxx | 38 --
oox/source/xls/formulabase.cxx | 39 ---
oox/source/xls/formulaparser.cxx | 13 -
unusedcode.easy |5 -
4 files changed, 95 deletions(-)
New commits:
commit 731a8d7d5bd47bc17f21065f195170da711f3277
Author: Elton Chung el...@layerjet.com
Date: Fri Feb 10 22:16:49 2012 +0800
Remove unused code
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index b3e403a..0a3b35a 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -705,14 +705,6 @@ public:
//
-/** Generates a cell address string in Calc's absolute $Sheet.$A$1 notation
-from the passed cell address.
-
-@param rAddress The cell address to be converted to a string.
- */
-::rtl::OUString generateApiAddressString(
-const ::com::sun::star::table::CellAddress
rAddress ) const;
-
/** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$
notation from the passed cell range address.
@@ -721,13 +713,6 @@ public:
::rtl::OUString generateApiRangeString(
const ::com::sun::star::table::CellRangeAddress
rRange ) const;
-/** Generates a cell range list string in Calc's absolute $Sheet.$A$1:$A$1
-notation from the passed cell range addresses.
-
-@param rRanges The list of cell ranges to be converted to a string.
- */
-::rtl::OUString generateApiRangeListString( const ApiCellRangeList
rRanges ) const;
-
/** Generates a string in Calc formula notation from the passed string.
@param rString The string value.
@@ -760,29 +745,6 @@ public:
::com::sun::star::uno::Any
extractReference( const ApiTokenSequence rTokens )
const;
-/** Tries to extract a single cell address from a formula token sequence.
-
-@param orAddress (output parameter) If the token sequence is valid,
-this parameter will contain the extracted cell address. If the
-token sequence contains unexpected tokens, nothing meaningful is
-inserted, and the function returns false.
-
-@param rTokens The token sequence to be parsed. Should contain exactly
-one cell address token. The token sequence may contain whitespace
-tokens.
-
-@param bAllowRelative True = it is allowed that rTokens contains
-relative references (based on cell A1 of the current sheet).
-False = only real absolute references will be accepted.
-
-@return True, if the token sequence contains a valid cell address
-which has been extracted to orAddress, false otherwise.
- */
-boolextractCellAddress(
-::com::sun::star::table::CellAddress orAddress,
-const ApiTokenSequence rTokens,
-bool bAllowRelative ) const;
-
/** Tries to extract a cell range address from a formula token sequence.
@param orAddress (output parameter) If the token sequence is valid,
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 477a8f9..e9ffa95 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -1494,15 +1494,6 @@ OUString
FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList
//
-OUString FormulaProcessorBase::generateApiAddressString( const CellAddress
rAddress ) const
-{
-OUString aCellName;
-PropertySet aCellProp( getCellFromDoc( rAddress ) );
-aCellProp.getProperty( aCellName, PROP_AbsoluteName );
-OSL_ENSURE( !aCellName.isEmpty(),
FormulaProcessorBase::generateApiAddressString - cannot create cell address
string );
-return aCellName;
-}
-
OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress
rRange ) const
{
OUString aRangeName;
@@ -1512,22 +1503,6 @@ OUString FormulaProcessorBase::generateApiRangeString(
const CellRangeAddress r
return aRangeName;
}
-OUString FormulaProcessorBase::generateApiRangeListString( const
ApiCellRangeList rRanges ) const
-{
-OUStringBuffer aBuffer;
-for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd =
rRanges.end(); aIt != aEnd; ++aIt )
-{
-OUString aRangeName = generateApiRangeString( *aIt );
-if( !aRangeName.isEmpty() )
-{
-if( aBuffer.getLength() 0 )
-aBuffer.append( API_TOKEN_SEP );
-aBuffer.append( aRangeName );
-}
-}
-return aBuffer.makeStringAndClear();
-}
-
OUString FormulaProcessorBase::generateApiString( const OUString rString )
{
[Libreoffice-commits] .: oox/inc oox/Library_oox.mk oox/source
oox/Library_oox.mk|1
oox/inc/oox/drawingml/diagram/diagram.hxx |2
oox/inc/oox/drawingml/shape.hxx |5 +
oox/inc/oox/ppt/pptshapegroupcontext.hxx |3
oox/source/core/xmlfilterbase.cxx |6 -
oox/source/drawingml/diagram/datamodelcontext.cxx |9 +-
oox/source/drawingml/diagram/diagram.cxx |9 +-
oox/source/drawingml/diagram/diagram.hxx |3
oox/source/drawingml/shape.cxx|7 +
oox/source/ppt/extdrawingfragmenthandler.cxx | 95 ++
oox/source/ppt/extdrawingfragmenthandler.hxx | 71
oox/source/ppt/pptshapecontext.cxx|2
oox/source/ppt/pptshapegroupcontext.cxx | 28 ++
oox/source/token/namespaces.hxx.tail |1
oox/source/token/namespaces.txt |1
oox/source/token/tokens.txt |2
16 files changed, 236 insertions(+), 9 deletions(-)
New commits:
commit 60b7f09ed5980248c8f3088adf80380d02d66358
Author: Muthu Subramanian sumu...@suse.com
Date: Fri Dec 30 16:09:42 2011 +0530
n#655408: Importing extLst of drawings in diagrams.
data*.xml contains the list of drawings which can be imported
instead. These are easier to import now that we support better
smartart.
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0b54125..098d747 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -266,6 +266,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/ppt/timenode \
oox/source/ppt/timenodelistcontext \
oox/source/ppt/timetargetelementcontext \
+oox/source/ppt/extdrawingfragmenthandler \
oox/source/shape/ShapeContextHandler \
oox/source/shape/ShapeFilterBase \
oox/source/token/namespacemap \
diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx
b/oox/inc/oox/drawingml/diagram/diagram.hxx
index 9b75667..4c0a40d 100644
--- a/oox/inc/oox/drawingml/diagram/diagram.hxx
+++ b/oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace drawingml {
generate and layout the shapes, and push it as children into the
referenced shape.
*/
-void loadDiagram( const ShapePtr pShape,
+void loadDiagram( ShapePtr pShape,
core::XmlFilterBase rFilter,
const ::rtl::OUString rDataModelPath,
const ::rtl::OUString rLayoutPath,
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index ab7637a..772f699 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -107,6 +107,7 @@ public:
void setChildPosition(
com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
void setChildSize( com::sun::star::awt::Size
aSize ){ maChSize = aSize; }
+void moveAllToPosition( const
com::sun::star::awt::Point rPoint );
void setPosition( com::sun::star::awt::Point
nPosition ){ maPosition = nPosition; }
const com::sun::star::awt::Point getPosition() const { return maPosition;
}
@@ -173,6 +174,9 @@ public:
getXShape() const { return mxShape; }
virtual voidapplyShapeReference( const Shape rReferencedShape );
+const ::std::vectorrtl::OUString
+getExtDrawings() { return maExtDrawings; }
+voidaddExtDrawingRelId( const ::rtl::OUString rRelId ) {
maExtDrawings.push_back( rRelId ); }
protected:
@@ -233,6 +237,7 @@ protected:
com::sun::star::awt::Size maSize;
com::sun::star::awt::Point maPosition;
+::std::vectorrtl::OUStringmaExtDrawings;
private:
enum FrameType
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 948ee79..7e2a6d3 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -38,6 +38,7 @@ class PPTShapeGroupContext : public
::oox::drawingml::ShapeGroupContext
{
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
+oox::drawingml::ShapePtrpGraphicShape;
public:
PPTShapeGroupContext(
@@ -50,6 +51,8 @@ public:
virtual ::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XFastContextHandler SAL_CALL
createFastChildContext( ::sal_Int32 Element, const
::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XFastAttributeList Attribs ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
+
protected:
};
diff --git a/oox/source/core/xmlfilterbase.cxx
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/customshapeproperties.hxx |2 ++
oox/source/drawingml/customshapeproperties.cxx |1 +
oox/source/drawingml/shape.cxx |6 ++
oox/source/token/properties.txt |1 +
4 files changed, 10 insertions(+)
New commits:
commit 8d691a2d94d2b2be3ad3fc0a44d2abc387d7b6c2
Author: Felix Zhang fezh...@suse.com
Date: Tue Dec 13 12:07:20 2011 +0800
import text body rotation property of custom shape
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx
b/oox/inc/oox/drawingml/customshapeproperties.hxx
index d5ae9a5..004d771 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -136,6 +136,7 @@ public:
std::vector com::sun::star::drawing::EnhancedCustomShapeSegment
getSegments(){ return maSegments; };
voidsetMirroredX( sal_Bool bMirroredX ) {
mbMirroredX = bMirroredX; };
voidsetMirroredY( sal_Bool bMirroredY ) {
mbMirroredY = bMirroredY; };
+voidsetTextRotateAngle( sal_Int32 nAngle )
{ mnTextRotateAngle = nAngle; };
double getValue( const std::vector CustomShapeGuide , sal_uInt32 nIndex
) const;
static sal_Int32 SetCustomShapeGuideValue( std::vector CustomShapeGuide
rGuideList, const CustomShapeGuide rGuide );
@@ -157,6 +158,7 @@ private:
maSegments;
sal_BoolmbMirroredX;
sal_BoolmbMirroredY;
+sal_Int32 mnTextRotateAngle;
typedef boost::unordered_map sal_Int32, PropertyMap PresetsMap;
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index c433d76..12a7f29 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -186,6 +186,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase /* rFi
aPropertyMap[ PROP_MirroredX ] = Any( mbMirroredX );
aPropertyMap[ PROP_MirroredY ] = Any( mbMirroredY );
+aPropertyMap[ PROP_TextRotateAngle ] = Any( mnTextRotateAngle );
Sequence PropertyValue aSeq =
aPropertyMap.makePropertyValueSequence();
aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d716823..a261eb9 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -528,6 +528,12 @@ Reference XShape Shape::createAndInsert(
mpCustomShapePropertiesPtr-setMirroredX( sal_True );
if ( mbFlipV )
mpCustomShapePropertiesPtr-setMirroredY( sal_True );
+if( mpTextBody.get() )
+{
+sal_Int32 nTextRotateAngle = static_cast sal_Int32 (
mpTextBody-getTextProperties().moRotation.get( 0 ) );
+mpCustomShapePropertiesPtr-setTextRotateAngle(
-nTextRotateAngle / 6 );
+}
+
OSL_TRACE(==cscode== shape name: '%s',
rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr());
mpCustomShapePropertiesPtr-pushToPropSet( rFilterBase, xSet,
mxShape );
}
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index d071a22..65d2cb0 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -458,6 +458,7 @@ TextLeftDistance
TextLowerDistance
TextOverlap
TextRightDistance
+TextRotateAngle
TextRotation
TextUpperDistance
TextVerticalAdjust
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/mathml/importutils.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dabe836c6ed66c5740582c17dbc39b2196608e6d
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Nov 28 11:24:14 2011 +0100
Fix visibility problem on Windows.
diff --git a/oox/inc/oox/mathml/importutils.hxx
b/oox/inc/oox/mathml/importutils.hxx
index ad6ad6b..3a59320 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -71,7 +71,7 @@ public:
// One could theoretically use oox::AttributeList, but that complains if
the passed reference is empty,
// which would be complicated to avoid here. Also, parsers apparently
reuse the same instance of XFastAttributeList,
// which means using oox::AttributeList would make them all point to the
one instance.
-struct AttributeList
+struct OOX_DLLPUBLIC AttributeList
{
bool hasAttribute( int token ) const;
rtl::OUString attribute( int token, const rtl::OUString def =
rtl::OUString()) const;
@@ -82,7 +82,7 @@ public:
/**
Structure representing a tag, including its attributes and content text
immediatelly following it.
*/
-struct Tag
+struct OOX_DLLPUBLIC Tag
{
Tag( int token = XML_TOKEN_INVALID,
const com::sun::star::uno::Reference
com::sun::star::xml::sax::XFastAttributeList attributes =
com::sun::star::uno::Reference com::sun::star::xml::sax::XFastAttributeList
(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/mathml/importutils.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f87ea359f45a8d8edbf029a5268b40fab3d1fa6c Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 24 20:54:37 2011 +0100 fix compile diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index d5d2540..ad6ad6b 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -29,8 +29,8 @@ #define _STARMATHIMPORTUTILS_HXX #include com/sun/star/xml/sax/XFastAttributeList.hpp +#include oox/token/tokens.hxx #include map -#include oox/helper/attributelist.hxx #include vector #include oox/dllapi.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/helper/helper.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4ffcc73fa25f174c2d1e161f02cce2d7afc15e3b
Author: Miklos Vajna vmik...@frugalware.org
Date: Fri Nov 11 22:31:58 2011 +0100
WaE: OptValue::maValue may be used uninitialized
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index 25d4131..9af1008 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -203,7 +203,7 @@ template typename Type
class OptValue
{
public:
-inline explicit OptValue() : mbHasValue( false ) {}
+inline explicit OptValue() : maValue(), mbHasValue( false ) {}
inline explicit OptValue( const Type rValue ) : maValue( rValue ),
mbHasValue( true ) {}
inline explicit OptValue( bool bHasValue, const Type rValue ) :
maValue( rValue ), mbHasValue( bHasValue ) {}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
