[Libreoffice-commits] .: Branch 'integration/dev300_m98' - oox/inc oox/source oox/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Mar 7 18:54:42 PST 2011
oox/inc/oox/xls/commentsfragment.hxx | 3
oox/source/core/contexthandler2.cxx | 3
oox/source/drawingml/chart/chartconverter.cxx | 23 +++--
oox/source/drawingml/chart/datasourcecontext.cxx | 5 -
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 2
oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 2
oox/source/drawingml/shape.cxx | 8 -
oox/source/drawingml/table/tablerowcontext.cxx | 2
oox/source/drawingml/theme.cxx | 2
oox/source/export/chartexport.cxx | 2
oox/source/export/drawingml.cxx | 1
oox/source/export/shapes.cxx | 1
oox/source/export/vmlexport.cxx | 3
oox/source/helper/binaryinputstream.cxx | 61 --------------
oox/source/helper/propertymap.cxx | 2
oox/source/ppt/pptgraphicshapecontext.cxx | 14 +--
oox/source/ppt/pptimport.cxx | 12 +-
oox/source/ppt/pptshape.cxx | 47 ----------
oox/source/ppt/slidefragmenthandler.cxx | 4
oox/source/shape/ShapeContextHandler.cxx | 2
oox/source/vml/vmldrawing.cxx | 2
oox/source/vml/vmldrawingfragment.cxx | 3
oox/source/vml/vmlshape.cxx | 16 ---
oox/source/vml/vmlshapecontext.cxx | 6 -
oox/source/xls/commentsbuffer.cxx | 8 +
oox/source/xls/commentsfragment.cxx | 5 -
oox/source/xls/drawingfragment.cxx | 14 ++-
oox/source/xls/excelfilter.cxx | 26 +++++
oox/source/xls/themebuffer.cxx | 3
oox/source/xls/viewsettings.cxx | 8 -
oox/source/xls/worksheethelper.cxx | 40 ---------
oox/source/xls/worksheetsettings.cxx | 3
oox/util/makefile.mk | 13 ++
33 files changed, 109 insertions(+), 237 deletions(-)
New commits:
commit 50f2fb910f2530bf511546d030cc0c849d7a28c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Mar 7 20:54:21 2011 -0600
oox: fix merge issue. left 2 #if 0 /* FIXME */ around filter to resolve
see pptimport and xlsfilter for the 2 FIXMEs.
diff --git a/oox/inc/oox/xls/commentsfragment.hxx b/oox/inc/oox/xls/commentsfragment.hxx
index ad0df44..b063bf4 100644
--- a/oox/inc/oox/xls/commentsfragment.hxx
+++ b/oox/inc/oox/xls/commentsfragment.hxx
@@ -46,7 +46,7 @@ public:
protected:
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
virtual void onCharacters( const ::rtl::OUString& rChars );
- virtual void onEndElement();
+ virtual void onEndElement( const ::rtl::OUString& rChars );
virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
virtual void onEndRecord();
@@ -70,4 +70,4 @@ private:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 4aae0ec..8535f0f 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -49,7 +49,7 @@ struct ElementInfo
sal_Int32 mnElement; /// The element identifier.
bool mbTrimSpaces; /// True = trims leading/trailing spaces from text data.
- explicit ElementInfo();
+ inline explicit ElementInfo() : mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
ElementInfo( sal_Int32 nElement ) : mnElement( nElement ), mbTrimSpaces(false) {}
};
@@ -271,4 +271,4 @@ void ContextHandler2::onEndRecord()
} // namespace core
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index 5aef35c..18ab364 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -31,6 +31,8 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include "oox/drawingml/chart/chartspaceconverter.hxx"
#include "oox/drawingml/chart/chartspacemodel.hxx"
+#include "oox/helper/containerhelper.hxx"
+#include "oox/core/xmlfilterbase.hxx"
using ::oox::drawingml::chart::DataSequenceModel;
using ::com::sun::star::uno::Any;
@@ -38,6 +40,12 @@ using ::rtl::OUStringBuffer;
namespace oox {
namespace drawingml {
namespace chart {
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::chart2;
+using namespace ::com::sun::star::chart2::data;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::uno;
+
// ============================================================================
@@ -47,16 +55,16 @@ static const sal_Unicode API_TOKEN_ARRAY_ROWSEP = '|';
static const sal_Unicode API_TOKEN_ARRAY_COLSEP = ';';
// Code similar to oox/source/xls/FormulaParser.cxx
-static OUString lclGenerateApiString( const OUString& rString )
+ static ::rtl::OUString lclGenerateApiString( const ::rtl::OUString& rString )
{
- OUString aRetString = rString;
+ ::rtl::OUString aRetString = rString;
sal_Int32 nQuotePos = aRetString.getLength();
while( (nQuotePos = aRetString.lastIndexOf( '"', nQuotePos )) >= 0 )
aRetString = aRetString.replaceAt( nQuotePos, 1, CREATE_OUSTRING( "\"\"" ) );
return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear();
}
-static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix )
+static ::rtl::OUString lclGenerateApiArray( const Matrix< Any >& rMatrix )
{
OSL_ENSURE( !rMatrix.empty(), "ChartConverter::lclGenerateApiArray - missing matrix values" );
OUStringBuffer aBuffer;
@@ -68,7 +76,7 @@ static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix )
for( Matrix< Any >::const_iterator aBeg = rMatrix.row_begin( nRow ), aIt = aBeg, aEnd = rMatrix.row_end( nRow ); aIt != aEnd; ++aIt )
{
double fValue = 0.0;
- OUString aString;
+ ::rtl::OUString aString;
if( aIt != aBeg )
aBuffer.append( API_TOKEN_ARRAY_COLSEP );
if( *aIt >>= fValue )
@@ -93,8 +101,8 @@ ChartConverter::~ChartConverter()
{
}
-void ChartConverter::convertFromModel( XmlFilterBase& rFilter,
- ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc,
+void ChartConverter::convertFromModel( ::oox::core::XmlFilterBase& rFilter,
+ ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc,
const Reference< XShapes >& rxExternalPage, const Point& rChartPos, const Size& rChartSize )
{
OSL_ENSURE( rxChartDoc.is(), "ChartConverter::convertFromModel - missing chart document" );
@@ -123,7 +131,7 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
Reference< XDataSequence > xDataSeq;
if( rxDataProvider.is() )
{
- OUString aRangeRep;
+ ::rtl::OUString aRangeRep;
if( !rDataSeq.maData.empty() )
{
// create a single-row array from constant source data
@@ -156,4 +164,4 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
} // namespace drawingml
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index 52642b7..8ae3f27 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -108,8 +108,8 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
* be values.
* TODO: NumberFormat conversion, remove the check then.
*/
- if( isPreviousElement( C_TOKEN( cat ), 4 ) ||
- isPreviousElement( C_TOKEN( xVal ), 4 ) )
+ if( isParentElement( C_TOKEN( cat ), 4 ) ||
+ isParentElement( C_TOKEN( xVal ), 4 ) )
mrModel.maData[ mnPtIndex ] <<= rChars;
else
mrModel.maData[ mnPtIndex ] <<= rChars.toDouble();
@@ -243,4 +243,4 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const
} // namespace drawingml
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 51cb90b..94b5ae7 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -30,7 +30,7 @@
#include "oox/helper/helper.hxx"
#include "layoutnodecontext.hxx"
#include "oox/drawingml/diagram/datamodelcontext.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index fb80fa0..6265f08 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -31,7 +31,7 @@
#include "oox/drawingml/diagram/diagramfragmenthandler.hxx"
#include "oox/drawingml/diagram/datamodelcontext.hxx"
#include "diagramdefinitioncontext.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8608bda..de155d4 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -265,7 +265,6 @@ Reference< XShape > Shape::createAndInsert(
awt::Rectangle aShapeRectHmm( aPosition.X / 360, aPosition.Y / 360, aSize.Width / 360, aSize.Height / 360 );
OUString aServiceName = finalizeServiceName( rFilterBase, rServiceName, aShapeRectHmm );
- sal_Bool bIsCustomShape = aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.CustomShape" ) );
sal_Bool bIsCustomShape = aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
basegfx::B2DHomMatrix aTransformation;
@@ -438,13 +437,6 @@ Reference< XShape > Shape::createAndInsert(
PropertyMap aShapeProperties;
PropertyMap::const_iterator aShapePropIter;
- if( mxCreateCallback.get() )
- {
- for ( aShapePropIter = mxCreateCallback->getShapeProperties().begin();
- aShapePropIter != mxCreateCallback->getShapeProperties().end(); ++aShapePropIter )
- aShapeProperties[ (*aShapePropIter).first ] = (*aShapePropIter).second;
- }
-
// add properties from textbody to shape properties
if( mpTextBody.get() )
{
diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx
index d150c9a..5b3754f 100644
--- a/oox/source/drawingml/table/tablerowcontext.cxx
+++ b/oox/source/drawingml/table/tablerowcontext.cxx
@@ -31,7 +31,7 @@
#include "oox/drawingml/table/tablerowcontext.hxx"
#include "oox/drawingml/table/tablecellcontext.hxx"
#include "oox/drawingml/table/tablerow.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
using namespace ::oox::core;
using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index 503242a..71f2fb7 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include "oox/drawingml/theme.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
using ::rtl::OUString;
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e15a9a7..a92a4d2 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/chartexport.hxx"
#include "oox/export/utils.hxx"
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a7b8213..875cd7b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include "oox/token/tokens.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/drawingml.hxx"
#include "oox/export/utils.hxx"
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8cbfa51..112548b 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include "oox/token/tokens.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/shapes.hxx"
#include "oox/export/utils.hxx"
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 5f519c5..99c5256 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -27,8 +27,7 @@
************************************************************************/
#include <oox/export/vmlexport.hxx>
-
-#include <tokens.hxx>
+#include "oox/token/tokens.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 40cf078..bc3a95d 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -335,66 +335,6 @@ void RelativeInputStream::skip( sal_Int32 nBytes )
// ============================================================================
-
-sal_Int64 RelativeInputStream::getLength() const
-{
- return mnLength;
-}
-
-sal_Int64 RelativeInputStream::tell() const
-{
- return mnRelPos;
-}
-
-void RelativeInputStream::seek( sal_Int64 nPos )
-{
- if( mrInStrm.isSeekable() && (mnStartPos >= 0) )
- {
- mnRelPos = getLimitedValue< sal_Int64, sal_Int64 >( nPos, 0, mnLength );
- mrInStrm.seek( mnStartPos + mnRelPos );
- mbEof = (mnRelPos != nPos) || mrInStrm.isEof();
- }
-}
-
-sal_Int32 RelativeInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes )
-{
- sal_Int32 nReadBytes = 0;
- if( !mbEof )
- {
- sal_Int32 nRealBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
- nReadBytes = mrInStrm.readData( orData, nRealBytes );
- mnRelPos += nReadBytes;
- mbEof = (nRealBytes < nBytes) || mrInStrm.isEof();
- }
- return nReadBytes;
-}
-
-sal_Int32 RelativeInputStream::readMemory( void* opMem, sal_Int32 nBytes )
-{
- sal_Int32 nReadBytes = 0;
- if( !mbEof )
- {
- sal_Int32 nRealBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
- nReadBytes = mrInStrm.readMemory( opMem, nRealBytes );
- mnRelPos += nReadBytes;
- mbEof = (nRealBytes < nBytes) || mrInStrm.isEof();
- }
- return nReadBytes;
-}
-
-void RelativeInputStream::skip( sal_Int32 nBytes )
-{
- if( !mbEof )
- {
- sal_Int32 nSkipBytes = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnLength - mnRelPos );
- mrInStrm.skip( nSkipBytes );
- mnRelPos += nSkipBytes;
- mbEof = nSkipBytes < nBytes;
- }
-}
-
-// ============================================================================
-
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index cbd6847..c262083 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
#include <cppuhelper/implbase2.hxx>
#include <osl/mutex.hxx>
#include "oox/token/propertynames.hxx"
@@ -361,4 +362,4 @@ void PropertyMap::dump()
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 0e7b941..5549828 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -37,13 +37,13 @@
#include "oox/ppt/pptshapepropertiescontext.hxx"
#include "oox/ppt/slidepersist.hxx"
#include "oox/drawingml/shapestylecontext.hxx"
-#include "oox/core/namespaces.hxx"
+#include "oox/token/namespaces.hxx"
#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
#include "oox/drawingml/lineproperties.hxx"
#include "oox/drawingml/drawingmltypes.hxx"
#include "oox/drawingml/customshapegeometry.hxx"
#include "oox/drawingml/textbodycontext.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
using rtl::OUString;
using namespace oox::core;
@@ -119,11 +119,11 @@ Reference< XFastContextHandler > PPTGraphicShapeContext::createFastChildContext(
// nvSpPr CT_ShapeNonVisual begin
// case NMSP_PPT|XML_drElemPr:
// break;
- case NMSP_PPT|XML_cNvPr:
+ case PPT_TOKEN(cNvPr):
mpShapePtr->setId( xAttribs->getOptionalValue( XML_id ) );
mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
break;
- case NMSP_PPT|XML_ph:
+ case PPT_TOKEN(ph):
{
sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
mpShapePtr->setSubType( nSubType );
@@ -210,15 +210,15 @@ Reference< XFastContextHandler > PPTGraphicShapeContext::createFastChildContext(
}
// nvSpPr CT_ShapeNonVisual end
- case NMSP_PPT|XML_spPr:
+ case PPT_TOKEN(spPr):
xRet = new PPTShapePropertiesContext( *this, *mpShapePtr );
break;
- case NMSP_PPT|XML_style:
+ case PPT_TOKEN(style):
xRet = new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr );
break;
- case NMSP_PPT|XML_txBody:
+ case PPT_TOKEN(txBody):
{
oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody );
mpShapePtr->setTextBody( xTextBody );
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index a72a039..5918fc1 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -66,9 +66,9 @@ uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( cons
XmlFilterBase* PowerPointImport::mpDebugFilterBase = NULL;
#endif
-PowerPointImport::PowerPointImport( const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- : XmlFilterBase( rSMgr )
- , mxChartConv( new ::oox::drawingml::chart::ChartConverter )
+PowerPointImport::PowerPointImport( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+ XmlFilterBase( rxContext ),
+ mxChartConv( new ::oox::drawingml::chart::ChartConverter )
{
#if OSL_DEBUG_LEVEL > 0
mpDebugFilterBase = this;
@@ -147,7 +147,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe
{
if( XmlFilterBase::filter( rDescriptor ) )
return true;
-
+#if 0 // FIXME
if( isExportFilter() ) {
Reference< XExporter > xExporter( getGlobalFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY );
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe
}
}
}
-
+#endif
return false;
}
@@ -219,6 +219,8 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
::oox::ole::VbaProject* PowerPointImport::implCreateVbaProject() const
{
return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) );
+}
+
OUString PowerPointImport::implGetImplementationName() const
{
return PowerPointImport_getImplementationName();
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 81dc9a2..85fe904 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -267,53 +267,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32 nMasterPlace
aShapePtr = findPlaceholder( nMasterPlaceholder, rChildren );
if ( aShapePtr.get() )
break;
- aRevIter++;
- }
- return aShapePtr;
-}
-
-oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes )
-{
- oox::drawingml::ShapePtr aShapePtr;
- std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
- while( aRevIter != rShapes.rend() )
- {
- if ( (*aRevIter)->getSubTypeIndex() == nIdx )
- {
- aShapePtr = *aRevIter;
- break;
- }
- std::vector< oox::drawingml::ShapePtr >& rChildren = (*aRevIter)->getChildren();
- aShapePtr = findPlaceholderByIndex( nIdx, rChildren );
- if ( aShapePtr.get() )
- break;
- aRevIter++;
- }
- return aShapePtr;
-}
-
-// if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder
-oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
-{
- oox::drawingml::ShapePtr pPlaceholder = findPlaceholder( nFirstPlaceholder, rShapes );
- return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder : findPlaceholder( nSecondPlaceholder, rShapes );
-}
-
-oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
-{
- oox::drawingml::ShapePtr aShapePtr;
- std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
- while( aRevIter != rShapes.rend() )
- {
- if ( (*aRevIter)->getSubType() == nMasterPlaceholder )
- {
- aShapePtr = *aRevIter;
- break;
- }
- std::vector< oox::drawingml::ShapePtr >& rChildren = (*aRevIter)->getChildren();
- aShapePtr = findPlaceholder( nMasterPlaceholder, rChildren );
- if ( aShapePtr.get() )
- break;
++aRevIter;
}
return aShapePtr;
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 3137152..3386b57 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include "properties.hxx"
+#include "oox/token/properties.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "headerfootercontext.hxx"
@@ -98,8 +98,6 @@ Reference< XFastContextHandler > SlideFragmentHandler::createFastChildContext( s
break;
}
- break;
- }
case PPT_TOKEN( notes ): // CT_NotesSlide
case PPT_TOKEN( notesMaster ): // CT_NotesMaster
break;
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index dff7bac..03777a2 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,7 +30,7 @@
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
namespace oox { namespace shape {
using namespace ::com::sun::star;
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index c398a3f..d5110f1 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -128,6 +128,7 @@ void Drawing::registerBlockId( sal_Int32 nBlockId )
BlockIdVector::iterator aIt = ::std::lower_bound( maBlockIds.begin(), maBlockIds.end(), nBlockId );
if( (aIt == maBlockIds.end()) || (nBlockId != *aIt) )
maBlockIds.insert( aIt, nBlockId );
+ }
}
void Drawing::registerOleObject( const OleObjectInfo& rOleObject )
@@ -281,4 +282,4 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/,
} // namespace vml
} // namespave oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index 78ad252..4826d65 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -63,7 +63,7 @@ ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const At
{
// DOCX filter handles plain shape elements with this fragment handler
case VMLDRAWING_WORD:
- if ( getNamespace( nElement ) == NMSP_VML )
+ if ( getNamespace( nElement ) == NMSP_vml )
return ShapeContextBase::createShapeContext( *this, mrDrawing.getShapes(), nElement, rAttribs );
break;
@@ -94,4 +94,4 @@ void DrawingFragment::finalizeImport()
} // namespace vml
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c0fb8bf..6f0d047 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -51,6 +51,8 @@
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
#include "oox/vml/vmltextbox.hxx"
+#include "oox/core/xmlfilterbase.hxx"
+#include "oox/helper/containerhelper.hxx"
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Any;
@@ -160,19 +162,6 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, const Rectangle& rSha
}
}
-Reference< XShape > lclCreateAndInsertXShape( const XmlFilterBase& rFilter,
- const Reference< XShapes >& rxShapes, const OUString& rService, const Rectangle& rShapeRect )
-{
- Reference< XShape > xShape = lclCreateXShape( rFilter, rService );
- if ( rService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFrame" ) ) )
- lclInsertTextFrame( rFilter, xShape );
- else
- lclInsertXShape( rxShapes, xShape );
- lclSetXShapeRect( xShape, rShapeRect );
-
- return xShape;
-}
-
} // namespace
// ============================================================================
@@ -659,4 +648,4 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
} // namespace vml
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 4a0393d..da86b80 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -363,7 +363,7 @@ ShapeContext::ShapeContext( ContextHandler2Helper& rParent, ShapeBase& rShape, c
ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{
// Custom shape in Writer with a textbox are transformed into a frame
- if ( nElement == ( NMSP_VML + XML_textbox ) )
+ if ( nElement == VML_TOKEN( textbox ) )
dynamic_cast<SimpleShape&>( mrShape ).setService(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
@@ -410,13 +410,13 @@ ContextHandlerRef GroupShapeContext::onCreateContext( sal_Int32 nElement, const
// ============================================================================
RectangleShapeContext::RectangleShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, RectangleShape& rShape ) :
- ShapeContext( rParent, rAttribs, rShape )
+ ShapeContext( rParent, rShape, rAttribs )
{
}
ContextHandlerRef RectangleShapeContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{
- if ( nElement == ( NMSP_VML + XML_textbox ) )
+ if ( nElement == ( VML_TOKEN( textbox ) ))
dynamic_cast< SimpleShape &>( mrShape ).setService(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index ff815bf..952c528 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -168,6 +168,14 @@ void Comment::importAnchor( bool bFrom, sal_Int32 nWhich, const OUString &rChars
}
}
+void Comment::importComment( SequenceInputStream& rStrm )
+{
+ BinRange aBinRange;
+ rStrm >> maModel.mnAuthorId >> aBinRange;
+ // cell range will be checked while inserting the comment into the document
+ getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() );
+}
+
RichStringRef Comment::createText()
{
maModel.mxText.reset( new RichString( *this ) );
diff --git a/oox/source/xls/commentsfragment.cxx b/oox/source/xls/commentsfragment.cxx
index 905a70a..f649346 100644
--- a/oox/source/xls/commentsfragment.cxx
+++ b/oox/source/xls/commentsfragment.cxx
@@ -89,10 +89,10 @@ void CommentsFragment::onCharacters( const OUString& rChars )
getComments().appendAuthor( rChars );
}
-void OoxCommentsFragment::onEndElement( const OUString& rChars )
+void CommentsFragment::onEndElement( const OUString& rChars )
{
bool bFrom = false;
- if( getPreviousElement() == XDR_TOKEN( from ) )
+ if( getParentElement() == XDR_TOKEN( from ) )
bFrom = true;
switch( getCurrentElement() )
{
@@ -173,4 +173,4 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm )
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index 8040262..4f56c8b 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -47,7 +47,7 @@
#include "oox/xls/stylesbuffer.hxx"
#include "oox/xls/themebuffer.hxx"
#include "oox/xls/unitconverter.hxx"
-#include "properties.hxx"
+#include "oox/token/properties.hxx"
namespace oox {
namespace xls {
@@ -837,6 +837,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
break;
case XML_GBox:
+ {
AxFrameModel& rAxModel = aControl.createModel< AxFrameModel >();
convertControlText( rAxModel.maFontData, rAxModel.mnTextColor, rAxModel.maCaption, pTextBox, pClientData->mnTextHAlign );
rAxModel.mnBorderStyle = pClientData->mbNo3D ? AX_BORDERSTYLE_SINGLE : AX_BORDERSTYLE_NONE;
@@ -878,6 +879,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
}
break;
case XML_List:
+ {
AxListBoxModel& rAxModel = aControl.createModel< AxListBoxModel >();
convertControlFontData( rAxModel.maFontData, rAxModel.mnTextColor, maListBoxFont );
rAxModel.mnBorderStyle = pClientData->mbNo3D2 ? AX_BORDERSTYLE_SINGLE : AX_BORDERSTYLE_NONE;
@@ -899,6 +901,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S
rAxModel.mnBorderStyle = pClientData->mbNo3D2 ? AX_BORDERSTYLE_SINGLE : AX_BORDERSTYLE_NONE;
rAxModel.mnSpecialEffect = pClientData->mbNo3D2 ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN;
rAxModel.mnListRows = pClientData->mnDropLines;
+ }
break;
case XML_Spin:
@@ -983,9 +986,11 @@ void VmlDrawing::notifyXShapeInserted( const Reference< XShape >& rxShape,
// control source links
if( (pClientData->maFmlaLink.getLength() > 0) || (pClientData->maFmlaRange.getLength() > 0) )
maControlConv.bindToSources( xCtrlModel, pClientData->maFmlaLink, pClientData->maFmlaRange, getSheetIndex() );
-{
- // collect all shape positions in the WorksheetHelper base class
- extendShapeBoundingBox( rShapeRect );
+ }
+ catch( Exception& )
+ {
+ }
+ }
}
// private --------------------------------------------------------------------
@@ -1105,4 +1110,4 @@ void VmlDrawingFragment::finalizeImport()
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx
index 3e89585..6efb795 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/oox/source/xls/excelfilter.cxx
@@ -160,6 +160,32 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const
return new ExcelGraphicHelper( getWorkbookData() );
}
+sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException )
+{
+ if ( XmlFilterBase::filter( rDescriptor ) )
+ return true;
+#if 0 /* FIXME */
+ if ( isExportFilter() )
+ {
+ Reference< XExporter > xExporter( getGlobalFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY );
+
+ if ( xExporter.is() )
+ {
+ Reference< XComponent > xDocument( getModel(), UNO_QUERY );
+ Reference< XFilter > xFilter( xExporter, UNO_QUERY );
+
+ if ( xFilter.is() )
+ {
+ xExporter->setSourceDocument( xDocument );
+ if ( xFilter->filter( rDescriptor ) )
+ return true;
+ }
+ }
+ }
+#endif /* FIXME */
+ return false;
+}
+
::oox::ole::VbaProject* ExcelFilter::implCreateVbaProject() const
{
return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
diff --git a/oox/source/xls/themebuffer.cxx b/oox/source/xls/themebuffer.cxx
index 8559162..8f1d20f 100644
--- a/oox/source/xls/themebuffer.cxx
+++ b/oox/source/xls/themebuffer.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include "oox/xls/themebuffer.hxx"
-#include "tokens.hxx"
+#include "oox/token/tokens.hxx"
#include "oox/xls/stylesbuffer.hxx"
@@ -124,4 +124,4 @@ sal_Int32 ThemeBuffer::getColorByToken( sal_Int32 nToken ) const
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/xls/viewsettings.cxx b/oox/source/xls/viewsettings.cxx
index 9091a63..04b5e83 100644
--- a/oox/source/xls/viewsettings.cxx
+++ b/oox/source/xls/viewsettings.cxx
@@ -678,13 +678,6 @@ void ViewSettings::importOleSize( SequenceInputStream& rStrm )
mbValidOleSize = getAddressConverter().convertToCellRange( maOleSize, aBinRange, 0, true, false );
}
-void ViewSettings::importOleSize( RecordInputStream& rStrm )
-{
- BinRange aBinRange;
- rStrm >> aBinRange;
- mbValidOleSize = getAddressConverter().convertToCellRange( maOleSize, aBinRange, 0, true, false );
-}
-
void ViewSettings::importWindow1( BiffInputStream& rStrm )
{
sal_uInt16 nWinX, nWinY, nWinWidth, nWinHeight;
@@ -840,4 +833,4 @@ WorkbookViewModel& ViewSettings::createWorkbookView()
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index e69842f..5a566ae 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -538,8 +538,6 @@ private:
/** Merges the passed merged range and updates right/bottom cell borders. */
void finalizeMergedRange( const CellRangeAddress& rRange );
- /** Extends the used cell area with the area used by drawing objects. */
- void finalizeUsedArea();
/** Converts column properties for all columns in the sheet. */
void convertColumns();
/** Converts column properties. */
@@ -1171,7 +1169,6 @@ void WorksheetData::finalizeWorksheetImport()
convertRows();
lclUpdateProgressBar( mxFinalProgress, 0.75 );
finalizeDrawings();
- finalizeUsedArea(); // after DML and VML drawing
lclUpdateProgressBar( mxFinalProgress, 1.0 );
// reset current sheet index in global data
@@ -1558,42 +1555,6 @@ void WorksheetData::finalizeMergedRange( const CellRangeAddress& rRange )
}
}
-void WorksheetData::finalizeDrawing()
-{
- OSL_ENSURE( (getFilterType() == FILTER_OOX) || (maDrawingPath.getLength() == 0),
- "WorksheetData::finalizeDrawing - unexpected DrawingML path" );
- if( (getFilterType() == FILTER_OOX) && (maDrawingPath.getLength() > 0) )
- importOoxFragment( new OoxDrawingFragment( *this, maDrawingPath ) );
-}
-
-void WorksheetData::finalizeVmlDrawing()
-{
- OSL_ENSURE( (getFilterType() == FILTER_OOX) || (maVmlDrawingPath.getLength() == 0),
- "WorksheetData::finalizeVmlDrawing - unexpected VML path" );
- if( (getFilterType() == FILTER_OOX) && (maVmlDrawingPath.getLength() > 0) )
- importOoxFragment( new OoxVmlDrawingFragment( *this, maVmlDrawingPath ) );
-}
-
-void WorksheetData::finalizeUsedArea()
-{
- /* Extend used area of the sheet by cells covered with drawing objects.
- Needed if the imported document is inserted as "OLE object from file"
- and thus does not provide an OLE size property by itself. */
- if( (maShapeBoundingBox.Width > 0) || (maShapeBoundingBox.Height > 0) )
- extendUsedArea( getCellRangeFromRectangle( maShapeBoundingBox ) );
-
- // if no used area is set, default to A1
- if( maUsedArea.StartColumn > maUsedArea.EndColumn )
- maUsedArea.StartColumn = maUsedArea.EndColumn = 0;
- if( maUsedArea.StartRow > maUsedArea.EndRow )
- maUsedArea.StartRow = maUsedArea.EndRow = 0;
-
- /* Register the used area of this sheet in global view settings. The
- global view settings will set the visible area if this document is an
- embedded OLE object. */
- getViewSettings().setSheetUsedArea( maUsedArea );
-}
-
void WorksheetData::convertColumns()
{
sal_Int32 nNextCol = 0;
@@ -2356,4 +2317,4 @@ bool WorksheetHelperRoot::isValidSheet() const
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/xls/worksheetsettings.cxx b/oox/source/xls/worksheetsettings.cxx
index 2234031..32bed4f 100644
--- a/oox/source/xls/worksheetsettings.cxx
+++ b/oox/source/xls/worksheetsettings.cxx
@@ -34,7 +34,7 @@
#include "oox/xls/pagesettings.hxx"
#include "oox/xls/workbooksettings.hxx"
#include "oox/core/filterbase.hxx"
-#include "properties.hxx"
+#include "oox/token/properties.hxx"
#include <com/sun/star/util/XProtectable.hpp>
@@ -353,4 +353,4 @@ void WorksheetSettings::finalizeImport()
} // namespace xls
} // namespace oox
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
index 1748540..db75024 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -63,14 +63,23 @@ SHL1IMPLIB= i$(TARGET)
SHL1USE_EXPORTS=name
SHL1STDLIBS= \
- $(CPPULIB) \
+ $(CPPULIB) \
$(CPPUHELPERLIB)\
$(COMPHELPERLIB)\
$(RTLLIB) \
$(SALLIB) \
$(BASEGFXLIB) \
$(SAXLIB) \
- $(XMLSCRIPTLIB)
+ $(XMLSCRIPTLIB) \
+ $(VCLLIB) \
+ $(GOODIESLIB) \
+ $(SVTOOLLIB) \
+ $(SVXCORELIB) \
+ $(SVLLIB) \
+ $(MSFILTERLIB) \
+ $(UNOTOOLSLIB) \
+ $(XMLOFFLIB) \
+ $(TOOLSLIB)
# link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
.IF "$(GUI)"=="WNT"
More information about the Libreoffice-commits
mailing list