diff options
Diffstat (limited to 'framework/source/xml/acceleratorconfigurationwriter.cxx')
| -rw-r--r-- | framework/source/xml/acceleratorconfigurationwriter.cxx | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 6092d40d5b54..c36c8b6a1eb7 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -20,12 +20,12 @@ #include <sal/config.h> #include <accelerators/keymapping.hxx> +#include <utility> #include <xml/acceleratorconfigurationwriter.hxx> #include <acceleratorconst.h> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <comphelper/attributelist.hxx> @@ -34,8 +34,8 @@ namespace framework{ AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, - const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) - : m_xConfig (xConfig ) + css::uno::Reference< css::xml::sax::XDocumentHandler > xConfig ) + : m_xConfig (std::move(xConfig )) , m_rContainer (rContainer ) { } @@ -52,17 +52,17 @@ void AcceleratorConfigurationWriter::flush() rtl::Reference<::comphelper::AttributeList> pAttribs = new ::comphelper::AttributeList; pAttribs->AddAttribute( - "xmlns:accel", ATTRIBUTE_TYPE_CDATA, - "http://openoffice.org/2001/accel"); + u"xmlns:accel"_ustr, + u"http://openoffice.org/2001/accel"_ustr); pAttribs->AddAttribute( - "xmlns:xlink", ATTRIBUTE_TYPE_CDATA, "http://www.w3.org/1999/xlink"); + u"xmlns:xlink"_ustr, u"http://www.w3.org/1999/xlink"_ustr); // generate xml xExtendedCFG->startDocument(); xExtendedCFG->unknown( - "<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD" - " OfficeDocument 1.0//EN\" \"accelerator.dtd\">"); + u"<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD" + " OfficeDocument 1.0//EN\" \"accelerator.dtd\">"_ustr); xExtendedCFG->ignorableWhitespace(OUString()); xExtendedCFG->startElement(AL_ELEMENT_ACCELERATORLIST, pAttribs); @@ -72,8 +72,8 @@ void AcceleratorConfigurationWriter::flush() AcceleratorCache::TKeyList lKeys = m_rContainer.getAllKeys(); for (auto const& lKey : lKeys) { - const OUString& rCommand = m_rContainer.getCommandByKey(lKey); - impl_ts_writeKeyCommandPair(lKey, rCommand, xExtendedCFG); + const OUString aCommand = m_rContainer.getCommandByKey(lKey); + impl_ts_writeKeyCommandPair(lKey, aCommand, xExtendedCFG); } /* TODO write key-command list @@ -87,6 +87,7 @@ void AcceleratorConfigurationWriter::flush() xExtendedCFG->endDocument(); } +// static void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) @@ -96,20 +97,20 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt: OUString sKey = KeyMapping::get().mapCodeToIdentifier(aKey.KeyCode); // TODO check if key is empty! - pAttribs->AddAttribute("accel:code", ATTRIBUTE_TYPE_CDATA, sKey ); - pAttribs->AddAttribute("xlink:href", ATTRIBUTE_TYPE_CDATA, sCommand); + pAttribs->AddAttribute(u"accel:code"_ustr, sKey ); + pAttribs->AddAttribute(u"xlink:href"_ustr, sCommand); if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT) - pAttribs->AddAttribute("accel:shift", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute(u"accel:shift"_ustr, u"true"_ustr); if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1) - pAttribs->AddAttribute("accel:mod1", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute(u"accel:mod1"_ustr, u"true"_ustr); if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2) - pAttribs->AddAttribute("accel:mod2", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute(u"accel:mod2"_ustr, u"true"_ustr); if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3) - pAttribs->AddAttribute("accel:mod3", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute(u"accel:mod3"_ustr, u"true"_ustr); xConfig->ignorableWhitespace(OUString()); xConfig->startElement(AL_ELEMENT_ITEM, pAttribs); |