You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/10/05 01:16:58 UTC
svn commit: r1394326 [14/15] - in /incubator/ooo/branches/buildsys/main: ./
basebmp/inc/basebmp/ basebmp/prj/ basebmp/test/ basegfx/inc/basegfx/color/
basegfx/inc/basegfx/curve/ basegfx/inc/basegfx/matrix/
basegfx/inc/basegfx/numeric/ basegfx/inc/baseg...
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8DocumentImpl.cxx Thu Oct 4 23:16:35 2012
@@ -192,7 +192,8 @@ mbInSection(false), mbInParagraphGroup(f
("Data"));
}
catch (ExceptionNotFound e)
- {
+ {
+ (void) e;
}
try
@@ -202,6 +203,7 @@ mbInSection(false), mbInParagraphGroup(f
}
catch (ExceptionNotFound e)
{
+ (void) e;
}
mpCHPFKPCache =
@@ -293,8 +295,6 @@ mbInSection(false), mbInParagraphGroup(f
mpFib->get_fcPlcfbtePapx(),
mpFib->get_lcbPlcfbtePapx()));
- //clog << "BinTable(PAP):" << mpBinTablePAPX->toString();
-
parseBinTableCpAndFcs(*mpBinTablePAPX, PROP_PAP);
mpBinTableCHPX =
@@ -303,8 +303,6 @@ mbInSection(false), mbInParagraphGroup(f
mpFib->get_fcPlcfbteChpx(),
mpFib->get_lcbPlcfbteChpx()));
- //clog << "BinTable(CHP):" << mpBinTableCHPX->toString();
-
parseBinTableCpAndFcs(*mpBinTableCHPX, PROP_CHP);
mpSEDs = PLCF<WW8SED>::Pointer_t(new PLCF<WW8SED>
@@ -312,8 +310,6 @@ mbInSection(false), mbInParagraphGroup(f
mpFib->get_fcPlcfsed(),
mpFib->get_lcbPlcfsed()));
- //mpSEDs->dump(clog);
-
{
PLCFHelper<WW8SED>::processPLCFCpAndFcs
(*this, mpPieceTable, mpSEDs, PROP_SEC, 0);
@@ -585,7 +581,6 @@ string WW8DocumentImpl::getType() const
void WW8DocumentImpl::parseBinTableCpAndFcs(WW8BinTable & rTable,
PropertyType eType_)
{
- //clog << "<bintable type=\"" << propertyTypeToString(eType_) << "\">" << endl;
for (sal_uInt32 i = 0; i < rTable.getEntryCount(); i++)
{
#if 0
@@ -602,8 +597,6 @@ void WW8DocumentImpl::parseBinTableCpAnd
bool bComplex = mpPieceTable->isComplex(aFcFromTable);
aFcFromTable.setComplex(bComplex);
- //clog << "<entry fc=\"" << aFcFromTable.toString() << "\">" << endl;
-
try
{
Cp aCpFromTable(mpPieceTable->fc2cp(aFcFromTable));
@@ -640,8 +633,6 @@ void WW8DocumentImpl::parseBinTableCpAnd
bool bComplexFKP = mpPieceTable->isComplex(aFc);
aFc.setComplex(bComplexFKP);
- //clog << "<fkpentry fc=\"" << aFc.toString() << "\"/>" << endl;
-
try
{
Cp aCp = mpPieceTable->fc2cp(aFc);
@@ -649,24 +640,18 @@ void WW8DocumentImpl::parseBinTableCpAnd
CpAndFc aCpAndFc(aCp, aFc, eType_);
mCpAndFcs.insert(aCpAndFc);
-
- //clog << aCpAndFc << endl;
}
catch (ExceptionNotFound e)
{
- clog << e.getText() << endl;
+ (void) e;
}
}
}
catch (ExceptionNotFound e)
{
- clog << e.getText() << endl;
+ (void) e;
}
-
- //clog << "</entry>" << endl;
}
-
- //clog << "</bintable>" << endl;
}
WW8Stream::Pointer_t WW8DocumentImpl::getSubStream
@@ -871,6 +856,7 @@ writerfilter::Reference<Properties>::Poi
}
catch (ExceptionOutOfBounds e)
{
+ (void) e;
}
}
@@ -1009,7 +995,9 @@ writerfilter::Reference<Table>::Pointer_
pResult = writerfilter::Reference<Table>::Pointer_t(pList);
}
- catch (ExceptionOutOfBounds aException) {
+ catch (ExceptionOutOfBounds aException)
+ {
+ (void) aException;
}
}
@@ -1035,7 +1023,7 @@ writerfilter::Reference<Table>::Pointer_
}
catch (Exception e)
{
- clog << e.getText() << endl;
+ (void) e;
}
}
@@ -1655,16 +1643,6 @@ void WW8DocumentImpl::resolve(Stream & r
{
if (! bSubDocument)
{
-
- //mpPieceTable->dump(clog);
-
- //copy(mCpAndFcs.begin(), mCpAndFcs.end(), ostream_iterator<CpAndFc>(clog, ", "));
-
- //mpDocStream->dump(output);
-
- //output.addItem(mTextboxHeaderEndCpAndFc.toString());
-
-#if 1
output.addItem("<substream-names>");
output.addItem(mpStream->getSubStreamNames());
output.addItem("</substream-names>");
@@ -1678,7 +1656,6 @@ void WW8DocumentImpl::resolve(Stream & r
{
mpSummaryInformationStream->dump(output);
}
-#endif
writerfilter::Reference<Properties>::Pointer_t pFib
(new WW8Fib(*mpFib));
@@ -1691,30 +1668,16 @@ void WW8DocumentImpl::resolve(Stream & r
rStream.props(pFibRgFcLcb2000);
}
-#if 0
- if (mpTextBoxStories.get() != NULL)
- {
- output.addItem("<textbox.boxes>");
- mpTextBoxStories->dump(output);
- output.addItem("</textbox.boxes>");
- }
-#endif
if (mpFib->get_lcbPlcftxbxBkd() > 0)
{
PLCF<WW8BKD> aPLCF(*mpTableStream,
mpFib->get_fcPlcftxbxBkd(),
mpFib->get_lcbPlcftxbxBkd());
-#if 0
- output.addItem("<textbox.breaks>");
- aPLCF.dump(output);
- output.addItem("</textbox.breaks>");
-#endif
}
if (mpDffBlock.get() != NULL)
{
DffBlock * pTmp = new DffBlock(*mpDffBlock);
- //pTmp->dump(clog);
writerfilter::Reference<Properties>::Pointer_t pDffBlock =
writerfilter::Reference<Properties>::Pointer_t(pTmp);
@@ -1730,33 +1693,6 @@ void WW8DocumentImpl::resolve(Stream & r
}
rStream.info("/headers");
}
-
-#if 0
- {
- sal_uInt32 nFootnoteCount = getFootnoteCount();
- for (sal_uInt32 n = 0; n < nFootnoteCount; ++n)
- {
- //clog << "<footnote num=\"" << n << "\"/>" << endl;
-
- writerfilter::Reference<Stream>::Pointer_t pFootnote(getFootnote(n));
-
- if (pFootnote.get() != NULL)
- rStream.substream(NS_rtf::LN_footnote, pFootnote);
- }
- }
- {
- sal_uInt32 nEndnoteCount = getEndnoteCount();
- for (sal_uInt32 n = 0; n < nEndnoteCount; ++n)
- {
- //clog << "<endnote num=\"" << n << "\"/>" << endl;
-
- writerfilter::Reference<Stream>::Pointer_t pEndnote(getEndnote(n));
-
- if (pEndnote.get() != NULL)
- rStream.substream(NS_rtf::LN_endnote, pEndnote);
- }
- }
-#endif
writerfilter::Reference<Table>::Pointer_t pSttbRgtplc = getListTplcs();
@@ -1777,7 +1713,7 @@ void WW8DocumentImpl::resolve(Stream & r
}
catch (Exception e)
{
- clog << e.getText() << endl;
+ (void) e;
}
writerfilter::Reference<Table>::Pointer_t pAssocTable = getAssocTable();
@@ -2226,7 +2162,7 @@ BookmarkHelper::getBookmark(const CpAndF
}
catch (ExceptionNotFound e)
{
- clog << e.getText() << endl;
+ (void) e;
}
return pResult;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx Thu Oct 4 23:16:35 2012
@@ -164,8 +164,6 @@ void WW8PropertiesReference::resolve(Pro
{
if (mpPropSet != NULL)
{
- //mpPropSet->dump(clog);
-
if (mpPropSet->isPap())
{
WW8IntValue aValue(mpPropSet->get_istd());
@@ -188,6 +186,7 @@ void WW8PropertiesReference::resolve(Pro
}
catch (ExceptionOutOfBounds e)
{
+ (void) e;
}
}
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8StreamImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8StreamImpl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8StreamImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/WW8StreamImpl.cxx Thu Oct 4 23:16:35 2012
@@ -118,10 +118,9 @@ WW8Stream::Pointer_t WW8StreamImpl::getS
}
catch (...)
{
+ throw ExceptionNotFound("Stream not found");
}
- if (pResult.get() == NULL)
- throw ExceptionNotFound("Stream not found");
return pResult;
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/resourcesimpl.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/resourcesimpl.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/resourcesimpl.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/doctok/resourcesimpl.xsl Thu Oct 4 23:16:35 2012
@@ -477,7 +477,8 @@ using namespace ::std;
rHandler.entry(n, pEntry);
}
catch (ExceptionOutOfBounds e)
- {
+ {
+ (void) e;
}
}
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/filter/ImportFilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/filter/ImportFilter.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/filter/ImportFilter.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/filter/ImportFilter.cxx Thu Oct 4 23:16:35 2012
@@ -72,8 +72,9 @@ sal_Bool WriterFilter::filter( const uno
::oox::core::FilterDetect aDetector( m_xContext );
xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
+ (void) e;
}
if ( !xInputStream.is() )
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/filter/WriterFilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/filter/WriterFilter.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/filter/WriterFilter.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/filter/WriterFilter.cxx Thu Oct 4 23:16:35 2012
@@ -57,12 +57,14 @@ static struct ::cppu::ImplementationEntr
{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
};
-void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
{
return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries );
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx Thu Oct 4 23:16:35 2012
@@ -145,7 +145,7 @@ writerfilter::Reference<Stream>::Pointer
OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rType,
const rtl::OUString & rId)
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOCUMENT
debug_logger->startElement("getXNoteStream");
debug_logger->attribute("id", rId);
debug_logger->endElement("getXNoteStream");
@@ -305,7 +305,7 @@ void OOXMLDocumentImpl::resolveFooter(St
void OOXMLDocumentImpl::resolve(Stream & rStream)
{
-#ifdef DEBUG_RESOLVE
+#ifdef DEBUG_DOCUMENT
debug_logger->startElement("OOXMLDocumentImpl.resolve");
#endif
@@ -343,13 +343,13 @@ void OOXMLDocumentImpl::resolve(Stream &
xParser->parseStream(aParserInput);
}
catch (...) {
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_DOCUMENT
debug_logger->element("exception");
#endif
}
}
-#ifdef DEBUG_RESOLVE
+#ifdef DEBUG_DOCUMENT
debug_logger->endElement("OOXMLDocumentImpl.resolve");
#endif
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.cxx Thu Oct 4 23:16:35 2012
@@ -255,7 +255,7 @@ void OOXMLFactory::attributes(OOXMLFastC
uno::Reference< xml::sax::XFastContextHandler>
OOXMLFactory::createFastChildContext(OOXMLFastContextHandler * pHandler,
- Token_t Element)
+ sal_Int32 Element)
{
#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.createFastChildContext");
@@ -300,35 +300,35 @@ void OOXMLFactory::characters(OOXMLFastC
#endif
}
-void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/)
+void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*nToken*/)
{
Id nDefine = pHandler->getDefine();
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
if (pFactory.get() != NULL)
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.startAction");
#endif
pFactory->startAction(pHandler);
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
debug_logger->endElement("factory.startAction");
#endif
}
}
-void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/)
+void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, sal_Int32 /*nToken*/)
{
Id nDefine = pHandler->getDefine();
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
if (pFactory.get() != NULL)
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.endAction");
#endif
pFactory->endAction(pHandler);
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_FACTORY
debug_logger->endElement("factory.endAction");
#endif
}
@@ -346,7 +346,7 @@ void OOXMLFactory_ns::charactersAction(O
{
}
-void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLValue::Pointer_t)
+void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, sal_Int32, OOXMLValue::Pointer_t)
{
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFactory.hxx Thu Oct 4 23:16:35 2012
@@ -74,7 +74,7 @@ struct AttributeInfo
AttributeInfo();
};
-typedef hash_map<Token_t, AttributeInfo> AttributeToResourceMap;
+typedef hash_map<sal_Int32, AttributeInfo, TokenHash> AttributeToResourceMap;
typedef boost::shared_ptr<AttributeToResourceMap> AttributeToResourceMapPointer;
typedef hash_map<Id, AttributeToResourceMapPointer> AttributesMap;
@@ -91,13 +91,13 @@ struct CreateElement
CreateElement();
};
-typedef hash_map<Token_t, CreateElement> CreateElementMap;
+typedef hash_map<sal_Int32, CreateElement, TokenHash> CreateElementMap;
typedef boost::shared_ptr<CreateElementMap> CreateElementMapPointer;
typedef hash_map<Id, CreateElementMapPointer> CreateElementsMap;
typedef hash_map<Id, string> IdToStringMap;
typedef boost::shared_ptr<IdToStringMap> IdToStringMapPointer;
-typedef hash_map<Id, Token_t> TokenToIdMap;
+typedef hash_map<Id, sal_Int32> TokenToIdMap;
typedef boost::shared_ptr<TokenToIdMap> TokenToIdMapPointer;
typedef hash_map<Id, TokenToIdMapPointer> TokenToIdsMap;
@@ -108,7 +108,7 @@ public:
virtual void startAction(OOXMLFastContextHandler * pHandler);
virtual void charactersAction(OOXMLFastContextHandler * pHandler, const ::rtl::OUString & rString);
virtual void endAction(OOXMLFastContextHandler * pHandler);
- virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
+ virtual void attributeAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue);
virtual string getDefineName(Id nId) const;
#ifdef DEBUG_FACTORY
virtual string getName() const;
@@ -141,10 +141,10 @@ public:
static Pointer_t getInstance();
uno::Reference< xml::sax::XFastContextHandler> createFastChildContext
- (OOXMLFastContextHandler * pHandler, Token_t Element);
+ (OOXMLFastContextHandler * pHandler, sal_Int32 Element);
uno::Reference< xml::sax::XFastContextHandler> createFastChildContextFromStart
- (OOXMLFastContextHandler * pHandler, Token_t Element);
+ (OOXMLFastContextHandler * pHandler, sal_Int32 Element);
void attributes(OOXMLFastContextHandler * pHandler,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs);
@@ -152,8 +152,8 @@ public:
void characters(OOXMLFastContextHandler * pHandler,
const ::rtl::OUString & rString);
- void startAction(OOXMLFastContextHandler * pHandler, Token_t nToken);
- void endAction(OOXMLFastContextHandler * pHandler, Token_t nToken);
+ void startAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken);
+ void endAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken);
virtual ~OOXMLFactory();
@@ -166,7 +166,7 @@ private:
uno::Reference< xml::sax::XFastContextHandler>
createFastChildContextFromFactory(OOXMLFastContextHandler * pHandler,
OOXMLFactory_ns::Pointer_t pFactory,
- Token_t Element);
+ sal_Int32 Element);
};
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx Thu Oct 4 23:16:35 2012
@@ -181,7 +181,7 @@ OOXMLFastContextHandler::~OOXMLFastConte
// ::com::sun::star::xml::sax::XFastContextHandler:
void SAL_CALL OOXMLFastContextHandler::startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -216,7 +216,7 @@ throw (uno::RuntimeException, xml::sax::
#endif
}
-void SAL_CALL OOXMLFastContextHandler::endFastElement(Token_t Element)
+void SAL_CALL OOXMLFastContextHandler::endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
#ifdef DEBUG_CONTEXT_HANDLER
@@ -236,7 +236,7 @@ throw (uno::RuntimeException, xml::sax::
}
void OOXMLFastContextHandler::lcl_startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -244,7 +244,7 @@ void OOXMLFastContextHandler::lcl_startF
}
void OOXMLFastContextHandler::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
OOXMLFactory::getInstance()->endAction(this, Element);
@@ -262,7 +262,7 @@ throw (uno::RuntimeException, xml::sax::
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandler::createFastChildContext
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -284,7 +284,7 @@ uno::Reference< xml::sax::XFastContextHa
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandler::lcl_createFastChildContext
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -337,7 +337,7 @@ sal_Int64 SAL_CALL OOXMLFastContextHandl
{
if( rId.getLength() == 16
&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
+ rId.getConstArray(), 16 ) )
{
return sal::static_int_cast<sal_Int64>
(reinterpret_cast<sal_IntPtr>(this));
@@ -363,7 +363,7 @@ void OOXMLFastContextHandler::attributes
OOXMLFactory::getInstance()->attributes(this, Attribs);
}
-void OOXMLFastContextHandler::startAction(Token_t Element)
+void OOXMLFastContextHandler::startAction(sal_Int32 Element)
{
#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("contexthandler.startAction");
@@ -374,12 +374,12 @@ void OOXMLFastContextHandler::startActio
#endif
}
-void OOXMLFastContextHandler::lcl_startAction(Token_t Element)
+void OOXMLFastContextHandler::lcl_startAction(sal_Int32 Element)
{
OOXMLFactory::getInstance()->startAction(this, Element);
}
-void OOXMLFastContextHandler::endAction(Token_t Element)
+void OOXMLFastContextHandler::endAction(sal_Int32 Element)
{
#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("contexthandler.endAction");
@@ -390,7 +390,7 @@ void OOXMLFastContextHandler::endAction(
#endif
}
-void OOXMLFastContextHandler::lcl_endAction(Token_t Element)
+void OOXMLFastContextHandler::lcl_endAction(sal_Int32 Element)
{
OOXMLFactory::getInstance()->endAction(this, Element);
}
@@ -491,10 +491,6 @@ OOXMLParserState::Pointer_t OOXMLFastCon
void OOXMLFastContextHandler::setToken(Token_t nToken)
{
mnToken = nToken;
-
-#ifdef DEBUG_CONTEXT_HANDLER
- msTokenString = fastTokenToId(mnToken);
-#endif
}
Token_t OOXMLFastContextHandler::getToken() const
@@ -835,6 +831,7 @@ void OOXMLFastContextHandler::text(const
debug_logger->chars(sText);
debug_logger->endElement("contexthandler.text");
#endif
+
if (isForwardEvents())
mpStream->utext(reinterpret_cast < const sal_uInt8 * >
(sText.getStr()),
@@ -1238,13 +1235,6 @@ void OOXMLFastContextHandlerStream::hand
getPropertySetAttrs()->resolve(aHyperlinkHandler);
}
-void OOXMLFastContextHandlerStream::lcl_characters
-(const ::rtl::OUString & rChars)
-throw (uno::RuntimeException, xml::sax::SAXException)
-{
- text(rChars);
-}
-
/*
class OOXMLFastContextHandlerProperties
*/
@@ -1262,7 +1252,7 @@ OOXMLFastContextHandlerProperties::~OOXM
}
void OOXMLFastContextHandlerProperties::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1351,7 +1341,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleComment()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleComment");
#endif
@@ -1361,7 +1351,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handlePicture()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handlePicture");
#endif
@@ -1371,7 +1361,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleBreak()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleBreak");
#endif
@@ -1381,7 +1371,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::handleOLE()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("handleOLE");
#endif
@@ -1392,7 +1382,7 @@ void OOXMLFastContextHandlerProperties::
void OOXMLFastContextHandlerProperties::setParent
(OOXMLFastContextHandler * pParent)
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("setParent");
debug_logger->chars("OOXMLFastContextHandlerProperties");
debug_logger->endElement("setParent");
@@ -1432,7 +1422,7 @@ OOXMLFastContextHandlerPropertyTable::~O
}
void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
@@ -1488,7 +1478,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHa
}
void OOXMLFastContextHandlerValue::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
sendPropertyToParent();
@@ -1498,7 +1488,7 @@ throw (uno::RuntimeException, xml::sax::
void OOXMLFastContextHandlerValue::setDefaultBooleanValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultBooleanValue");
#endif
@@ -1511,7 +1501,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultIntegerValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultIntegerValue");
#endif
@@ -1524,7 +1514,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultHexValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultHexValue");
#endif
@@ -1537,7 +1527,7 @@ void OOXMLFastContextHandlerValue::setDe
void OOXMLFastContextHandlerValue::setDefaultStringValue()
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->element("setDefaultStringValue");
#endif
@@ -1563,7 +1553,7 @@ OOXMLFastContextHandlerTable::~OOXMLFast
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandlerTable::createFastChildContext
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1576,7 +1566,7 @@ OOXMLFastContextHandlerTable::createFast
}
void OOXMLFastContextHandlerTable::lcl_endFastElement
-(Token_t /*Element*/)
+(sal_Int32 /*Element*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
addCurrentChild();
@@ -1631,7 +1621,7 @@ OOXMLFastContextHandlerXNote::~OOXMLFast
}
void OOXMLFastContextHandlerXNote::lcl_startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1646,7 +1636,7 @@ void OOXMLFastContextHandlerXNote::lcl_s
}
void OOXMLFastContextHandlerXNote::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1656,7 +1646,7 @@ void OOXMLFastContextHandlerXNote::lcl_e
void OOXMLFastContextHandlerXNote::checkId(OOXMLValue::Pointer_t pValue)
{
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("checkId");
debug_logger->attribute("myId", pValue->getString());
debug_logger->attribute("id", getXNoteId());
@@ -1803,7 +1793,7 @@ OOXMLFastContextHandlerTextTable::~OOXML
}
void OOXMLFastContextHandlerTextTable::lcl_startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1824,7 +1814,7 @@ void OOXMLFastContextHandlerTextTable::l
}
void OOXMLFastContextHandlerTextTable::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
endAction(Element);
@@ -1862,7 +1852,7 @@ OOXMLFastContextHandlerShape::OOXMLFastC
mrShapeContext->setDrawPage(getDocument()->getDrawPage());
mrShapeContext->setInputStream(getDocument()->getStorageStream());
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("setRelationFragmentPath");
debug_logger->attribute("path", mpParserState->getTarget());
debug_logger->endElement("setRelationFragmentPath");
@@ -1870,7 +1860,7 @@ OOXMLFastContextHandlerShape::OOXMLFastC
mrShapeContext->setRelationFragmentPath
(mpParserState->getTarget());
}
-#ifdef DEBUG_CONTEXT_STACK
+#ifdef DEBUG_CONTEXT_HANDLER
else
{
debug_logger->startElement("error");
@@ -1886,7 +1876,7 @@ OOXMLFastContextHandlerShape::~OOXMLFast
}
void OOXMLFastContextHandlerShape::lcl_startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -1941,7 +1931,7 @@ void OOXMLFastContextHandlerShape::sendS
}
void OOXMLFastContextHandlerShape::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
if (mrShapeContext.is())
@@ -1969,7 +1959,7 @@ void SAL_CALL OOXMLFastContextHandlerSha
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerShape::lcl_createFastChildContext
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2120,7 +2110,7 @@ void OOXMLFastContextHandlerWrapper::add
}
void OOXMLFastContextHandlerWrapper::lcl_startFastElement
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2129,7 +2119,7 @@ void OOXMLFastContextHandlerWrapper::lcl
}
void OOXMLFastContextHandlerWrapper::lcl_endFastElement
-(Token_t Element)
+(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException)
{
if (mxContext.is())
@@ -2138,7 +2128,7 @@ void OOXMLFastContextHandlerWrapper::lcl
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
-(Token_t Element,
+(sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException)
{
@@ -2146,7 +2136,7 @@ OOXMLFastContextHandlerWrapper::lcl_crea
Id nNameSpace = Element & 0xffff0000;
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
debug_logger->startElement("Wrapper-createChildContext");
debug_logger->attribute("token", fastTokenToId(Element));
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx Thu Oct 4 23:16:35 2012
@@ -69,7 +69,7 @@ public:
// ::com::sun::star::xml::sax::XFastContextHandler:
virtual void SAL_CALL startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -79,7 +79,7 @@ public:
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void SAL_CALL endFastElement(Token_t Element)
+ virtual void SAL_CALL endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void SAL_CALL endUnknownElement
@@ -88,7 +88,7 @@ public:
virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -155,7 +155,7 @@ public:
uno::Reference < xml::sax::XFastContextHandler >
createFromStart
- (Token_t Element,
+ (sal_uInt32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs);
void setDocument(OOXMLDocument * pDocument);
@@ -232,10 +232,6 @@ protected:
Id mnDefine;
Token_t mnToken;
-#ifdef DEBUG_CONTEXT_HANDLER
- string msTokenString;
-#endif
-
// the stream to send the stream events to.
Stream * mpStream;
@@ -246,26 +242,26 @@ protected:
unsigned int mnTableDepth;
virtual void lcl_startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void lcl_characters(const ::rtl::OUString & aChars)
throw (uno::RuntimeException, xml::sax::SAXException);
- void startAction(Token_t Element);
- virtual void lcl_startAction(Token_t Element);
- void endAction(Token_t Element);
- virtual void lcl_endAction(Token_t Element);
+ void startAction(sal_Int32 Element);
+ virtual void lcl_startAction(sal_Int32 Element);
+ void endAction(sal_Int32 Element);
+ virtual void lcl_endAction(sal_Int32 Element);
// Returns string for resource of this context. (debug)
@@ -306,8 +302,6 @@ public:
protected:
virtual void resolvePropertySetAttrs();
- virtual void lcl_characters(const ::rtl::OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException);
private:
mutable OOXMLPropertySet::Pointer_t mpPropertySetAttrs;
@@ -342,7 +336,7 @@ protected:
/// the properties
OOXMLPropertySet::Pointer_t mpPropertySet;
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual void setParent(OOXMLFastContextHandler * pParent);
@@ -361,7 +355,7 @@ public:
protected:
OOXMLTableImpl mTable;
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
};
@@ -376,7 +370,7 @@ public:
virtual void setValue(OOXMLValue::Pointer_t pValue);
virtual OOXMLValue::Pointer_t getValue() const;
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual string getType() const { return "Value"; }
@@ -398,7 +392,7 @@ public:
virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -408,7 +402,7 @@ protected:
RefAndPointer_t mCurrentChild;
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual ResourceEnum_t getResource() const { return TABLE; }
@@ -433,11 +427,11 @@ private:
::rtl::OUString msMyXNoteId;
virtual void lcl_startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual ResourceEnum_t getResource() const { return STREAM; }
@@ -481,11 +475,11 @@ public:
protected:
virtual void lcl_startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
};
@@ -532,16 +526,16 @@ protected:
ShapeContextRef mrShapeContext;
virtual void lcl_startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
@@ -601,16 +595,16 @@ public:
protected:
virtual void lcl_startFastElement
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
- virtual void lcl_endFastElement(Token_t Element)
+ virtual void lcl_endFastElement(sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException);
virtual uno::Reference< xml::sax::XFastContextHandler >
lcl_createFastChildContext
- (Token_t Element,
+ (sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException);
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx Thu Oct 4 23:16:35 2012
@@ -23,8 +23,10 @@
#include <iostream>
#include <boost/shared_ptr.hpp>
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_CONTEXT_HANDLER
#include "ooxmlLoggers.hxx"
+#endif
+#ifdef DEBUG_PROTOCOL
#include <resourcemodel/Protocol.hxx>
#endif
#include "OOXMLFastDocumentHandler.hxx"
@@ -46,75 +48,27 @@ OOXMLFastDocumentHandler::OOXMLFastDocum
// ::com::sun::star::xml::sax::XFastContextHandler:
void SAL_CALL OOXMLFastDocumentHandler::startFastElement
-(::sal_Int32
-#ifdef DEBUG_CONTEXT_STACK
-Element
-#endif
-, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
+(::sal_Int32 /*Element*/, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":start element:"
- << fastTokenToId(Element)
- << endl;
-#endif
}
void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement
-(const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Namespace
-#endif
-, const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Name
-#endif
-,
+(const ::rtl::OUString & /*Namespace*/, const ::rtl::OUString & /*Name*/,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":start unknown element:"
- << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
- << ":"
- << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
- << endl;
-#endif
}
-void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
-#ifdef DEBUG_CONTEXT_STACK
-Element
-#endif
-)
+void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32 /*Element*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":end element:"
- << fastTokenToId(Element)
- << endl;
-#endif
}
void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement
-(const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Namespace
-#endif
-, const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Name
-#endif
-)
+(const ::rtl::OUString & /*Namespace*/, const ::rtl::OUString & /*Name*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":end unknown element:"
- << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
- << ":"
- << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
- << endl;
-#endif
}
OOXMLFastContextHandler::Pointer_t
@@ -139,37 +93,16 @@ uno::Reference< xml::sax::XFastContextHa
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":createFastChildContext:"
- << fastTokenToId(Element)
- << endl;
-#endif
-
return OOXMLFactory::getInstance()->createFastChildContextFromStart(getContextHandler().get(), Element);
}
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastDocumentHandler::createUnknownChildContext
-(const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Namespace
-#endif
-,
- const ::rtl::OUString &
-#ifdef DEBUG_CONTEXT_STACK
-Name
-#endif
-, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
+(const ::rtl::OUString & /*Namespace*/,
+ const ::rtl::OUString & /*Name*/,
+ const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
throw (uno::RuntimeException, xml::sax::SAXException)
{
-#ifdef DEBUG_CONTEXT_STACK
- clog << this << ":createUnknownChildContext:"
- << OUStringToOString(Namespace, RTL_TEXTENCODING_ASCII_US).getStr()
- << ":"
- << OUStringToOString(Name, RTL_TEXTENCODING_ASCII_US).getStr()
- << endl;
-#endif
-
return uno::Reference< xml::sax::XFastContextHandler >
(new OOXMLFastDocumentHandler(m_xContext));
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx Thu Oct 4 23:16:35 2012
@@ -100,7 +100,7 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
Stream * mpStream;
-#ifdef DEBUG_ELEMENT
+#ifdef DEBUG_PROTOCOL
Stream::Pointer_t mpTmpStream;
#endif
OOXMLDocument * mpDocument;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx Thu Oct 4 23:16:35 2012
@@ -27,6 +27,10 @@
#include "OOXMLFastTokenHandler.hxx"
#include "gperffasttoken.hxx"
+#ifdef DEBUG_TOKEN
+#include "ooxmlLoggers.hxx"
+#endif
+
namespace writerfilter {
namespace ooxml
{
@@ -53,10 +57,10 @@ OOXMLFastTokenHandler::OOXMLFastTokenHan
nResult = pToken->nToken;
#ifdef DEBUG_TOKEN
- clog << "getToken: "
- << OUStringToOString(Identifier, RTL_TEXTENCODING_ASCII_US).getStr()
- << ", " << nResult
- << endl;
+ debug_logger->startElement(__FUNCTION__);
+ debug_logger->attribute("identifier", Identifier);
+ debug_logger->attribute("result", nResult);
+ debug_logger->endElement(__FUNCTION__);
#endif
return nResult;
@@ -114,11 +118,13 @@ css::uno::Sequence< ::sal_Int8 > SAL_CAL
nResult = pToken->nToken;
#ifdef DEBUG_TOKEN
- clog << "getTokenFromUTF8: "
- << string(reinterpret_cast<const char *>
- (Identifier.getConstArray()), Identifier.getLength())
- << ", " << nResult
- << (pToken == NULL ? ", failed" : "") << endl;
+ debug_logger->startElement(__FUNCTION__);
+ debug_logger->attribute
+ ("utf8", string(reinterpret_cast<const char *>
+ (Identifier.getConstArray()),
+ Identifier.getLength()));
+ debug_logger->attribute("result", nResult);
+ debug_logger->endElement(__FUNCTION__);
#endif
return nResult;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/OOXMLStreamImpl.cxx Thu Oct 4 23:16:35 2012
@@ -90,6 +90,42 @@ const ::rtl::OUString & OOXMLStreamImpl:
return msTarget;
}
+::rtl::OUString lcl_normalizeTarget(const ::rtl::OUString & s)
+{
+ const int nStringsToCut = 2;
+ const ::rtl::OUString aStringToCut[] = {
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("./")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
+ };
+
+ bool bDone = false;
+ sal_Int32 nIndex = 0;
+ while (!bDone)
+ {
+ for (int n = 0; n <= nStringsToCut; n++)
+ {
+ if (n == nStringsToCut)
+ {
+ bDone = true;
+ }
+ else
+ {
+ sal_Int32 nNewIndex = s.indexOf(aStringToCut[n], nIndex);
+
+ if (nIndex == nNewIndex)
+ {
+ sal_Int32 nLength = aStringToCut[n].getLength();
+ nIndex += nLength;
+
+ break;
+ }
+ }
+ }
+ }
+
+ return s.copy(nIndex);
+}
+
bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
xRelationshipAccess,
StreamType_t nStreamType,
@@ -184,7 +220,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno:
else
{
rDocumentTarget = msPath;
- rDocumentTarget += sMyTarget;
+ rDocumentTarget += lcl_normalizeTarget(sMyTarget);
}
break;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/RefAndPointer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/RefAndPointer.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/RefAndPointer.hxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/RefAndPointer.hxx Thu Oct 4 23:16:35 2012
@@ -43,44 +43,21 @@ public:
RefAndPointer()
: mpHandler(NULL)
{
-#ifdef DEBUG_MEMORY
- clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
- << endl;
-#endif
}
RefAndPointer(ChildClass * pHandler)
: mpHandler(pHandler), mRef(pHandler)
{
-#ifdef DEBUG_MEMORY
- clog << "MEMORY:" << mpHandler->getInstanceNumber() << ":RefAndPointer"
- << endl;
-#endif
}
RefAndPointer(uno::Reference<Interface> xRef)
: mRef(xRef)
{
-#if 0
- uno::Reference<lang::XUnoTunnel> xTunnel( xRef, uno::UNO_QUERY);
-
- if (xTunnel.is())
- mpHandler = reinterpret_cast<ChildClass *>(xTunnel->getSomething(ChildClass::getUnoTunnelId()));
-#else
mpHandler = dynamic_cast<ChildClass *>(xRef.get());
-#endif
- if (mpHandler != NULL)
- clog << "MEMORY:" << mpHandler->getInstanceNumber()
- << ":RefAndPointer" << endl;
}
virtual ~RefAndPointer()
{
-#ifdef DEBUG_MEMORY
- if (mpHandler != NULL)
- clog << "MEMORY:" << mpHandler->getInstanceNumber()
- << ":~RefAndPointer" << endl;
-#endif
}
void set(ChildClass * pHandler)
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/analyzemodel.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/analyzemodel.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/analyzemodel.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/analyzemodel.xsl Thu Oct 4 23:16:35 2012
@@ -119,6 +119,7 @@
</xsl:when>
</xsl:choose>
<xsl:copy-of select="@tag"/>
+ <xsl:copy-of select="@supported"/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factory_ns.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factory_ns.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factory_ns.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factory_ns.xsl Thu Oct 4 23:16:35 2012
@@ -91,7 +91,7 @@ public:
virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
virtual string getDefineName(Id nId) const;</xsl:text>
<xsl:call-template name="factoryactiondecls"/>
- virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
+ virtual void attributeAction(OOXMLFastContextHandler * pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue);
#ifdef DEBUG_FACTORY
virtual string getName() const;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl.xsl Thu Oct 4 23:16:35 2012
@@ -60,7 +60,7 @@
<xsl:template name="factorycreatecontextfromfactory">
<xsl:text>
uno::Reference< xml::sax::XFastContextHandler > OOXMLFactory::createFastChildContextFromFactory
-(OOXMLFastContextHandler * pHandler, OOXMLFactory_ns::Pointer_t pFactory, Token_t Element)
+(OOXMLFastContextHandler * pHandler, OOXMLFactory_ns::Pointer_t pFactory, sal_Int32 Element)
{
uno::Reference < xml::sax::XFastContextHandler > aResult;
Id nDefine = pHandler->getDefine();
@@ -169,7 +169,7 @@ OOXMLFactory_ns::Pointer_t OOXMLFactory:
<xsl:template name="factorycreatefromstart">
<xsl:text>
uno::Reference< xml::sax::XFastContextHandler > OOXMLFactory::createFastChildContextFromStart
-(OOXMLFastContextHandler * pHandler, Token_t Element)
+(OOXMLFastContextHandler * pHandler, sal_Int32 Element)
{
#ifdef DEBUG_FACTORY
debug_logger->startElement("factory.createFastChildContextFromStart");
@@ -202,7 +202,7 @@ uno::Reference< xml::sax::XFastContex
<xsl:template name="fasttokentoid">
<xsl:text>
namespace tokenmap {
-struct token { const char * name; Token_t nToken; };
+struct token { const char * name; sal_Int32 nToken; };
class Perfect_Hash
{
private:
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl_ns.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl_ns.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl_ns.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/factoryimpl_ns.xsl Thu Oct 4 23:16:35 2012
@@ -850,7 +850,7 @@ TokenToIdMapPointer </xsl:text>
<xsl:text>
void </xsl:text>
<xsl:call-template name="factoryclassname"/>
-<xsl:text>::attributeAction(OOXMLFastContextHandler * _pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue)
+<xsl:text>::attributeAction(OOXMLFastContextHandler * _pHandler, sal_Int32 nToken, OOXMLValue::Pointer_t pValue)
{
switch(_pHandler->getDefine())
{</xsl:text>
@@ -866,7 +866,7 @@ void </xsl:text>
<xsl:text>
void </xsl:text>
<xsl:call-template name="factoryclassname"/>
-<xsl:text>::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLValue::Pointer_t)
+<xsl:text>::attributeAction(OOXMLFastContextHandler *, sal_Int32, OOXMLValue::Pointer_t)
{
}
</xsl:text>
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/fasttokens.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/fasttokens.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/fasttokens.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/fasttokens.xsl Thu Oct 4 23:16:35 2012
@@ -57,19 +57,16 @@
<xsl:include href="factorytools.xsl"/>
<xsl:template name="fasttokens">
- <xsl:text>
-typedef sal_Int32 Token_t;
- </xsl:text>
<xsl:for-each select="/model/fasttoken">
<xsl:text>
-const Token_t OOXML_</xsl:text>
+const sal_Int32 OOXML_</xsl:text>
<xsl:value-of select="translate(., '-', '_')"/>
<xsl:text> = </xsl:text>
<xsl:value-of select="position() - 1"/>
<xsl:text>;</xsl:text>
</xsl:for-each>
<xsl:text>
-const Token_t OOXML_FAST_TOKENS_END =</xsl:text>
+const sal_Int32 OOXML_FAST_TOKENS_END = </xsl:text>
<xsl:value-of select="count(/model/fasttoken)"/>
<xsl:text>;
</xsl:text>
</xsl:template>
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/gperffasttokenhandler.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/gperffasttokenhandler.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/gperffasttokenhandler.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/gperffasttokenhandler.xsl Thu Oct 4 23:16:35 2012
@@ -68,7 +68,7 @@
namespace writerfilter { namespace ooxml { namespace tokenmap {
%}
-struct token { const char * name; Token_t nToken; };
+struct token { const char * name; sal_Int32 nToken; };
%%</xsl:text>
<xsl:for-each select=".//rng:element|.//rng:attribute">
<xsl:if test="generate-id(.) = generate-id(key('same-token-name', @localname)[1])">
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/model.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/model.xml?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/model.xml (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/model.xml Thu Oct 4 23:16:35 2012
@@ -21489,7 +21489,7 @@
<attribute name="val" tokenid="ooxml:CT_VerticalAlignRun_val" action="setValue"/>
<action name="start" action="setDefaultStringValue"/>
</resource>
- <resource name="CT_FitText" resource="Properties" tag="paragraph">
+ <resource name="CT_FitText" resource="Properties" tag="paragraph" supported="no">
<attribute name="val" tokenid="ooxml:CT_FitText_val"/>
<attribute name="id" tokenid="ooxml:CT_FitText_id"/>
</resource>
@@ -21610,7 +21610,7 @@
<value name="exact" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_exact">exact</value>
<value name="atLeast" tokenid="ooxml:Value_wordprocessingml_ST_LineSpacingRule_atLeast">atLeast</value>
</resource>
- <resource name="CT_Spacing" resource="Properties" tag="paragraüh">
+ <resource name="CT_Spacing" resource="Properties" tag="paragraph">
<attribute name="before" tokenid="ooxml:CT_Spacing_before"/>
<attribute name="beforeLines" tokenid="ooxml:CT_Spacing_beforeLines"/>
<attribute name="beforeAutospacing" tokenid="ooxml:CT_Spacing_beforeAutospacing"/>
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/todo.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/todo.xsl?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/todo.xsl (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/ooxml/todo.xsl Thu Oct 4 23:16:35 2012
@@ -21,29 +21,29 @@
***********************************************************-->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:rng="http://relaxng.org/ns/structure/1.0">
-<xsl:output method="xml" indent="yes"/>
-
-<xsl:template match="/">
- <todo>
- <xsl:for-each select="/stage3">
- <xsl:for-each select="attribute|element">
- <xsl:choose>
- <xsl:when test="@qname and @resource='Properties' and not(file)">
- <xsl:copy-of select="."/>
- </xsl:when>
- <xsl:when test="@qname and file/status[number(@done) < 100 and number(@planned) > 0]">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <xsl:copy-of select="file[status[number(@done) < 100 and number(@planned) > 0]]"/>
- </xsl:copy>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
- </todo>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <todo>
+ <xsl:for-each select="/stage3">
+ <xsl:for-each select="attribute|element">
+ <xsl:choose>
+ <xsl:when test="@supported = 'no'"/>
+ <xsl:when test="@qname and @resource='Properties' and not(file)">
+ <xsl:copy-of select="."/>
+ </xsl:when>
+ <xsl:when test="@qname and file/status[number(@done) < 100 and number(@planned) > 0]">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:copy-of select="file[status[number(@done) < 100 and number(@planned) > 0]]"/>
+ </xsl:copy>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:for-each>
+ </todo>
+ </xsl:template>
+</xsl:stylesheet>
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/LoggedResources.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/LoggedResources.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/LoggedResources.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/LoggedResources.cxx Thu Oct 4 23:16:35 2012
@@ -22,6 +22,7 @@
#include <rtl/ustrbuf.hxx>
+#include <resourcemodel/WW8ResourceModel.hxx>
#include <resourcemodel/LoggedResources.hxx>
#include <resourcemodel/QNameToString.hxx>
@@ -282,7 +283,7 @@ void LoggedProperties::sprm(Sprm & _sprm
#ifdef DEBUG_LOGGING
mHelper.startElement("sprm");
mHelper.attribute("name", (*QNameToString::Instance())(_sprm.getId()));
- mHelper.chars(sprm.toString());
+ mHelper.chars(_sprm.toString());
#endif
lcl_sprm(_sprm);
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/TagLogger.cxx Thu Oct 4 23:16:35 2012
@@ -171,6 +171,77 @@ string XMLTag::toString() const
return sResult;
}
+string XMLTag::toTree(const string & sIndent) const
+{
+ if (mChars.length() > 0)
+ return sIndent + mChars;
+
+ string sResult;
+
+ {
+ size_t nSize = sIndent.size();
+ if (nSize > 1)
+ {
+ sResult += sIndent.substr(0, nSize - 2) + "+-\\" + mTag;
+ }
+ else
+ {
+ sResult += "\\" + mTag;
+ }
+ }
+
+ XMLAttributes_t::const_iterator aIt = mAttrs.begin();
+ while (aIt != mAttrs.end())
+ {
+ if (aIt == mAttrs.begin())
+ {
+ sResult += "(";
+ }
+ else
+ {
+ sResult += sIndent + ", ";
+ }
+
+ sResult += aIt->mName;
+ sResult += "=";
+ sResult += aIt->mValue;
+
+ aIt++;
+
+ if (aIt == mAttrs.end())
+ {
+ sResult += ")";
+ }
+ }
+
+ sResult += "\n";
+
+ if (mTags.size() > 0)
+ {
+ XMLTags_t::const_iterator aItTags = mTags.begin();
+ size_t nSize = mTags.size();
+ while (aItTags != mTags.end())
+ {
+ if ((*aItTags).get() != NULL)
+ {
+ if (nSize == 1)
+ {
+ sResult += (*aItTags)->toTree(sIndent + " ");
+ }
+ else
+ {
+ sResult += (*aItTags)->toTree(sIndent + "| ");
+ }
+ }
+
+ aItTags++;
+ nSize--;
+ }
+ }
+
+ return sResult;
+}
+
ostream & XMLTag::output(ostream & o, const string & sIndent) const
{
bool bHasContent = mChars.size() > 0 || mTags.size() > 0;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/source/resourcemodel/resourcemodel.cxx Thu Oct 4 23:16:35 2012
@@ -439,6 +439,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception/>");
}
output.addItem("</properties>");
@@ -456,6 +457,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
}
@@ -471,6 +473,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
}
Modified: incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/component.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/component.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/component.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/component.cxx Thu Oct 4 23:16:35 2012
@@ -20,15 +20,9 @@
*************************************************************/
-
-#ifndef _CPPUHELPTER_FACTORY_
-#include <cppuhelper/factory.hxx>
-#endif
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
+#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <debugservices/doctok/DocTokTestService.hxx>
#include <debugservices/doctok/DocTokAnalyzeService.hxx>
#include <debugservices/ooxml/OOXMLTestService.hxx>
@@ -52,17 +46,19 @@ static struct ::cppu::ImplementationEntr
};
- void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
{
fprintf(stderr, "Loading service: %s: ", implName);
void * pResult = ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries );
-
+
fprintf(stderr, "%p\n", pResult);
return pResult;
Modified: incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx Thu Oct 4 23:16:35 2012
@@ -263,7 +263,7 @@ class MyRtfScannerHandler : public write
public:
MyRtfScannerHandler(uno::Reference<lang::XMultiServiceFactory> &xServiceFactory_, uno::Reference<com::sun::star::ucb::XSimpleFileAccess> &xFileAccess_, uno::Reference<embed::XStorage> &xStorage_) :
- objDataLevel(0), numOfOLEs(0),
+ objDataLevel(0), numOfOLEs(0), hb(' '), numOfOLEChars(0),
xServiceFactory(xServiceFactory_),
xFileAccess(xFileAccess_),
xStorage(xStorage_)
Modified: incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx (original)
+++ incubator/ooo/branches/buildsys/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx Thu Oct 4 23:16:35 2012
@@ -164,7 +164,7 @@ class XmlRtfScannerHandler : public writ
public:
XmlRtfScannerHandler(uno::Reference<lang::XMultiServiceFactory> &xServiceFactory_, uno::Reference<com::sun::star::ucb::XSimpleFileAccess> &xFileAccess_) :
- objDataLevel(0), numOfOLEs(0),
+ objDataLevel(0), numOfOLEs(0), hb(' '), numOfOLEChars(0),
xServiceFactory(xServiceFactory_),
xFileAccess(xFileAccess_)
{
Modified: incubator/ooo/branches/buildsys/main/xmloff/JunitTest_xmloff_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmloff/JunitTest_xmloff_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmloff/JunitTest_xmloff_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/xmloff/JunitTest_xmloff_unoapi.mk Thu Oct 4 23:16:35 2012
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
$$(DEFS) \
Modified: incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk (original)
+++ incubator/ooo/branches/buildsys/main/xmloff/Library_xo.mk Thu Oct 4 23:16:35 2012
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,xo,
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,xo,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xo,\
-DXMLOFF_DLLIMPLEMENTATION \
))
Modified: incubator/ooo/branches/buildsys/main/xmlreader/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlreader/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlreader/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/xmlreader/prj/build.lst Thu Oct 4 23:16:35 2012
@@ -1,3 +1,2 @@
xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
-xr xmlreader\inc nmake - all xr_inc NULL
-xr xmlreader\source nmake - all xr_source xr_inc NULL
+xr xmlreader\prj nmake - all xr_prj NULL
Modified: incubator/ooo/branches/buildsys/main/xmlreader/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlreader/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlreader/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/xmlreader/prj/d.lst Thu Oct 4 23:16:35 2012
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlreader
-mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
-..\%__SRC%\bin\xmlread*.dll %_DEST%\bin%_EXT%\xmlread*.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
-..\%__SRC%\lib\xmlreader*.lib %_DEST%\lib%_EXT%\xmlreader*.lib
-..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib
-..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so
-..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx
-..\inc\xmlreader\pad.hxx %_DEST%\inc%_EXT%\xmlreader\pad.hxx
-..\inc\xmlreader\span.hxx %_DEST%\inc%_EXT%\xmlreader\span.hxx
-..\inc\xmlreader\xmlreader.hxx %_DEST%\inc%_EXT%\xmlreader\xmlreader.hxx
Modified: incubator/ooo/branches/buildsys/main/xmlreader/source/pad.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlreader/source/pad.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlreader/source/pad.cxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlreader/source/pad.cxx Thu Oct 4 23:16:35 2012
@@ -21,9 +21,7 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
-
#include "osl/diagnose.h"
#include "rtl/string.h"
#include "sal/types.h"
Modified: incubator/ooo/branches/buildsys/main/xmlreader/source/span.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlreader/source/span.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlreader/source/span.cxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlreader/source/span.cxx Thu Oct 4 23:16:35 2012
@@ -21,9 +21,7 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
-
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "osl/diagnose.h"
Modified: incubator/ooo/branches/buildsys/main/xmlreader/source/xmlreader.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlreader/source/xmlreader.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlreader/source/xmlreader.cxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlreader/source/xmlreader.cxx Thu Oct 4 23:16:35 2012
@@ -21,7 +21,6 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
#include <climits>
Modified: incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xml_helper.hxx Thu Oct 4 23:16:35 2012
@@ -30,6 +30,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -41,7 +42,7 @@ namespace xmlscript
##################################################################################################*/
//==================================================================================================
-class XMLElement
+class XCR_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
{
public:
@@ -126,13 +127,13 @@ protected:
##################################################################################################*/
//==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL createInputStream(
::rtl::ByteSequence const & rInData )
SAL_THROW( () );
//==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
SAL_CALL createOutputStream(
::rtl::ByteSequence * pOutData )
SAL_THROW( () );
Modified: incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmldlg_imexp.hxx Thu Oct 4 23:16:35 2012
@@ -37,13 +37,13 @@
#endif
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
//==============================================================================
-void SAL_CALL exportDialogModel(
+XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
::com::sun::star::uno::Reference<
@@ -51,7 +51,7 @@ void SAL_CALL exportDialogModel(
SAL_THROW( (::com::sun::star::uno::Exception) );
//==============================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -62,7 +62,7 @@ SAL_CALL importDialogModel(
// additional functions for convenience
//==============================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -71,7 +71,7 @@ SAL_CALL exportDialogModel(
SAL_THROW( (::com::sun::star::uno::Exception) );
//==============================================================================
-void SAL_CALL importDialogModel(
+XCR_DLLPUBLIC void SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xInput,
::com::sun::star::uno::Reference<
Modified: incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmllib_imexp.hxx Thu Oct 4 23:16:35 2012
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -37,7 +37,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct LibDescriptor
+struct XCR_DLLPUBLIC LibDescriptor
{
::rtl::OUString aName;
::rtl::OUString aStorageURL;
@@ -48,7 +48,7 @@ struct LibDescriptor
sal_Bool bPreload;
};
-struct LibDescriptorArray
+struct XCR_DLLPUBLIC LibDescriptorArray
{
LibDescriptor* mpLibs;
sal_Int32 mnLibCount;
@@ -60,27 +60,27 @@ struct LibDescriptorArray
};
-void
+XCR_DLLPUBLIC void
SAL_CALL exportLibraryContainer(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) );
-void
+XCR_DLLPUBLIC void
SAL_CALL exportLibrary(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibrary( LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) );
Modified: incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/inc/xmlscript/xmlmod_imexp.hxx Thu Oct 4 23:16:35 2012
@@ -26,7 +26,7 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <xmlscript/xmlns.h>
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -36,7 +36,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct ModuleDescriptor
+struct XCR_DLLPUBLIC ModuleDescriptor
{
::rtl::OUString aName;
::rtl::OUString aLanguage;
@@ -44,14 +44,14 @@ struct ModuleDescriptor
::rtl::OUString aModuleType; // VBA
};
-void
+XCR_DLLPUBLIC void
SAL_CALL exportScriptModule(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importScriptModule( ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) );
Modified: incubator/ooo/branches/buildsys/main/xmlscript/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/prj/build.lst Thu Oct 4 23:16:35 2012
@@ -1,10 +1,3 @@
xt xmlscript : comphelper tools offapi LIBXSLT:libxslt NULL
-xt xmlscript usr1 - all xt_mkout NULL
-xt xmlscript\inc nmake - all xt_inc NULL
-xt xmlscript\source\xml_helper nmake - all xt_xml_helper xt_inc NULL
-xt xmlscript\source\xmldlg_imexp nmake - all xt_xmldlg_imexp xt_inc NULL
-xt xmlscript\source\xmllib_imexp nmake - all xt_xmllib_imexp xt_inc NULL
-xt xmlscript\source\xmlmod_imexp nmake - all xt_xmlmod_imexp xt_inc NULL
-xt xmlscript\source\xmlflat_imexp nmake - all xt_xmlflat_imexp xt_inc NULL
-xt xmlscript\source\misc nmake - all xt_misc xt_inc NULL
-xt xmlscript\util nmake - all xt_util xt_xml_helper xt_xmldlg_imexp xt_xmllib_imexp xt_xmlmod_imexp xt_xmlflat_imexp xt_misc NULL
+xt xmlscript\prj nmake - all xt_prj NULL
+
Modified: incubator/ooo/branches/buildsys/main/xmlscript/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/prj/d.lst Thu Oct 4 23:16:35 2012
@@ -1,14 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlscript
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx
-..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmldlg_imexp.hxx
-..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmllib_imexp.hxx
-..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmlmod_imexp.hxx
-..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
-
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
-..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
Modified: incubator/ooo/branches/buildsys/main/xmlscript/source/misc/unoservices.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/source/misc/unoservices.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/source/misc/unoservices.cxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/source/misc/unoservices.cxx Thu Oct 4 23:16:35 2012
@@ -103,7 +103,7 @@ namespace xmlscript
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -111,7 +111,7 @@ extern "C"
// -----------------------------------------------------------------------------
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
Modified: incubator/ooo/branches/buildsys/main/xmlscript/source/xml_helper/xml_impctx.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/xmlscript/source/xml_helper/xml_impctx.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/xmlscript/source/xml_helper/xml_impctx.cxx (original)
+++ incubator/ooo/branches/buildsys/main/xmlscript/source/xml_helper/xml_impctx.cxx Thu Oct 4 23:16:35 2012
@@ -31,7 +31,7 @@
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase3.hxx"
-#include "xmlscript/xml_import.hxx"
+#include "xml_import.hxx"
#include "com/sun/star/xml/input/XAttributes.hpp"
#include "com/sun/star/lang/XInitialization.hpp"