diff options
Diffstat (limited to 'framework/source/xml/acceleratorconfigurationwriter.cxx')
-rw-r--r-- | framework/source/xml/acceleratorconfigurationwriter.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 6092d40d5b54..6ef30fe4fe66 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,10 +52,10 @@ void AcceleratorConfigurationWriter::flush() rtl::Reference<::comphelper::AttributeList> pAttribs = new ::comphelper::AttributeList; pAttribs->AddAttribute( - "xmlns:accel", ATTRIBUTE_TYPE_CDATA, + "xmlns:accel", "http://openoffice.org/2001/accel"); pAttribs->AddAttribute( - "xmlns:xlink", ATTRIBUTE_TYPE_CDATA, "http://www.w3.org/1999/xlink"); + "xmlns:xlink", "http://www.w3.org/1999/xlink"); // generate xml xExtendedCFG->startDocument(); @@ -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("accel:code", sKey ); + pAttribs->AddAttribute("xlink:href", sCommand); if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT) - pAttribs->AddAttribute("accel:shift", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute("accel:shift", "true"); if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1) - pAttribs->AddAttribute("accel:mod1", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute("accel:mod1", "true"); if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2) - pAttribs->AddAttribute("accel:mod2", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute("accel:mod2", "true"); if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3) - pAttribs->AddAttribute("accel:mod3", ATTRIBUTE_TYPE_CDATA, "true"); + pAttribs->AddAttribute("accel:mod3", "true"); xConfig->ignorableWhitespace(OUString()); xConfig->startElement(AL_ELEMENT_ITEM, pAttribs); |