[Libreoffice-commits] core.git: 5 commits - i18npool/source offapi/com sc/source sd/source sfx2/source svl/source svx/source sw/source unoidl/source unotools/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Fri Apr 11 00:53:10 PDT 2014
i18npool/source/transliteration/transliterationImpl.cxx | 4
offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl | 2
offapi/com/sun/star/frame/status/ItemState.idl | 12
offapi/com/sun/star/i18n/TransliterationModulesExtra.idl | 4
offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl | 16
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/inc/AccessibleDocument.hxx | 2
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 2
sfx2/source/control/unoctitm.cxx | 4
svl/source/items/srchitem.cxx | 4
svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx | 2
svx/source/dialog/srchdlg.cxx | 8
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2
sw/source/core/access/accdoc.cxx | 2
sw/source/core/access/accdoc.hxx | 2
unoidl/source/unoidl-check.cxx | 270 ++++++++++
unotools/source/config/searchopt.cxx | 4
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 8
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 18
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 16
23 files changed, 330 insertions(+), 60 deletions(-)
New commits:
commit a3be37674609adf68e533f31f120bbdc1abe5f7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 11 08:36:21 2014 +0200
unoidl-check: Also check for invalid UNOIDL identifiers
...but only in those parts of registry B that are not also in registry A. That
way, we can detect newly introduced violations while ignoring the old
(published) violations for backwards compatibility.
Change-Id: Ifb8ea98fffca29647aa6677a5ade86e5b194ddee
diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx
index 33487f5..3a0dd36 100644
--- a/unoidl/source/unoidl-check.cxx
+++ b/unoidl/source/unoidl-check.cxx
@@ -17,6 +17,7 @@
#include "osl/file.hxx"
#include "osl/process.h"
+#include "rtl/character.hxx"
#include "rtl/process.h"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -890,6 +891,274 @@ void checkMap(
}
}
+bool valid(OUString const & identifier) {
+ for (sal_Int32 i = 0;; ++i) {
+ i = identifier.indexOf('_', i);
+ if (i == -1) {
+ return true;
+ }
+ if (!rtl::isAsciiUpperCase(identifier[0]) || identifier[i - 1] == '_') {
+ return false;
+ }
+ }
+}
+
+void checkIds(
+ rtl::Reference<unoidl::Provider> const & providerA, OUString const & prefix,
+ rtl::Reference<unoidl::MapCursor> const & cursor)
+{
+ assert(cursor.is());
+ for (;;) {
+ OUString id;
+ rtl::Reference<unoidl::Entity> entB(cursor->getNext(&id));
+ if (!entB.is()) {
+ break;
+ }
+ OUString name(prefix + id);
+ rtl::Reference<unoidl::Entity> entA(providerA->findEntity(name));
+ if (!(entA.is() || valid(id))) {
+ std::cerr
+ << "entity name " << name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ switch (entB->getSort()) {
+ case unoidl::Entity::SORT_MODULE:
+ checkIds(
+ providerA, name + ".",
+ (static_cast<unoidl::ModuleEntity *>(entB.get())
+ ->createCursor()));
+ break;
+ case unoidl::Entity::SORT_ENUM_TYPE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::EnumTypeEntity> ent2B(
+ static_cast<unoidl::EnumTypeEntity *>(entB.get()));
+ for (std::vector<unoidl::EnumTypeEntity::Member>::const_iterator
+ i(ent2B->getMembers().begin());
+ i != ent2B->getMembers().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "enum type " << name << " member " << i->name
+ << " uses an invalid identifier" << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::PlainStructTypeEntity> ent2B(
+ static_cast<unoidl::PlainStructTypeEntity *>(
+ entB.get()));
+ for (std::vector<unoidl::PlainStructTypeEntity::Member>::const_iterator
+ i(ent2B->getDirectMembers().begin());
+ i != ent2B->getDirectMembers().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "plain struct type " << name << " direct member "
+ << i->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::PolymorphicStructTypeTemplateEntity>
+ ent2B(
+ static_cast<
+ unoidl::PolymorphicStructTypeTemplateEntity *>(
+ entB.get()));
+ for (std::vector<OUString>::const_iterator i(
+ ent2B->getTypeParameters().begin());
+ i != ent2B->getTypeParameters().end(); ++i)
+ {
+ if (!valid(*i)) {
+ std::cerr
+ << "polymorphic struct type template " << name
+ << " type parameter " << *i
+ << " uses an invalid identifier" << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ for (std::vector<unoidl::PolymorphicStructTypeTemplateEntity::Member>::const_iterator
+ i(ent2B->getMembers().begin());
+ i != ent2B->getMembers().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "polymorphic struct type template " << name
+ << " member " << i->name
+ << " uses an invalid identifier" << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_EXCEPTION_TYPE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::ExceptionTypeEntity> ent2B(
+ static_cast<unoidl::ExceptionTypeEntity *>(entB.get()));
+ for (std::vector<unoidl::ExceptionTypeEntity::Member>::const_iterator
+ i(ent2B->getDirectMembers().begin());
+ i != ent2B->getDirectMembers().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "exception type " << name << " direct member "
+ << i->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_INTERFACE_TYPE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::InterfaceTypeEntity> ent2B(
+ static_cast<unoidl::InterfaceTypeEntity *>(entB.get()));
+ for (std::vector<unoidl::InterfaceTypeEntity::Attribute>::const_iterator
+ i(ent2B->getDirectAttributes().begin());
+ i != ent2B->getDirectAttributes().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "interface type " << name << " direct attribute "
+ << i->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ for (std::vector<unoidl::InterfaceTypeEntity::Method>::const_iterator
+ i(ent2B->getDirectMethods().begin());
+ i != ent2B->getDirectMethods().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "interface type " << name << " direct method "
+ << i->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ for (std::vector<unoidl::InterfaceTypeEntity::Method::Parameter>::const_iterator
+ j(i->parameters.begin());
+ j != i->parameters.end(); ++j)
+ {
+ if (!valid(j->name)) {
+ std::cerr
+ << "interface type " << name
+ << " direct method " << i->name << " parameter "
+ << j->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_TYPEDEF:
+ case unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
+ case unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
+ break;
+ case unoidl::Entity::SORT_CONSTANT_GROUP:
+ {
+ rtl::Reference<unoidl::ConstantGroupEntity> ent2B(
+ static_cast<unoidl::ConstantGroupEntity *>(entB.get()));
+ for (std::vector<unoidl::ConstantGroupEntity::Member>::const_iterator
+ i(ent2B->getMembers().begin());
+ i != ent2B->getMembers().end(); ++i)
+ {
+ bool found = false;
+ if (entA.is()) {
+ rtl::Reference<unoidl::ConstantGroupEntity> ent2A(
+ static_cast<unoidl::ConstantGroupEntity *>(
+ entA.get()));
+ for (std::vector<unoidl::ConstantGroupEntity::Member>::const_iterator
+ j(ent2A->getMembers().begin());
+ j != ent2A->getMembers().end(); ++j)
+ {
+ if (i->name == j->name) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!(found || valid(i->name))) {
+ std::cerr
+ << "Constant group " << name << " member "
+ << i->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ break;
+ }
+ case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
+ if (!entA.is()) {
+ rtl::Reference<unoidl::SingleInterfaceBasedServiceEntity>
+ ent2B(
+ static_cast<unoidl::SingleInterfaceBasedServiceEntity *>(
+ entB.get()));
+ for (std::vector<unoidl::SingleInterfaceBasedServiceEntity::Constructor>::const_iterator
+ i(ent2B->getConstructors().begin());
+ i != ent2B->getConstructors().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "single-interface--based service " << name
+ << " constructor " << i->name
+ << " uses an invalid identifier" << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ for (std::vector<unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter>::const_iterator
+ j(i->parameters.begin());
+ j != i->parameters.end(); ++j)
+ {
+ if (!valid(j->name)) {
+ std::cerr
+ << "single-interface--based service " << name
+ << " constructor " << i->name << " parameter "
+ << j->name << " uses an invalid identifier"
+ << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ }
+ }
+ break;
+ case unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
+ {
+ rtl::Reference<unoidl::AccumulationBasedServiceEntity> ent2B(
+ static_cast<unoidl::AccumulationBasedServiceEntity *>(
+ entB.get()));
+ std::vector<unoidl::AccumulationBasedServiceEntity::Property>::size_type
+ n(entA.is()
+ ? (static_cast<unoidl::AccumulationBasedServiceEntity *>(
+ entA.get())
+ ->getDirectProperties().size())
+ : 0);
+ assert(n <= ent2B->getDirectProperties().size());
+ for (std::vector<unoidl::AccumulationBasedServiceEntity::Property>::const_iterator
+ i(ent2B->getDirectProperties().begin() + n);
+ i != ent2B->getDirectProperties().end(); ++i)
+ {
+ if (!valid(i->name)) {
+ std::cerr
+ << "accumulation-based service " << name
+ << " direct property " << i->name
+ << " uses an invalid identifier" << std::endl;
+ std::exit(EXIT_FAILURE);
+ }
+ }
+ break;
+ }
+ }
+ }
+}
+
}
SAL_IMPLEMENT_MAIN() {
@@ -920,6 +1189,7 @@ SAL_IMPLEMENT_MAIN() {
badUsage();
}
checkMap(prov[1], "", prov[0]->createRootCursor());
+ checkIds(prov[0], "", prov[1]->createRootCursor());
return EXIT_SUCCESS;
} catch (unoidl::FileFormatException & e1) {
std::cerr
commit fb1b0c1f7bb4f61ce7ed04480c495cacaec63a15
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 11 08:34:05 2014 +0200
Use valid UNOIDL identifiers in XCompressedDocumentHandler
...which is new in LO 4.3 and still unpublished.
Change-Id: I2d6b553c27906d7855c62f33fdf0060b58d3ec62
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index d397f27..cb17a62 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -42,28 +42,28 @@ module com { module sun { module star { module xml { module csax {
*/
interface XCompressedDocumentHandler: com::sun::star::uno::XInterface
{
- void _startDocument()
+ void compressedStartDocument()
raises( com::sun::star::xml::sax::SAXException );
- void _endDocument()
+ void compressedEndDocument()
raises( com::sun::star::xml::sax::SAXException );
- void _startElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes)
+ void compressedStartElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes)
raises( com::sun::star::xml::sax::SAXException );
- void _endElement( [in] string aName )
+ void compressedEndElement( [in] string aName )
raises( com::sun::star::xml::sax::SAXException );
- void _characters( [in] string aChars )
+ void compressedCharacters( [in] string aChars )
raises( com::sun::star::xml::sax::SAXException );
- void _ignorableWhitespace( [in] string aWhitespaces )
+ void compressedIgnorableWhitespace( [in] string aWhitespaces )
raises( com::sun::star::xml::sax::SAXException );
- void _processingInstruction( [in] string aTarget, [in] string aData )
+ void compressedProcessingInstruction( [in] string aTarget, [in] string aData )
raises( com::sun::star::xml::sax::SAXException );
- void _setDocumentLocator( [in] long columnNumber, [in] long lineNumber, [in] string publicId, [in] string systemId)
+ void compressedSetDocumentLocator( [in] long columnNumber, [in] long lineNumber, [in] string publicId, [in] string systemId)
raises( com::sun::star::xml::sax::SAXException );
};
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 1c7b5ca..7617589 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1218,7 +1218,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
}
- m_xCompressedDocumentHandler->_startElement(aName, aAttributes);
+ m_xCompressedDocumentHandler->compressedStartElement(aName, aAttributes);
#endif
}
@@ -1255,7 +1255,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
#ifndef _USECOMPRESSEDDOCUMENTHANDLER
m_xDocumentHandler->endElement(aName);
#else
- m_xCompressedDocumentHandler->_endElement(aName);
+ m_xCompressedDocumentHandler->compressedEndElement(aName);
#endif
}
@@ -1303,7 +1303,7 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars )
#ifndef _USECOMPRESSEDDOCUMENTHANDLER
m_xDocumentHandler->characters(aChars);
#else
- m_xCompressedDocumentHandler->_characters(aChars);
+ m_xCompressedDocumentHandler->compressedCharacters(aChars);
#endif
}
}
@@ -1332,7 +1332,7 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction(
#ifndef _USECOMPRESSEDDOCUMENTHANDLER
m_xDocumentHandler->processingInstruction(aTarget, aData);
#else
- m_xCompressedDocumentHandler->_processingInstruction(aTarget, aData);
+ m_xCompressedDocumentHandler->compressedProcessingInstruction(aTarget, aData);
#endif
}
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 02f9d9b..9b5d783 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -971,7 +971,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName
aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
}
- _startElement(aName, aAttributes);
+ compressedStartElement(aName, aAttributes);
}
void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName )
@@ -1006,17 +1006,17 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Ref
}
/* XCompressedDocumentHandler */
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startDocument( )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartDocument( )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endDocument( )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndDocument( )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
saxHelper.startElement(aName, aAttributes);
@@ -1025,31 +1025,31 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aNam
buildIDAttr( m_pCurrentElement );
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const OUString& aName )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndElement( const OUString& aName )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
endElement( aName );
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const OUString& aChars )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedCharacters( const OUString& aChars )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
characters( aChars );
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const OUString& aWhitespaces )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedIgnorableWhitespace( const OUString& aWhitespaces )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
ignorableWhitespace( aWhitespaces );
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const OUString& aTarget, const OUString& aData )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
processingInstruction( aTarget, aData );
}
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedSetDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
{
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 642488f..c7252d9 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -212,31 +212,31 @@ public:
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* com::sun::star::xml::csax::XCompressedDocumentHandler */
- virtual void SAL_CALL _startDocument( )
+ virtual void SAL_CALL compressedStartDocument( )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _endDocument( )
+ virtual void SAL_CALL compressedEndDocument( )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _startElement(
+ virtual void SAL_CALL compressedStartElement(
const OUString& aName,
const com::sun::star::uno::Sequence<
com::sun::star::xml::csax::XMLAttribute >& aAttributes )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _endElement( const OUString& aName )
+ virtual void SAL_CALL compressedEndElement( const OUString& aName )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _characters( const OUString& aChars )
+ virtual void SAL_CALL compressedCharacters( const OUString& aChars )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _ignorableWhitespace( const OUString& aWhitespaces )
+ virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _processingInstruction( const OUString& aTarget, const OUString& aData )
+ virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL _setDocumentLocator(
+ virtual void SAL_CALL compressedSetDocumentLocator(
sal_Int32 columnNumber,
sal_Int32 lineNumber,
const OUString& publicId,
commit f699e7b9b22961cc401868e22eeb90c215a8832f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 18:35:03 2014 +0200
Use valid UNOIDL identifiers in TransliterationModulesExtra
ignoreDiacritics_CTL was introduced in LO 4.2, but is unpublished and appears to
be rarely used, so changing it is hopefully OK.
ignoreKashida_CTL is new in LO 4.3.
Change-Id: I52c6d1e8c6b30eec4af22e3bbc72dd5874ef7151
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 7e1d7bf..f9a9c13 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -194,12 +194,12 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
numCascade++;
}
// additional transliterations from TranslationModuleExtra (we cannot extend TransliterationModule)
- if (modType & TransliterationModulesExtra::ignoreDiacritics_CTL)
+ if (modType & TransliterationModulesExtra::IGNORE_DIACRITICS_CTL)
{
if (loadModuleByName(OUString("ignoreDiacritics_CTL"), bodyCascade[numCascade], rLocale))
numCascade++;
}
- if (modType & TransliterationModulesExtra::ignoreKashida_CTL)
+ if (modType & TransliterationModulesExtra::IGNORE_KASHIDA_CTL)
if (loadModuleByName(OUString("ignoreKashida_CTL"), bodyCascade[numCascade], rLocale))
numCascade++;
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index d1f675f..be82cf7 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -51,8 +51,8 @@ constants TransliterationModulesExtra
const short TOGGLE_CASE = 202;
/// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way
- const long ignoreDiacritics_CTL = 0x40000000;
- const long ignoreKashida_CTL = 0x00000800;
+ const long IGNORE_DIACRITICS_CTL = 0x40000000;
+ const long IGNORE_KASHIDA_CTL = 0x00000800;
const long END_OF_MODULE = 0;
};
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1be2940..dbaf87f 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -145,9 +145,9 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
if ( aOpt.IsMatchFullHalfWidthForms())
rFlags |= TransliterationModules_IGNORE_WIDTH;
if ( aOpt.IsIgnoreDiacritics_CTL())
- rFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL ;
+ rFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL ;
if ( aOpt.IsIgnoreKashida_CTL())
- rFlags |= TransliterationModulesExtra::ignoreKashida_CTL ;
+ rFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL ;
if ( bAsianOptions )
{
if ( aOpt.IsMatchHiraganaKatakana())
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5f92393..22f71be 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1228,9 +1228,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics))
- nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+ nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida))
- nFlags |= TransliterationModulesExtra::ignoreKashida_CTL;
+ nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter )
@@ -2182,9 +2182,9 @@ void SvxSearchDialog::SaveToModule_Impl()
nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics))
- nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+ nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida))
- nFlags |= TransliterationModulesExtra::ignoreKashida_CTL;
+ nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index cb86a82..5b8bf48 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -109,7 +109,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
SvtCTLOptions aCTLOptions;
sal_Int32 nFlags = 0;
nFlags |= (!aMatchCase ? static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
- nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 );
+ nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
lArgs[3].Value <<= nFlags;
lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
lArgs[4].Value <<= (sal_Int16)(aFindAll ?
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 5a9e6d6..7649094 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -287,9 +287,9 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
if ( IsIgnoreMiddleDot())
nRes |= TransliterationModules_ignoreMiddleDot_ja_JP;
if ( IsIgnoreDiacritics_CTL())
- nRes |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+ nRes |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if ( IsIgnoreKashida_CTL())
- nRes |= TransliterationModulesExtra::ignoreKashida_CTL;
+ nRes |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
return nRes;
}
commit 578cd010f504e4261c908c5bfbb46e035e22397f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 18:26:53 2014 +0200
Use valid UNOIDL identifiers in css.frame.Status.ItemState
These are present since OOo 2.0, but are unpublished and appear to be rarely
used, so changing them is hopefully OK.
Change-Id: I144eceb074cfdd91777f4c940cbfbc0dd73d4347
diff --git a/offapi/com/sun/star/frame/status/ItemState.idl b/offapi/com/sun/star/frame/status/ItemState.idl
index 16a2046..c12987a 100644
--- a/offapi/com/sun/star/frame/status/ItemState.idl
+++ b/offapi/com/sun/star/frame/status/ItemState.idl
@@ -34,15 +34,15 @@ constants ItemState
{
/** specifies an unknown state.
*/
- const short unknown = 0;
+ const short UNKNOWN = 0;
/** specifies that the property is currently disabled.
*/
- const short disabled = 1;
+ const short DISABLED = 1;
/** specifies that the property is currently read-only.
*/
- const short read_only = 2;
+ const short READ_ONLY = 2;
/** specifies that the property is currently in a don't care state.
@@ -51,15 +51,15 @@ constants ItemState
for a property at the same time.
</p>
*/
- const short dont_care = 16;
+ const short DONT_CARE = 16;
/** specifies that the property is currently in a default state.
*/
- const short default_value = 32;
+ const short DEFAULT_VALUE = 32;
/** specifies that the property is currently in a set state.
*/
- const short set = 64;
+ const short SET = 64;
};
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f9389bd..618ad66 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -813,7 +813,7 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::st
{
// Use special uno struct to transport don't care state
::com::sun::star::frame::status::ItemStatus aItemStatus;
- aItemStatus.State = ::com::sun::star::frame::status::ItemState::dont_care;
+ aItemStatus.State = ::com::sun::star::frame::status::ItemState::DONT_CARE;
aState = makeAny( aItemStatus );
}
@@ -902,7 +902,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
{
// Use special uno struct to transport don't care state
::com::sun::star::frame::status::ItemStatus aItemStatus;
- aItemStatus.State = ::com::sun::star::frame::status::ItemState::dont_care;
+ aItemStatus.State = ::com::sun::star::frame::status::ItemState::DONT_CARE;
aState = makeAny( aItemStatus );
}
commit f18158d76c0151feb9cc731e4148de5f8604f704
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 10 18:16:50 2014 +0200
Use valid UNOIDL identifier for XAccessibleGetAccFlowTo.get_AccFlowTo
...which is new in LO 4.3 and still unpublished (and has a comment that the
names should be renamed anyway).
Change-Id: I738d30974446578496400a176053b8d95dc96ab9
diff --git a/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
index 0ac0f94..5624677 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
@@ -28,7 +28,7 @@ module com { module sun { module star { module accessibility {
// !!!
interface XAccessibleGetAccFlowTo : ::com::sun::star::uno::XInterface
{
- sequence<any> get_AccFlowTo([in] any aXShape, [in] long nType);
+ sequence<any> getAccFlowTo([in] any aXShape, [in] long nType);
};
}; }; }; };
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 734d4e3..7ab94a0 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2461,7 +2461,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument::
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL ScAccessibleDocument::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL ScAccessibleDocument::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index bfd81f4..818ba75 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -326,7 +326,7 @@ public:
ScAddress GetCurCellAddress() const;
//===== XAccessibleGetAccFromXShape ============================================
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getForeground( )
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 4f688ff..562d489 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -958,7 +958,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL AccessibleDocumentViewBase::get_AccFlowTo(const ::com::sun::star::uno::Any&, sal_Int32 )
+ SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const ::com::sun::star::uno::Any&, sal_Int32 )
throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
::com::sun::star::uno::Sequence< uno::Any> aRet;
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 63a3b0e..1ee0033 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -892,7 +892,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing (void)
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL AccessibleDrawDocumentView::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index bf5236e..6d18732 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -373,7 +373,7 @@ protected:
::com::sun::star::accessibility::XAccessible>& xOLEObject);
//===== XAccessibleGetAccFromXShape ============================================
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
public:
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 44acc0b..f95b694 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -188,7 +188,7 @@ protected:
//===== XAccessibleGetAccFromXShape ============================================
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
GetSelAccContextInTable();
diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index 1ac4aee..4168f66f 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -62,7 +62,7 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
aAny <<= ( pSrchDlg->GetSrchFlag() );
const sal_Int32 FORFINDREPLACEFLOWTO = 2;
- uno::Sequence<uno::Any> aAnySeq = xGetAccFlowTo->get_AccFlowTo( aAny, FORFINDREPLACEFLOWTO );
+ uno::Sequence<uno::Any> aAnySeq = xGetAccFlowTo->getAccFlowTo( aAny, FORFINDREPLACEFLOWTO );
sal_Int32 nLen = aAnySeq.getLength();
if ( nLen )
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index ab3a1d2..5a3cdf8 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -840,7 +840,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL SwAccessibleDocument::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL SwAccessibleDocument::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw (::com::sun::star::uno::RuntimeException,
std::exception)
{
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index e1559e5..bb369dd 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -213,7 +213,7 @@ public:
// XAccessibleGetAccFlowTo
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw (::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
};
More information about the Libreoffice-commits
mailing list