[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - filter/inc filter/source oox/inc oox/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Mar 13 04:23:59 PDT 2011
filter/inc/filter/msfilter/msdffimp.hxx | 2
filter/inc/filter/msfilter/msocximex.hxx | 2
filter/inc/filter/msfilter/svdfppt.hxx | 2
filter/inc/filter/msfilter/svxmsbas.hxx | 12 ++--
filter/source/graphicfilter/egif/egif.cxx | 7 +-
filter/source/graphicfilter/epbm/epbm.cxx | 3 -
filter/source/graphicfilter/etiff/etiff.cxx | 4 -
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/iras/iras.cxx | 2
filter/source/graphicfilter/itiff/itiff.cxx | 10 +--
filter/source/msfilter/eschesdo.cxx | 22 +++----
filter/source/msfilter/eschesdo.hxx | 4 -
filter/source/msfilter/makefile.mk | 4 -
filter/source/msfilter/msdffimp.cxx | 16 ++---
filter/source/msfilter/msocximex.cxx | 8 +-
filter/source/msfilter/mstoolbar.cxx | 8 +-
filter/source/msfilter/svxmsbas.cxx | 32 +++++------
filter/source/odfflatxml/OdfFlatXml.cxx | 8 --
filter/source/pdf/pdfexport.cxx | 7 +-
filter/source/svg/makefile.mk | 7 ++
filter/source/svg/svgexport.cxx | 2
filter/source/svg/svgfilter.cxx | 4 -
filter/source/svg/svgreader.cxx | 20 +++----
filter/source/svg/svgwriter.cxx | 18 +++---
filter/source/svg/svgwriter.hxx | 2
oox/inc/oox/export/utils.hxx | 4 -
oox/inc/oox/export/vmlexport.hxx | 6 +-
oox/inc/oox/helper/containerhelper.hxx | 17 ------
oox/inc/oox/helper/refmap.hxx | 10 +++
oox/inc/oox/ole/vbacontrol.hxx | 10 +--
oox/inc/oox/ole/vbaproject.hxx | 1
oox/source/core/contexthandler2.cxx | 8 +-
oox/source/core/filterbase.cxx | 2
oox/source/core/xmlfilterbase.cxx | 65 +++++++++++------------
oox/source/drawingml/chart/chartconverter.cxx | 9 +--
oox/source/drawingml/chart/datasourcecontext.cxx | 5 -
oox/source/export/chartexport.cxx | 2
oox/source/export/drawingml.cxx | 35 ++++++------
oox/source/export/shapes.cxx | 13 ++--
oox/source/export/vmlexport.cxx | 8 +-
oox/source/helper/propertymap.cxx | 5 -
oox/source/ole/vbacontrol.cxx | 8 +-
oox/source/ole/vbamodule.cxx | 7 --
oox/source/ppt/pptgraphicshapecontext.cxx | 14 ++--
oox/source/token/namespacemap.cxx | 1
oox/source/vml/vmldrawingfragment.cxx | 3 -
oox/source/vml/vmlshape.cxx | 5 +
oox/source/vml/vmlshapecontext.cxx | 6 +-
oox/source/xls/commentsbuffer.cxx | 28 ++++-----
oox/source/xls/commentsfragment.cxx | 20 -------
oox/source/xls/drawingfragment.cxx | 4 +
oox/source/xls/worksheethelper.cxx | 3 -
52 files changed, 237 insertions(+), 270 deletions(-)
New commits:
commit 90bbf7591236a20e68ec5676a3cfe1c9ce69ffb1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 05:36:33 2011 -0500
fix mis-merge in oox
diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx
index 318ae61..569e4f6 100644
--- a/oox/inc/oox/export/utils.hxx
+++ b/oox/inc/oox/export/utils.hxx
@@ -49,14 +49,14 @@
// ---------------------------------------------------------------------------------------------
-static inline sal_Int64 PPTtoEMU( INT32 nPPT )
+static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT )
{
return (sal_Int64)( (double)nPPT * 1587.5 );
}
// ---------------------------------------------------------------------------------------------
-static inline sal_Int64 MM100toEMU( INT32 nMM100 )
+static inline sal_Int64 MM100toEMU( sal_Int32 nMM100 )
{
return (sal_Int64)nMM100 * 360;
}
diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx
index f971f32..5ba5249 100644
--- a/oox/inc/oox/export/vmlexport.hxx
+++ b/oox/inc/oox/export/vmlexport.hxx
@@ -92,13 +92,13 @@ protected:
private:
- virtual void OpenContainer( UINT16 nEscherContainer, int nRecInstance = 0 );
+ virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 );
virtual void CloseContainer();
- virtual UINT32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 );
+ virtual sal_uInt32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 );
virtual void LeaveGroup();
- virtual void AddShape( UINT32 nShapeType, UINT32 nShapeFlags, UINT32 nShapeId = 0 );
+ virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 );
private:
/// Create an OString representing the id from a numerical id.
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index b92649a..73998b5 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -46,22 +46,6 @@ namespace com { namespace sun { namespace star {
namespace oox {
-// ============================================================================
-
- /** Calls the passed member function of ObjType on every contained object,
- automatically skips all elements that are empty references. */
- template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
- inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const
- {
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
- }
- /** Calls the passed member function of ObjType on every contained object,
- automatically skips all elements that are empty references. */
- template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
- inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const
- {
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
- }
/** Template for a 2-dimensional array of objects.
This class template provides a similar interface to the ::std::vector
@@ -413,4 +397,4 @@ template< typename MatrixType >
#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/inc/oox/helper/refmap.hxx b/oox/inc/oox/helper/refmap.hxx
index eec7228..2286185 100755
--- a/oox/inc/oox/helper/refmap.hxx
+++ b/oox/inc/oox/helper/refmap.hxx
@@ -110,6 +110,16 @@ public:
{
forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
}
+
+ /** Calls the passed member function of ObjType on every contained object,
+ automatically skips all elements that are empty references. */
+ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
+ inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const
+ {
+ forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
+ }
+
+
/** Calls the passed functor for every contained object. Passes the key as
first argument and the object reference as second argument to rFunctor. */
template< typename FunctorType >
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 71bc5f9..9f7ef22 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -197,11 +197,11 @@ public:
/** Imports the form and its embedded controls, and inserts the form with
all its controls into the passed dialog library. */
void importForm(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib,
- StorageBase& rVbaFormStrg,
- const ::rtl::OUString& rModuleName,
- rtl_TextEncoding eTextEnc );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib,
+ StorageBase& rVbaFormStrg,
+ const ::rtl::OUString& rModuleName,
+ rtl_TextEncoding eTextEnc );
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCompContext;
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index ceb5429..6c91662 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -203,7 +203,6 @@ private:
::rtl::OUString maPrjName; /// Name of the VBA project.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
mxOleOverridesSink;
- ::rtl::OUString maPrjName; /// Name of the VBA project.
};
// ============================================================================
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 28c0cc2..61c5266 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -112,7 +112,7 @@ void ContextHandler2Helper::implCharacters( const OUString& rChars )
{
// #i76091# collect characters until new element starts or this element ends
if( !mxContextStack->empty() )
- mxContextStack->back().maChars += rChars;
+ mxContextStack->back().maChars.append(rChars);
}
void ContextHandler2Helper::implEndElement( sal_Int32 nElement )
@@ -152,9 +152,10 @@ void ContextHandler2Helper::implEndRecord( sal_Int32 nRecId )
ElementInfo& ContextHandler2Helper::pushElementInfo( sal_Int32 nElement )
{
- ContextInfo aInfo( nElement );
+ mxContextStack->resize( mxContextStack->size() + 1 );
ElementInfo& rInfo = mxContextStack->back();
- return mxContextStack->back();
+ rInfo.mnElement = nElement;
+ return rInfo;
}
void ContextHandler2Helper::popElementInfo()
@@ -268,4 +269,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/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 6d760f6..269e657 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -583,7 +583,7 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() );
try
{
- Reference< XNameAccess > xFilters( getGlobalFactory()->createInstance(
+ Reference< XNameAccess > xFilters( getServiceFactory()->createInstance(
CREATE_OUSTRING( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY_THROW );
Any aValues = xFilters->getByName( sFilterName );
Sequence<PropertyValue > aPropSeq;
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 0eb1eb8..2813203 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -46,6 +46,18 @@
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/helper/zipstorage.hxx"
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/mediadescriptor.hxx>
+#include <oox/core/filterdetect.hxx>
+#include <comphelper/storagehelper.hxx>
+using ::com::sun::star::uno::XComponentContext;
+using ::com::sun::star::document::XOOXMLDocumentPropertiesImporter;
+using ::com::sun::star::document::XDocumentPropertiesSupplier;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::lang::XComponent;
namespace oox {
namespace core {
@@ -69,19 +81,7 @@ using ::rtl::OUStringBuffer;
using ::sax_fastparser::FSHelperPtr;
using ::sax_fastparser::FastSerializerHelper;
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/mediadescriptor.hxx>
-#include <oox/core/filterdetect.hxx>
-#include <comphelper/storagehelper.hxx>
-using ::com::sun::star::uno::XComponentContext;
-using ::com::sun::star::document::XOOXMLDocumentPropertiesImporter;
-using ::com::sun::star::document::XDocumentPropertiesSupplier;
-using ::com::sun::star::beans::XPropertySet;
-using ::com::sun::star::lang::XComponent;
@@ -119,22 +119,6 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo
maBinSuffix( CREATE_OUSTRING( ".bin" ) ),
maVmlSuffix( CREATE_OUSTRING( ".vml" ) )
{
-static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiServiceFactory > aFactory)
-{
- Reference< XComponentContext > xContext;
- try
- {
- Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY );
- if( xFactProp.is() )
- xFactProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext;
- }
- catch( Exception& )
- {}
-
- return xContext;
-}
-
-// ============================================================================
// register XML namespaces
maFastParser.registerNamespace( NMSP_xml );
maFastParser.registerNamespace( NMSP_packageRel );
@@ -159,6 +143,24 @@ static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiS
maFastParser.registerNamespace( NMSP_xm );
}
+
+static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiServiceFactory > aFactory)
+{
+ Reference< XComponentContext > xContext;
+ try
+ {
+ Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY );
+ if( xFactProp.is() )
+ xFactProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext;
+ }
+ catch( Exception& )
+ {}
+
+ return xContext;
+}
+
+// ============================================================================
+
// ============================================================================
XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
@@ -177,13 +179,13 @@ XmlFilterBase::~XmlFilterBase()
void XmlFilterBase::importDocumentProperties() throw()
{
- Reference< XMultiServiceFactory > xFactory( getGlobalFactory(), UNO_QUERY );
+ Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY );
MediaDescriptor aMediaDesc( getMediaDescriptor() );
Reference< XInputStream > xInputStream;
- ::oox::core::FilterDetect aDetector( xFactory );
+ Reference< XComponentContext > xContext = lcl_getComponentContext(getServiceFactory());
+ ::oox::core::FilterDetect aDetector( xContext );
xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
Reference< XComponent > xModel( getModel(), UNO_QUERY );
- Reference< XComponentContext > xContext = lcl_getComponentContext(getGlobalFactory());
Reference< XStorage > xDocumentStorage (
::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( OFOPXML_STORAGE_FORMAT_STRING, xInputStream ) );
Reference< XInterface > xTemp = xContext->getServiceManager()->createInstanceWithContext(
@@ -569,4 +571,4 @@ StorageRef XmlFilterBase::implCreateStorage( const Reference< XStream >& rxOutSt
} // 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 c4ab28d..03ba7cf 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;
@@ -67,7 +69,7 @@ static OUString lclGenerateApiString( const OUString& rString )
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;
@@ -79,7 +81,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 )
@@ -134,7 +136,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
@@ -167,4 +169,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/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index d17fda3..dce3a82 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -29,7 +29,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 8630ee0..1be0172 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -29,6 +29,7 @@
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/drawingml.hxx"
#include "oox/export/utils.hxx"
+#include <oox/token/tokens.hxx>
#include <cstdio>
#include <com/sun/star/awt/CharSet.hpp>
@@ -367,10 +368,10 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
sal_uInt32 nLineWidth = 0;
sal_uInt32 nColor = 0;
- sal_Bool bColorSet = FALSE;
+ sal_Bool bColorSet = sal_False;
const char* cap = NULL;
drawing::LineDash aLineDash;
- sal_Bool bDashSet = FALSE;
+ sal_Bool bDashSet = sal_False;
GET( nLineWidth, LineWidth );
@@ -378,7 +379,7 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
case drawing::LineStyle_DASH:
if( GETA( LineDash ) ) {
aLineDash = *(drawing::LineDash*) mAny.getValue();
- bDashSet = TRUE;
+ bDashSet = sal_True;
if( aLineDash.Style == DashStyle_ROUND || aLineDash.Style == DashStyle_ROUNDRELATIVE )
cap = "rnd";
@@ -390,7 +391,7 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
default:
if ( GETA( LineColor ) ) {
nColor = *((sal_uInt32*) mAny.getValue()) & 0xffffff;
- bColorSet = TRUE;
+ bColorSet = sal_True;
}
break;
}
@@ -879,7 +880,7 @@ const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::su
bIsField = sal_True;
rXPropSet.set( rXTextField, UNO_QUERY );
if( rXPropSet.is() ) {
- String aFieldKind( rXTextField->getPresentation( TRUE ) );
+ String aFieldKind( rXTextField->getPresentation( sal_True ) );
DBG(printf ("field kind: %s\n", ST(aFieldKind) ));
if( aFieldKind == S( "Page" ) ) {
return "slidenum";
@@ -1221,7 +1222,7 @@ void DrawingML::WriteParagraph( Reference< XTextContent > rParagraph )
mpFS->startElementNS( XML_a, XML_p, FSEND );
- sal_Bool bPropertiesWritten = FALSE;
+ sal_Bool bPropertiesWritten = sal_False;
while( enumeration->hasMoreElements() ) {
Reference< XTextRange > run;
Any any ( enumeration->nextElement() );
@@ -1229,7 +1230,7 @@ void DrawingML::WriteParagraph( Reference< XTextContent > rParagraph )
if (any >>= run) {
if( !bPropertiesWritten ) {
WriteParagraphProperties( rParagraph );
- bPropertiesWritten = TRUE;
+ bPropertiesWritten = sal_True;
}
WriteRun( run );
}
@@ -1294,11 +1295,11 @@ void DrawingML::WriteText( Reference< XShape > rXShape )
else if( bVertical && eHorizontalAlignment == TextHorizontalAdjust_LEFT )
sVerticalAlignment = "b";
- sal_Bool bHasWrap = FALSE;
- sal_Bool bWrap = FALSE;
+ sal_Bool bHasWrap = sal_False;
+ sal_Bool bWrap = sal_False;
if( GETA( TextWordWrap ) ) {
mAny >>= bWrap;
- bHasWrap = TRUE;
+ bHasWrap = sal_True;
//DBG(printf("wrap: %d\n", bWrap));
}
@@ -1388,11 +1389,11 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
mpFS->startElementNS( XML_a, XML_pathLst, FSEND );
- for( USHORT i = 0; i < rPolyPolygon.Count(); i ++ ) {
+ for( sal_uInt16 i = 0; i < rPolyPolygon.Count(); i ++ ) {
const Polygon& rPoly = rPolyPolygon[ i ];
Rectangle aRect( rPoly.GetBoundRect() );
- sal_Bool bBezier = FALSE;
+ sal_Bool bBezier = sal_False;
mpFS->startElementNS( XML_a, XML_path,
XML_w, I64S( aRect.GetWidth() ),
@@ -1411,13 +1412,13 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
mpFS->endElementNS( XML_a, XML_moveTo );
}
- for( USHORT j = 1; j < rPoly.GetSize(); j ++ )
+ for( sal_uInt16 j = 1; j < rPoly.GetSize(); j ++ )
{
enum PolyFlags flags = rPoly.GetFlags(j);
if( flags == POLY_CONTROL && !bBezier )
{
mpFS->startElementNS( XML_a, XML_cubicBezTo, FSEND );
- bBezier = TRUE;
+ bBezier = sal_True;
}
else if( flags == POLY_NORMAL && !bBezier )
mpFS->startElementNS( XML_a, XML_lnTo, FSEND );
@@ -1430,7 +1431,7 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
if( ( flags == POLY_NORMAL || flags == POLY_SYMMTR ) && bBezier )
{
mpFS->endElementNS( XML_a, XML_cubicBezTo );
- bBezier = FALSE;
+ bBezier = sal_False;
}
else if( flags == POLY_NORMAL && !bBezier )
mpFS->endElementNS( XML_a, XML_lnTo );
@@ -1471,12 +1472,12 @@ void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorE
if( nStartID != -1 )
mpFS->singleElementNS( XML_a, XML_stCxn,
XML_id, I32S( nStartID ),
- XML_idx, I64S( rConnectorEntry.GetConnectorRule( TRUE ) ),
+ XML_idx, I64S( rConnectorEntry.GetConnectorRule( sal_True ) ),
FSEND );
if( nEndID != -1 )
mpFS->singleElementNS( XML_a, XML_endCxn,
XML_id, I32S( nEndID ),
- XML_idx, I64S( rConnectorEntry.GetConnectorRule( FALSE ) ),
+ XML_idx, I64S( rConnectorEntry.GetConnectorRule( sal_False ) ),
FSEND );
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5693238..aea1812 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -29,6 +29,7 @@
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/shapes.hxx"
#include "oox/export/utils.hxx"
+#include <oox/token/tokens.hxx>
#include <cstdio>
#include <com/sun/star/awt/CharSet.hpp>
@@ -476,12 +477,12 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
ShapeExport& ShapeExport::WriteClosedBezierShape( Reference< XShape > xShape )
{
- return WriteBezierShape( xShape, TRUE );
+ return WriteBezierShape( xShape, sal_True );
}
ShapeExport& ShapeExport::WriteOpenBezierShape( Reference< XShape > xShape )
{
- return WriteBezierShape( xShape, FALSE );
+ return WriteBezierShape( xShape, sal_False );
}
ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
@@ -491,7 +492,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
Reference< XPropertySet > rXPropSet( xShape, UNO_QUERY );
SdrObjCustomShape* pShape = (SdrObjCustomShape*) GetSdrObjectFromXShape( xShape );
sal_Bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( pShape );
- sal_Bool bPredefinedHandlesUsed = TRUE;
+ sal_Bool bPredefinedHandlesUsed = sal_True;
OUString sShapeType;
sal_uInt32 nMirrorFlags = 0;
MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType( xShape, nMirrorFlags, sShapeType );
@@ -514,7 +515,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
nAdjustmentValuesIndex = i;
else if( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Handles" ) )) {
if( !bIsDefaultObject )
- bPredefinedHandlesUsed = FALSE;
+ bPredefinedHandlesUsed = sal_False;
// TODO: update nAdjustmentsWhichNeedsToBeConverted here
}
}
@@ -717,13 +718,13 @@ ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape )
Rectangle aRect( Point( aStartPoint.X, aStartPoint.Y ), Point( aEndPoint.X, aEndPoint.Y ) );
if( aRect.getWidth() < 0 ) {
- bFlipH = TRUE;
+ bFlipH = sal_True;
aRect.setX( aEndPoint.X );
aRect.setWidth( aStartPoint.X - aEndPoint.X );
}
if( aRect.getHeight() < 0 ) {
- bFlipV = TRUE;
+ bFlipV = sal_True;
aRect.setY( aEndPoint.Y );
aRect.setHeight( aStartPoint.Y - aEndPoint.Y );
}
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 5f519c5..510d939 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -28,7 +28,7 @@
#include <oox/export/vmlexport.hxx>
-#include <tokens.hxx>
+#include <oox/token/tokens.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
@@ -83,7 +83,7 @@ VMLExport::~VMLExport()
delete[] m_pShapeTypeWritten, m_pShapeTypeWritten = NULL;
}
-void VMLExport::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
+void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
{
EscherEx::OpenContainer( nEscherContainer, nRecInstance );
@@ -127,7 +127,7 @@ void VMLExport::CloseContainer()
EscherEx::CloseContainer();
}
-UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
+sal_uInt32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
{
sal_uInt32 nShapeId = GenerateShapeId();
@@ -172,7 +172,7 @@ void VMLExport::LeaveGroup()
m_pSerializer->endElementNS( XML_v, XML_group );
}
-void VMLExport::AddShape( UINT32 nShapeType, UINT32 nShapeFlags, UINT32 nShapeId )
+void VMLExport::AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId )
{
m_nShapeType = nShapeType;
m_nShapeFlags = nShapeFlags;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 79a90c3..19cf295 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -32,6 +32,8 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
+#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <cppuhelper/implbase2.hxx>
#include <osl/mutex.hxx>
#include "oox/token/propertynames.hxx"
@@ -43,8 +45,6 @@ using ::com::sun::star::container::XIndexReplace;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using ::com::sun::star::drawing::TextHorizontalAdjust;
@@ -349,4 +349,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/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 5b4a634..8fd6a2c 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -804,8 +804,10 @@ VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext,
OSL_ENSURE( mxDocModel.is(), "VbaUserForm::VbaUserForm - missing document model" );
}
-void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib,
- StorageBase& rVbaFormStrg, const OUString& rModuleName, rtl_TextEncoding eTextEnc )
+void VbaUserForm::importForm(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
+ const Reference< XNameContainer >& rxDialogLib,
+ StorageBase& rVbaFormStrg, const OUString& rModuleName, rtl_TextEncoding eTextEnc )
{
OSL_ENSURE( rxDialogLib.is(), "VbaUserForm::importForm - missing dialog library" );
if( !mxCompContext.is() || !mxDocModel.is() || !rxDialogLib.is() )
@@ -874,7 +876,7 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib,
if( convertProperties( xDialogModel, maConverter, 0 ) )
{
// export the dialog to XML and insert it into the dialog library
- Reference< XInputStreamProvider > xDialogSource( ::xmlscript::exportDialogModel( xDialogNC, xCompContext, rxDocModel ), UNO_SET_THROW );
+ Reference< XInputStreamProvider > xDialogSource( ::xmlscript::exportDialogModel( xDialogNC, mxCompContext, rxDocModel ), UNO_SET_THROW );
OSL_ENSURE( !rxDialogLib->hasByName( aFormName ), "VbaUserForm::importForm - multiple dialogs with equal name" );
ContainerHelper::insertByName( rxDialogLib, aFormName, Any( xDialogSource ) );
}
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 52976a8..969ec50 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -213,13 +213,6 @@ void VbaModule::createEmptyModule( const Reference< XNameContainer >& rxBasicLib
createModule( OUString(), rxBasicLib, rxDocObjectNA );
}
-// private --------------------------------------------------------------------
-{
- createModule( OUString(), rxBasicLib, rxDocObjectNA );
-}
-
-void VbaModule::createEmptyModule( const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
-
OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, const Reference< XNameContainer >& rxOleNameOverrides ) const
{
OUStringBuffer aSourceCode;
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 0e7b941..b61ec38 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/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index c2b7b3c..9a4459c 100755
--- a/oox/source/token/namespacemap.cxx
+++ b/oox/source/token/namespacemap.cxx
@@ -45,6 +45,7 @@ NamespaceMap::NamespaceMap()
operator[]( pNamespaceUrl->mnId ) = ::rtl::OUString::createFromAscii( pNamespaceUrl->mpcUrl );
}
+}
// ============================================================================
/* 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 dbabc0e..32bcea5 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -45,13 +45,13 @@
#include "oox/helper/graphichelper.hxx"
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
-#include "oox/core/xmlfilterbase.hxx"
#include "oox/ole/axcontrol.hxx"
#include "oox/ole/axcontrolfragment.hxx"
#include "oox/ole/oleobjecthelper.hxx"
#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;
@@ -161,6 +161,8 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, const Rectangle& rSha
}
}
}
+}
+
} // namespace
// ============================================================================
@@ -646,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 6a4e9ee..089856a 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -366,7 +366,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 == ( NMSP_vml + XML_textbox ) )
dynamic_cast<SimpleShape&>( mrShape ).setService(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
@@ -413,13 +413,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 == ( NMSP_vml + XML_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 c91a48b..ea102df 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+#include <oox/token/properties.hxx>
+#include <oox/token/tokens.hxx>
+
#include "oox/xls/commentsbuffer.hxx"
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
@@ -36,7 +39,6 @@
#include "oox/vml/vmlshape.hxx"
#include "oox/xls/addressconverter.hxx"
#include "oox/xls/drawingfragment.hxx"
-#include "properties.hxx"
#include "svx/sdtaitm.hxx"
#include "oox/xls/unitconverter.hxx"
@@ -48,6 +50,17 @@ using ::com::sun::star::text::XTextRange;
using ::com::sun::star::awt::Size;
using ::com::sun::star::awt::Point;
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign )
{
@@ -81,18 +94,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
return SDRTEXTVERTADJUST_TOP;
}
-namespace oox {
-namespace xls {
-
-// ============================================================================
-
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::sheet;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::uno;
-
-using ::rtl::OUString;
-
// ============================================================================
CommentModel::CommentModel() :
@@ -268,4 +269,4 @@ void CommentsBuffer::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/commentsfragment.cxx b/oox/source/xls/commentsfragment.cxx
index a6869d6..bede4c5 100644
--- a/oox/source/xls/commentsfragment.cxx
+++ b/oox/source/xls/commentsfragment.cxx
@@ -91,25 +91,6 @@ void CommentsFragment::onCharacters( const OUString& rChars )
void CommentsFragment::onEndElement()
{
- bool bFrom = false;
- if( getPreviousElement() == XDR_TOKEN( from ) )
- bFrom = true;
- switch( getCurrentElement() )
- {
- case XDR_TOKEN( col ):
- case XDR_TOKEN( colOff ):
- case XDR_TOKEN( row ):
- case XDR_TOKEN( rowOff ):
- mxComment->importAnchor( bFrom, getCurrentElement(), rChars );
- break;
- case XLS_TOKEN( comment ):
- mxComment.reset();
- break;
- }
-}
-
-void CommentsFragment::onEndElement()
-{
if( isCurrentElement( XLS_TOKEN( comment ) ) )
mxComment.reset();
}
@@ -177,4 +158,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 6308b0e..c64a9cd 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -46,6 +46,9 @@
#include "oox/xls/themebuffer.hxx"
#include "oox/xls/unitconverter.hxx"
+namespace oox {
+namespace xls {
+
using ::rtl::OUString;
// ============================================================================
@@ -1098,4 +1101,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/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index 0133433..da281da 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/sheet/XMultiFormulaTokens.hpp>
#include <com/sun/star/sheet/XMultipleOperation.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
-#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/sheet/XSheetCondition2.hpp>
#include <com/sun/star/sheet/XSheetOutline.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
@@ -2290,4 +2290,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: */
commit b66d22071298ef0432f20ee6f8224b5a78c16432
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 01:33:54 2011 -0600
fix mis-merge (mostly tools type remnants)
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index a856b9c..503e46b 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -576,7 +576,7 @@ public:
bool SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd = NULL, sal_uLong nSkipCount = 0 ) const;
bool SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd = NULL, sal_uLong nSkipCount = 0 ) const;
- static void MSDFFReadZString( SvStream& rIn, String& rStr, sal_uLong nMaxLen, bool bUniCode = FALSE );
+ static void MSDFFReadZString( SvStream& rIn, String& rStr, sal_uLong nMaxLen, bool bUniCode = sal_False );
static sal_Bool ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn );
static sal_Bool ReadCommonRecordHeader( SvStream& rSt,
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 9e09d67..b639730 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -1187,7 +1187,7 @@ public:
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
nBorderColor = 0x80000006L;
- aFontData.SetHasAlign(TRUE);
+ aFontData.SetHasAlign(sal_True);
}
using OCX_ModernControl::Import; // to not hide the other two import methods
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 68466c0..93ce1a4 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -454,7 +454,7 @@ public:
SdrEscherImport( PowerPointImportParam&, const String& rBaseURL );
virtual ~SdrEscherImport();
- virtual bool GetColorFromPalette( sal_uint16 nNum, Color& rColor ) const;
+ virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const;
virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const;
CharSet GetCharSet( sal_uInt32 nNum ) const;
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 0472d32..20ad9a7 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -95,20 +95,20 @@ private:
SfxObjectShell &rDocSh;
sal_Bool bImport;
sal_Bool bCopy;
- ControlAttributeInfo m_ModuleNameToObjIdHash;
- MSFILTER_DLLPRIVATE void extractAttribute( const String& rAttribute, const String& rModName );
+ ControlAttributeInfo m_ModuleNameToObjIdHash;
+ MSFILTER_DLLPRIVATE void extractAttribute( const String& rAttribute, const String& rModName );
MSFILTER_DLLPRIVATE sal_Bool ImportCode_Impl( const String& rStorageName,
const String &rSubStorageName,
const std::vector< String >& codeNames,
sal_Bool bAsComment, sal_Bool bStripped);
- MSFILTER_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName,
- const String &rSubStorageName, BOOL bVBAMode);
+ MSFILTER_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName,
+ const String &rSubStorageName, sal_Bool bVBAMode);
MSFILTER_DLLPRIVATE sal_Bool CopyStorage_Impl( const String& rStorageName,
const String &rSubStorageName);
rtl::OUString msProjectName;
- MSFILTER_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, const std::vector< String >&, BOOL, BOOL );
- MSFILTER_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, BOOL);
+ MSFILTER_DLLPRIVATE sal_Bool ImportCode_Impl( VBA_Impl&, const std::vector< String >&, sal_Bool, sal_Bool );
+ MSFILTER_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, sal_Bool);
};
#endif
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index ec75bc8..bbe87c2 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -376,15 +376,15 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
// PrefSize in 100th-mm als ApplicationExtension schreiben
if( rSize100.Width() && rSize100.Height() )
{
- m_rGIF << (sal_uint8) 0x21;
+ m_rGIF << (sal_uInt8) 0x21;
m_rGIF << (sal_uInt8) 0xff;
- m_rGIF << (BYTE) 0x0b;
+ m_rGIF << (sal_uInt8) 0x0b;
m_rGIF.Write( "STARDIV 5.0", 11 );
m_rGIF << (sal_uInt8) 0x09;
m_rGIF << (sal_uInt8) 0x01;
m_rGIF << (sal_uInt32) rSize100.Width();
m_rGIF << (sal_uInt32) rSize100.Height();
- m_rGIF << (sal_uint8) 0x00;
+ m_rGIF << (sal_uInt8) 0x00;
}
}
@@ -579,4 +579,4 @@ extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& r
// ------------------------------------------------------------------------
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 2125e16..5f3eca3 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -135,7 +135,7 @@ sal_Bool PBMWriter::ImplWriteHeader()
m_rOStm << "P1\x0a";
ImplWriteNumber( mnWidth );
- m_rOStm << (sal_uint8)32;
+ m_rOStm << (sal_uInt8)32;
ImplWriteNumber( mnHeight );
m_rOStm << (sal_uInt8)10;
}
@@ -213,4 +213,4 @@ extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& r
// ------------------------------------------------------------------------
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 8f3da01..65364e2 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -167,7 +167,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt
}
}
- const UINT16 nOldFormat = m_rOStm.GetNumberFormatInt();
+ const sal_uInt16 nOldFormat = m_rOStm.GetNumberFormatInt();
mnStreamOfs = m_rOStm.Tell();
// we will use the BIG Endian Mode
@@ -270,7 +270,7 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage )
{
sal_uInt32 nCurrentPos = m_rOStm.Tell();
m_rOStm.Seek( mnLatestIfdPos );
- m_rOStm << (sl_uInt32)( nCurrentPos - mnStreamOfs ); // offset to the IFD
+ m_rOStm << (sal_uInt32)( nCurrentPos - mnStreamOfs ); // offset to the IFD
m_rOStm.Seek( nCurrentPos );
// (OFS8) TIFF image file directory (IFD)
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 249d392..3185a56 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -69,7 +69,7 @@ public:
XPMWriter::XPMWriter(SvStream& rOStm)
: m_rOStm(rOStm)
- , mbStatus(TRUE)
+ , mbStatus(sal_True)
, mbTrans(sal_False)
, mpAcc(NULL)
{
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 1a99abb..2dbbdf6 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -80,7 +80,7 @@ RASReader::RASReader(SvStream &rRAS)
, mbStatus(sal_True)
, mpAcc(NULL)
, mnRepCount(0)
- , mbPalette(FALSE)
+ , mbPalette(sal_False)
{
}
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 119bd90..9c41a7e 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -311,7 +311,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
nBitsPerSample = ReadIntData();
OOODEBUG("BitsPerSample",nBitsPerSample);
if ( nBitsPerSample >= 32 ) // 32 bit and larger samples are not supported
- bStatus = FALSE;
+ bStatus = sal_False;
break;
case 0x0103: // Compression
@@ -493,9 +493,9 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
}
case 0x0153: { // SampleFormat
- ULONG nSampleFormat = ReadIntData();
+ sal_uLong nSampleFormat = ReadIntData();
if ( nSampleFormat == 3 ) // IEEE floating point samples are not supported yet
- bStatus = FALSE;
+ bStatus = sal_False;
break;
}
}
@@ -760,7 +760,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
sal_uInt8 nLRed = 0;
sal_uInt8 nLGreen = 0;
sal_uInt8 nLBlue = 0;
- BYTE nLAlpha = 0;
+ sal_uInt8 nLAlpha = 0;
for ( nx = 0; nx < nImageWidth; nx++, pt += nSamplesPerPixel )
{
nLRed = nLRed + pt[ 0 ];
@@ -781,7 +781,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
pAcc->SetPixel( nY, nx, Color( pt[0], pt[1], pt[2] ) );
if (nSamplesPerPixel >= 4 && pMaskAcc)
{
- BYTE nAlpha = pt[3];
+ sal_uInt8 nAlpha = pt[3];
pMaskAcc->SetPixel( nY, nx, ~nAlpha );
}
}
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index e10a1bf..a311e04 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -228,17 +228,17 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( aShapeName.Len() > 0 )
aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName );
if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo():NULL )
- {
- const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
- if ( pMemStrm.get() )
- {
- pMemStrm->ObjectOwnsMemory( FALSE );
- sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData();
- sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
- aPropOpt.AddOpt( ESCHER_Prop_pihlShape, sal_False, nSize, pBuf, nSize );;
- }
- if ( pInteraction->hasInteraction() )
- aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
+ {
+ const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
+ if ( pMemStrm.get() )
+ {
+ pMemStrm->ObjectOwnsMemory( sal_False );
+ sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData();
+ sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
+ aPropOpt.AddOpt( ESCHER_Prop_pihlShape, sal_False, nSize, pBuf, nSize );;
+ }
+ if ( pInteraction->hasInteraction() )
+ aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
}
if ( rObj.GetType().EqualsAscii( "drawing.Custom" ) )
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 4b27950..37bc819 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -62,11 +62,11 @@ public:
~ImplEESdrObject();
sal_Bool ImplGetPropertyValue( const sal_Unicode* pString );
- BOOL ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); }
+ sal_Bool ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); }
sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 )
{ return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; }
- INT32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, UINT32 nDef = 0 )
+ sal_Int32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, sal_uInt32 nDef = 0 )
{ return ImplGetInt32PropertyValue(rStr.getStr(), nDef); }
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; }
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 53b85e0..cbc06ff 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -54,8 +54,8 @@ SLOFILES= \
$(SLO)$/services.obj \
$(SLO)$/svdfppt.obj \
$(SLO)$/svxmsbas.obj \
- $(SLO)$/svxmsbas2.obj
- $(SLO)$/mstoolbar.obj\
+ $(SLO)$/svxmsbas2.obj \
+ $(SLO)$/mstoolbar.obj
SHL1TARGET= msfilter$(DLLPOSTFIX)
SHL1IMPLIB= i$(TARGET)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 771b5f9..35ea8a4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3576,7 +3576,7 @@ sal_Bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, s
bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) const
{
- bool bRet = FALSE;
+ bool bRet = sal_False;
sal_uLong nFPosMerk = rSt.Tell(); // FilePos merken fuer ggf. spaetere Restauration
DffRecordHeader aHd;
do
@@ -3606,7 +3606,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa
bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) const
{
- bool bRet = FALSE;
+ bool bRet = sal_False;
sal_uLong nFPosMerk = rStCtrl.Tell(); // FilePos merken fuer ggf. spaetere Restauration
DffRecordHeader aHd;
do
@@ -3894,7 +3894,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte
bool SvxMSDffManager::ReadDffString(SvStream& rSt, String& rTxt) const
{
- bool bRet=FALSE;
+ bool bRet=sal_False;
DffRecordHeader aStrHd;
if( !ReadCommonRecordHeader(aStrHd, rSt) )
rSt.Seek( aStrHd.nFilePos );
@@ -3985,7 +3985,7 @@ void SvxMSDffManager::ReadObjText( const String& rText, SdrObject* pObj ) const
bool SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
{
- bool bRet=FALSE;
+ bool bRet=sal_False;
SdrTextObj* pText = PTR_CAST(SdrTextObj, pObj);
if( pText )
{
@@ -5486,14 +5486,14 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
case 0x0390:
if (pImpRec->pXRelTo)
delete pImpRec->pXRelTo;
- pImpRec->pXRelTo = new UINT32;
+ pImpRec->pXRelTo = new sal_uInt32;
*(pImpRec->pXRelTo) = nUDData;
break;
case 0x0391: pImpRec->nYAlign = nUDData; break;
case 0x0392:
if (pImpRec->pYRelTo)
delete pImpRec->pYRelTo;
- pImpRec->pYRelTo = new UINT32;
+ pImpRec->pYRelTo = new sal_uInt32;
*(pImpRec->pYRelTo) = nUDData;
break;
case 0x03BF: pImpRec->nLayoutInTableCell = nUDData; break;
@@ -7883,12 +7883,12 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
{
if (rCopy.pXRelTo)
{
- pXRelTo = new UINT32;
+ pXRelTo = new sal_uInt32;
*pXRelTo = *(rCopy.pXRelTo);
}
if (rCopy.pYRelTo)
{
- pYRelTo = new UINT32;
+ pYRelTo = new sal_uInt32;
*pYRelTo = *(rCopy.pYRelTo);
}
eLineStyle = rCopy.eLineStyle; // GPF-Bug #66227#
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 7e7a190..30a83d1 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -1166,7 +1166,7 @@ class ContainerRecReader
{
// Skip ActiveX Controls we can't import
SotStorageStreamRef oStream = pContainerControl->getContainedControlsStream();
- ULONG nStrmPos = oStream->Tell();
+ sal_uLong nStrmPos = oStream->Tell();
oStream->Seek( nStrmPos + rec.nSubStreamLen );
}
else
@@ -6061,11 +6061,11 @@ sal_Bool OCX_ProgressBar::Import(uno::Reference< beans::XPropertySet > &rPropSet
}
// ============================================================================
-OCX_ParentControl::OCX_ParentControl( SotStorageRef& parent, const OUString& storageName, const OUString& sN, const ::uno::Reference< container::XNameContainer > &rParent, OCX_Control* pParent ) : OCX_Control(sN, pParent), mxParent(rParent), nNextAvailableID(0), nBooleanProperties(0), nGroupCnt(0), nZoom(0), fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1), nHorzPos(7), nBorderColor(0x80000012), nShapeCookie(0), nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nMousePointer(0), nSpecialEffect(0), nPicture(0), nPictureAlignment(2), nPictureSizeMode(0), bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0), nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
+OCX_ParentControl::OCX_ParentControl( SotStorageRef& parent, const OUString& storageName, const OUString& sN, const ::uno::Reference< container::XNameContainer > &rParent, OCX_Control* pParent ) : OCX_Control(sN, pParent), mxParent(rParent), nNextAvailableID(0), nBooleanProperties(0), nGroupCnt(0), nZoom(0), fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1), nHorzPos(7), nBorderColor(0x80000012), nShapeCookie(0), nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nMousePointer(0), nSpecialEffect(0), nPicture(0), nPictureAlignment(2), nPictureSizeMode(0), bPictureTiling(sal_False), nAccelerator(0), nIcon(0), pCaption(0), nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
{
mnForeColor = 0x80000012;
mnBackColor = 0x8000000F;
- aFontData.SetHasAlign(TRUE);
+ aFontData.SetHasAlign(sal_True);
mContainerStorage = parent->OpenSotStorage(storageName,
STREAM_READWRITE |
STREAM_NOCREATE |
@@ -6227,7 +6227,7 @@ void OCX_ParentControl::ProcessControl(OCX_Control* pControl,SvStorageStream* /*
// #117490# DR: container records provide size of substream, use it here...
// remember initial position to set correct stream position
- ULONG nStrmPos = oStream->Tell();
+ sal_uLong nStrmPos = oStream->Tell();
// import control, may return with invalid stream position
pControl->FullRead(oStream);
// set stream to position behind substream of this control
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 2e4b4cd..fe13e5c 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -519,9 +519,9 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
if ( extraInfo.getOnAction().getLength() )
{
aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
- ooo::vba::VBAMacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
- if ( aMacroInf.IsResolved() )
- aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
+ ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
+ if ( aMacroInf.mbFound )
+ aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro );
else
aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) );
sControlData.push_back( aProp );
@@ -757,7 +757,7 @@ bool TBCBitMap::Read( SvStream* pS)
nOffSet = pS->Tell();
*pS >> cbDIB;
// cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
- return mBitMap.Read( *pS, FALSE, TRUE );
+ return mBitMap.Read( *pS, sal_False, sal_True );
}
void TBCBitMap::Print( FILE* fp )
diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index abdbc70..5423045 100644
--- a/filter/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -100,7 +100,7 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
{
msProjectName = rtl::OUString();
int nRet = 0;
- if( bImport && ImportCode_Impl( rStorageName, rSubStorageName, codeNames,
+ if( bImport && ImportCode_Impl( rStorageName, rSubStorageName, codeNames,
bAsComment, bStripped ))
nRet |= 1;
@@ -114,20 +114,20 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
}
bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
- const String& rSubStorageName, BOOL bVBAMode )
+ const String& rSubStorageName, sal_Bool bVBAMode )
{
bool bRet = false;
// #FIXME VBA_Impl ( or some other new class ) should handle both userforms
// and code
- VBA_Impl aVBA( *xRoot, TRUE );
+ VBA_Impl aVBA( *xRoot, sal_True );
// This call is a waste we read the source ( again ) only to get the refereneces
// *AGAIN*, we really need to rewrite all of this
aVBA.Open( rStorageName, rSubStorageName );
bRet = ImportForms_Impl( aVBA, rStorageName, rSubStorageName, bVBAMode );
- std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
+ std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
- for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
+ for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
{
rtl::OUString sFileName = *it;
#ifndef WIN
@@ -139,7 +139,7 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
#endif
#endif
SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
- VBA_Impl refVBA( *rRoot, TRUE );
+ VBA_Impl refVBA( *rRoot, sal_True );
refVBA.Open( rStorageName, rSubStorageName );
// The return from ImportForms doesn't indicate and error ( it could )
// but also it just means no userforms were imported
@@ -149,7 +149,7 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
return bRet;
}
-bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL /*bVBAMode*/ )
+bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, sal_Bool /*bVBAMode*/ )
{
SvStorageRef xVBAStg(rVBA.GetStorage()->OpenSotStorage(rStorageName,
STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
@@ -312,25 +312,25 @@ sal_Bool SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
rDocSh.GetBasicManager()->SetName( msProjectName ); // set name of Project
bRet = ImportCode_Impl( aVBA, codeNames, bAsComment, bStripped );
- std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
+ std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
- for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
+ for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
{
rtl::OUString sFileName = *it;
- OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
- VBA_Impl refVBA( *rRoot, bAsComment );
- std::vector< String > codeNamesNone;
- if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, codeNamesNone, bAsComment, bStripped ) )
- bRet = TRUE; // mark that some code was imported
+ VBA_Impl refVBA( *rRoot, bAsComment );
+ std::vector< String > codeNamesNone;
+ if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, codeNamesNone, bAsComment, bStripped ) )
+ bRet = sal_True; // mark that some code was imported
}
}
return bRet;
}
-BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< String >& codeNames, BOOL bAsComment, BOOL bStripped )
+sal_Bool SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< String >& codeNames, sal_Bool bAsComment, sal_Bool bStripped )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index b072e2e..89529fa 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -237,14 +237,6 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference
_COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT
-// extern "C" component_writeInfo()
-
-_COMPHELPER_COMPONENT_WRITEINFO
-(
- _COMPHELPER_COMPONENTINFO( OdfFlatXml,
- OdfFlatXml::impl_getImplementationName(),
- OdfFlatXml::impl_getSupportedServiceNames())
-)
// extern "C" component_getFactory()
_COMPHELPER_COMPONENT_GETFACTORY
(
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index a18e952..e97171e 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -439,14 +439,13 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
}
// getting the string for the producer
String aProducer;
- ::utl::ConfigManager* pMgr = ::utl::ConfigManager::GetConfigManager();
- if ( pMgr )
{
- Any aProductName = pMgr->GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
+ ::utl::ConfigManager& cMgr = ::utl::ConfigManager::GetConfigManager();
+ Any aProductName = cMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
::rtl::OUString sProductName;
aProductName >>= sProductName;
aProducer = sProductName;
- aProductName = pMgr->GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION );
+ aProductName = cMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION );
aProductName >>= sProductName;
aProducer.AppendAscii(" ");
aProducer += String( sProductName );
diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 2df67b0..6b30190 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -92,6 +92,13 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
+# Generate gperf files - from oox/source/token
+$(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
+ $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf
+
+$(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
+ $(GPERF) --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx
+
ALLTAR : $(MISC)/svgfilter.component
$(MISC)/svgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a6ade6e..7fc7e1e 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -526,7 +526,7 @@ sal_Bool SVGFilter::implExportPages( const Reference< XDrawPages >& rxPages,
}
}
- SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", TRUE, TRUE );
+ SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True );
const Point aNullPt;
if( bMaster )
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 6b19998..77f4271 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -207,9 +207,9 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
// -----------------------------------------------------------------------------
class FilterConfigItem;
-extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
try
{
bRet = importSvg( rStream, rGraphic );
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b502906..02cf95e 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -2314,8 +2314,8 @@ struct ShapeRenderingVisitor
SvMemoryStream aSrc(aData.getArray(),
aData.getLength(),
STREAM_READ);
- USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
- USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
+ sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
+ sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat );
if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
@@ -2323,17 +2323,17 @@ struct ShapeRenderingVisitor
//Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format
//unzip them and try again
- BYTE sFirstBytes[ 2 ];
+ sal_uInt8 sFirstBytes[ 2 ];
aSrc.Seek( STREAM_SEEK_TO_END );
- ULONG nStreamLen = aSrc.Tell();
+ sal_uLong nStreamLen = aSrc.Tell();
aSrc.Seek( 0 );
if ( !nStreamLen )
{
SvLockBytes* pLockBytes = aSrc.GetLockBytes();
if ( pLockBytes )
- pLockBytes->SetSynchronMode( TRUE );
+ pLockBytes->SetSynchronMode( sal_True );
aSrc.Seek( STREAM_SEEK_TO_END );
nStreamLen = aSrc.Tell();
@@ -2355,7 +2355,7 @@ struct ShapeRenderingVisitor
if (aZCodec.EndCompression() && pDest )
{
pDest->Seek( STREAM_SEEK_TO_END );
- ULONG nStreamLen_ = pDest->Tell();
+ sal_uLong nStreamLen_ = pDest->Tell();
if (nStreamLen_)
{
pDest->Seek(0L);
@@ -2571,13 +2571,13 @@ struct ShapeRenderingVisitor
{
::Gradient aTransparencyGradient=aGradient;
- const BYTE cTransStart( 255-
+ const sal_uInt8 cTransStart( 255-
basegfx::fround(mrGradientStopVector[
aState.maFillGradient.maStops[1]].maStopColor.a*
aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
const Color aTransStart( cTransStart, cTransStart, cTransStart );
- const BYTE cTransEnd( 255-
+ const sal_uInt8 cTransEnd( 255-
basegfx::fround(mrGradientStopVector[
aState.maFillGradient.maStops[0]].maStopColor.a*
aState.mnFillOpacity*maCurrState.mnOpacity*255.0));
@@ -2590,7 +2590,7 @@ struct ShapeRenderingVisitor
VirtualDevice aVDev;
GDIMetaFile aMtf;
- aVDev.EnableOutput( FALSE );
+ aVDev.EnableOutput( sal_False );
aVDev.SetMapMode( mrOutDev.GetMapMode() );
aMtf.Record( &aVDev );
@@ -2751,7 +2751,7 @@ bool importSvg(SvStream & rStream, Graphic & rGraphic )
VirtualDevice aVDev;
GDIMetaFile aMtf;
- aVDev.EnableOutput( FALSE );
+ aVDev.EnableOutput( sal_False );
aMtf.Record( &aVDev );
aVDev.SetTextAlign(ALIGN_BASELINE);
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 05550c1..052a930 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -680,14 +680,14 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
{
if( rPolyPoly.Count() )
{
- SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
FastString aPatternId;
aPatternId += B2UCONST( "pattern" );
aPatternId += GetValueString( ImplGetNextPatternId() );
{
- SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, TRUE, TRUE );
+ SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aPatternId.GetString() );
@@ -700,7 +700,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
{
- SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, TRUE, TRUE );
+ SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True );
// The origin of a pattern is positioned at (aRect.Left(), aRect.Top()).
// So we need to adjust the pattern coordinate.
@@ -714,7 +714,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform.GetString() );
{
- SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
GDIMetaFile aTmpMtf;
if( pHatch )
@@ -876,7 +876,7 @@ void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle.GetString() );
{
- SvXMLElementExport aElemStartStop( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, TRUE, TRUE );
+ SvXMLElementExport aElemStartStop( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True );
}
}
@@ -939,11 +939,11 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
aMaskId += GetValueString( ImplGetNextMaskId() );
{
- SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, TRUE, TRUE );
+ SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aMaskId.GetString() );
{
- SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, TRUE, TRUE );
+ SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, sal_True, sal_True );
const PolyPolygon aPolyPolygon( PolyPolygon( Rectangle( rDestPt, rDestSize ) ) );
Gradient aGradient( rGradient );
@@ -967,7 +967,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aMaskStyle.GetString() );
{
- SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
mpVDev->Push();
ImplWriteActions( rMtf, pStyle, nWriteFlags );
@@ -1292,7 +1292,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, aBuffer.makeStringAndClear() );
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, sal_True, sal_True );
}
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 26470af..bb2c1bb 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -191,7 +191,7 @@ private:
void ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
void ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
void ImplWriteGradientStop( const Color& rColor, double fOffset );
- Color ImplGetColorWithIntensity( const Color& rColor, USHORT nIntensity );
+ Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, const ::rtl::OUString* pStyle, sal_uInt32 nWriteFlags );
void ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, const ::rtl::OUString* pStyle = NULL );
More information about the Libreoffice-commits
mailing list