summaryrefslogtreecommitdiff
path: root/xmloff/source/script
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/script')
-rw-r--r--xmloff/source/script/XMLEventExport.cxx17
-rw-r--r--xmloff/source/script/XMLEventImportHelper.cxx7
-rw-r--r--xmloff/source/script/XMLEventsImportContext.cxx25
-rw-r--r--xmloff/source/script/XMLScriptContextFactory.cxx3
-rw-r--r--xmloff/source/script/XMLScriptExportHandler.cxx5
-rw-r--r--xmloff/source/script/XMLStarBasicContextFactory.cxx15
-rw-r--r--xmloff/source/script/XMLStarBasicExportHandler.cxx5
-rw-r--r--xmloff/source/script/xmlbasici.cxx3
-rw-r--r--xmloff/source/script/xmlbasici.hxx3
-rw-r--r--xmloff/source/script/xmlscripti.cxx4
10 files changed, 38 insertions, 49 deletions
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index 2675ecb4b98f..ebb339348097 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,17 +30,11 @@
#include "precompiled_xmloff.hxx"
#include <xmloff/XMLEventExport.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
#include <com/sun/star/document/XEventsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEREPLACE_HPP
#include <com/sun/star/container/XNameReplace.hpp>
-#endif
#include <tools/debug.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
@@ -75,7 +70,7 @@ XMLEventExport::~XMLEventExport()
for( HandlerMap::iterator aIter =
aHandlerMap.begin();
aIter != aEnd;
- aIter++ )
+ ++aIter )
{
delete aIter->second;
}
@@ -164,7 +159,7 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess,
// don't proceed further
::rtl::OString aStr("Unknown event name:" );
aStr += ::rtl::OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
#endif
}
@@ -214,7 +209,7 @@ void XMLEventExport::ExportSingleEvent(
// don't proceed further
::rtl::OString aStr("Unknown event name:" );
aStr += ::rtl::OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
#endif
}
@@ -261,7 +256,7 @@ void XMLEventExport::ExportEvent(
{
if (! sType.equalsAsciiL("None", sizeof("None")-1))
{
- DBG_ERROR("unknown event type returned by API");
+ OSL_FAIL("unknown event type returned by API");
// unknown type -> error (ignore)
}
// else: we ignore None fields
@@ -365,3 +360,5 @@ const XMLEventNameTranslation aStandardEventTable[] =
{ NULL, 0, 0 }
};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index 3dfbab60952f..991d3159516a 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
-#ifndef _XMLOFF_XMLEVENTIMPORTHELPER_HXX
#include "XMLEventImportHelper.hxx"
-#endif
#include <tools/debug.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
@@ -56,7 +55,7 @@ XMLEventImportHelper::~XMLEventImportHelper()
FactoryMap::iterator aEnd = aFactoryMap.end();
for(FactoryMap::iterator aIter = aFactoryMap.begin();
aIter != aEnd;
- aIter++ )
+ ++aIter)
{
delete aIter->second;
}
@@ -177,3 +176,5 @@ SvXMLImportContext* XMLEventImportHelper::CreateContext(
return pContext;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index 301bef53856d..3ce8cec3eec9 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,13 +30,9 @@
#include "precompiled_xmloff.hxx"
#include <xmloff/XMLEventsImportContext.hxx>
-#ifndef _XMLOFF_XMLEVENTIMPORTHELPER_HXX
#include "XMLEventImportHelper.hxx"
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
#include <com/sun/star/document/XEventsSupplier.hpp>
-#endif
#include <tools/debug.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
@@ -90,15 +87,6 @@ XMLEventsImportContext::~XMLEventsImportContext()
{
// // if, for whatever reason, the object gets destroyed prematurely,
// // we need to delete the collected events
-// EventsVector::iterator aEnd = aCollectEvents.end();
-// for(EventsVector::iterator aIter = aCollectEvents.begin();
-// aIter != aEnd;
-// aIter++)
-// {
-// EventNameValuesPair* pPair = &(*aIter);
-// delete pPair;
-// }
-// aCollectEvents.clear();
}
@@ -175,11 +163,9 @@ void XMLEventsImportContext::SetEvents(
EventsVector::iterator aEnd = aCollectEvents.end();
for(EventsVector::iterator aIter = aCollectEvents.begin();
aIter != aEnd;
- aIter++)
+ ++aIter)
{
AddEventValues(aIter->first, aIter->second);
-// EventNameValuesPair* pPair = &(*aIter);
-// delete pPair;
}
aCollectEvents.clear();
}
@@ -197,7 +183,7 @@ sal_Bool XMLEventsImportContext::GetEventSequence(
EventsVector::iterator aIter = aCollectEvents.begin();
while( (aIter != aCollectEvents.end()) && (aIter->first != rName) )
{
- aIter++;
+ ++aIter;
}
// if we're not at the end, set the sequence
@@ -238,10 +224,9 @@ void XMLEventsImportContext::AddEventValues(
}
else
{
-// EventNameValuesPair* aPair = new EventNameValuesPair(rEventName,
-// rValues);
-// aCollectEvents.push_back(*aPair);
EventNameValuesPair aPair(rEventName, rValues);
aCollectEvents.push_back(aPair);
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 60e08a208f72..4de998a5207b 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ SvXMLImportContext * XMLScriptContextFactory::CreateContext
return new SvXMLImportContext(rImport, p_nPrefix, rLocalName);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 9cfc7211f3b9..9310accee364 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "precompiled_xmloff.hxx"
#include "XMLScriptExportHandler.hxx"
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
#include <tools/debug.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
@@ -86,3 +85,5 @@ void XMLScriptExportHandler::Export(
XML_EVENT_LISTENER,
bUseWhitespace, sal_False);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index a957b4bd060f..51c2050be4bc 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,18 +80,6 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
if (XML_NAMESPACE_SCRIPT == nPrefix)
{
-// if (IsXMLToken(sLocalName, XML_LIBRARY))
-// {
-// sLibraryVal = xAttrList->getValueByIndex(nAttr);
-// }
-// if (IsXMLToken(sLocalName, XML_LOCATION))
-// {
-// sLibraryVal = xAttrList->getValueByIndex(nAttr);
-// if ( IsXMLToken( sLibraryVal, XML_APPLICATION ) )
-// sLibraryVal =
-// OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice"));
-// }
-// else
if (IsXMLToken(sLocalName, XML_MACRO_NAME))
{
sMacroNameVal = xAttrList->getValueByIndex(nAttr);
@@ -137,3 +126,5 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
// return dummy context
return new SvXMLImportContext(rImport, p_nPrefix, rLocalName);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 13d6948ba98e..023dc7efcf1e 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#include "precompiled_xmloff.hxx"
#include "XMLStarBasicExportHandler.hxx"
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
#include <tools/debug.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
@@ -109,3 +108,5 @@ void XMLStarBasicExportHandler::Export(
XML_EVENT_LISTENER,
bUseWhitespace, sal_False);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index 8897dd7134b5..c6738eb51c83 100644
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -195,3 +196,5 @@ void XMLBasicImportChildContext::Characters( const ::rtl::OUString& rChars )
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index 11bfef201b08..b9e5099b1780 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ public:
};
#endif // _XMLOFF_XMLBASICI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index d498922afa15..16d4f2c5c6ce 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,6 +49,7 @@ using namespace com::sun::star::document;
using namespace com::sun::star::xml::sax;
using namespace ::xmloff::token;
+using rtl::OUString;
// =============================================================================
// XMLScriptChildContext: context for <office:script> element
@@ -186,3 +188,5 @@ void XMLScriptContext::EndElement()
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-08-15 09:37:23 +0000