summaryrefslogtreecommitdiff
path: root/framework/source/xml
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /framework/source/xml
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'framework/source/xml')
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx30
-rw-r--r--framework/source/xml/acceleratorconfigurationwriter.cxx28
2 files changed, 29 insertions, 29 deletions
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 1a6a38a19e9a..f61d574fa4e6 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -46,7 +46,7 @@ namespace framework{
*/
#define THROW_PARSEEXCEPTION(COMMENT) \
{ \
- ::rtl::OUStringBuffer sMessage(256); \
+ OUStringBuffer sMessage(256); \
sMessage.append (implts_getErrorLineString()); \
sMessage.appendAscii(COMMENT ); \
\
@@ -102,7 +102,7 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument()
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString& sElement ,
+void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement ,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
@@ -119,15 +119,15 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.")
m_bInsideAcceleratorItem = sal_True;
- ::rtl::OUString sCommand;
+ OUString sCommand;
css::awt::KeyEvent aEvent ;
sal_Int16 c = xAttributeList->getLength();
sal_Int16 i = 0;
for (i=0; i<c; ++i)
{
- ::rtl::OUString sAttribute = xAttributeList->getNameByIndex(i);
- ::rtl::OUString sValue = xAttributeList->getValueByIndex(i);
+ OUString sAttribute = xAttributeList->getNameByIndex(i);
+ OUString sValue = xAttributeList->getValueByIndex(i);
EXMLAttribute eAttribute = AcceleratorConfigurationReader::implst_classifyAttribute(sAttribute);
switch(eAttribute)
{
@@ -175,7 +175,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
// Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains
// multiple registrations for the same key :-) Show a warning ... and ignore the second item.
// THROW_PARSEEXCEPTION("Command is registered for the same key more then once.")
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Double registration detected.\nCommand = \"");
sMsg.append (sCommand );
sMsg.appendAscii("\"\nKeyCode = " );
@@ -198,7 +198,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& sElement)
+void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
@@ -222,22 +222,22 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString&
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::characters(const ::rtl::OUString&)
+void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const ::rtl::OUString&)
+void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const ::rtl::OUString& /*sTarget*/,
- const ::rtl::OUString& /*sData*/ )
+void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
+ const OUString& /*sData*/ )
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
@@ -252,7 +252,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno:
}
//-----------------------------------------------
-AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const ::rtl::OUString& sElement)
+AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement)
{
AcceleratorConfigurationReader::EXMLElement eElement;
@@ -269,7 +269,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl
}
//-----------------------------------------------
-AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const ::rtl::OUString& sAttribute)
+AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute)
{
AcceleratorConfigurationReader::EXMLAttribute eAttribute;
@@ -294,12 +294,12 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
}
//-----------------------------------------------
-::rtl::OUString AcceleratorConfigurationReader::implts_getErrorLineString()
+OUString AcceleratorConfigurationReader::implts_getErrorLineString()
{
if (!m_xLocator.is())
return DECLARE_ASCII("Error during parsing XML. (No further info available ...)");
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Error during parsing XML in\nline = ");
sMsg.append (m_xLocator->getLineNumber() );
sMsg.appendAscii("\ncolumn = " );
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 136373580dfb..70fa9ab70adf 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -72,10 +72,10 @@ void AcceleratorConfigurationWriter::flush()
xCFG->startDocument();
xExtendedCFG->unknown(DOCTYPE_ACCELERATORS);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->startElement(AL_ELEMENT_ACCELERATORLIST, xAttribs);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
// TODO think about threadsafe using of cache
AcceleratorCache::TKeyList lKeys = m_rContainer.getAllKeys();
@@ -85,7 +85,7 @@ void AcceleratorConfigurationWriter::flush()
++pKey )
{
const css::awt::KeyEvent& rKey = *pKey;
- const ::rtl::OUString& rCommand = m_rContainer.getCommandByKey(rKey);
+ const OUString& rCommand = m_rContainer.getCommandByKey(rKey);
impl_ts_writeKeyCommandPair(rKey, rCommand, xCFG);
}
@@ -95,43 +95,43 @@ void AcceleratorConfigurationWriter::flush()
WriteAcceleratorItem( *p );
*/
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->endElement(AL_ELEMENT_ACCELERATORLIST);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->endDocument();
}
//-----------------------------------------------
void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey ,
- const ::rtl::OUString& sCommand,
+ const OUString& sCommand,
const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig )
{
::comphelper::AttributeList* pAttribs = new ::comphelper::AttributeList;
css::uno::Reference< css::xml::sax::XAttributeList > xAttribs (static_cast< css::xml::sax::XAttributeList* >(pAttribs) , css::uno::UNO_QUERY_THROW);
- ::rtl::OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode);
+ OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode);
// TODO check if key is empty!
pAttribs->AddAttribute(AL_ATTRIBUTE_KEYCODE, ATTRIBUTE_TYPE_CDATA, sKey );
pAttribs->AddAttribute(AL_ATTRIBUTE_URL , ATTRIBUTE_TYPE_CDATA, sCommand);
if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, OUString("true"));
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
xConfig->startElement(AL_ELEMENT_ITEM, xAttribs);
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
xConfig->endElement(AL_ELEMENT_ITEM);
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
}
} // namespace framework