sw/qa/extras/inc/bordertest.hxx | 8 +++-----
sw/qa/extras/odfexport/odfexport.cxx | 2 --
sw/qa/extras/odfimport/odfimport.cxx | 8 +++-----
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2 --
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 --
sw/qa/extras/rtfexport/rtfexport.cxx | 4 ----
sw/qa/extras/rtfimport/rtfimport.cxx | 8 ++------
sw/qa/extras/swmodeltestbase.hxx | 16 ++++++++--------
sw/qa/extras/ww8export/ww8export.cxx | 2 --
sw/qa/extras/ww8import/ww8import.cxx | 4 ----
10 files changed, 16 insertions(+), 40 deletions(-)
New commits:
commit 1f75e264390c14bb6762f600756e7d0af78d7cf0
Author: Miklos Vajna <vmik...@suse.cz>
Date: Wed Sep 26 15:37:15 2012 +0200
sw: remove unneeded using statements in qa/extras
Change-Id: I23b77b9c8d245d84a045bdedda1584419f4fddda
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 3ac7c6e..bf97e72 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -30,13 +30,11 @@
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XTextTable.hpp>
-using rtl::OUString;
-
#ifndef bordertest_hxx
#define bordertest_hxx
-typedef std::map<rtl::OUString, com::sun::star::table::BorderLine>
BorderLineMap;
-typedef std::pair<rtl::OUString, com::sun::star::table::BorderLine>
StringBorderPair;
+typedef std::map<OUString, com::sun::star::table::BorderLine> BorderLineMap;
+typedef std::pair<OUString, com::sun::star::table::BorderLine>
StringBorderPair;
using namespace com::sun::star;
@@ -135,7 +133,7 @@ public:
if (xServiceInfo->supportsService("com.sun.star.text.TextTable"))
{
uno::Reference<text::XTextTable> const
xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
- uno::Sequence<rtl::OUString> const cells =
xTextTable->getCellNames();
+ uno::Sequence<OUString> const cells =
xTextTable->getCellNames();
uno::Sequence< uno::Sequence< sal_Int32 > >
borderWidthSequence;
sal_Int32 nLength = cells.getLength();
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 4792508..1a30dd5 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -29,8 +29,6 @@
#include <unotools/tempfile.hxx>
-using rtl::OUString;
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index daf82cc..d7a6c0e 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -30,10 +30,8 @@
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XTextTable.hpp>
-typedef std::map<rtl::OUString, com::sun::star::uno::Sequence<
com::sun::star::table::BorderLine> > AllBordersMap;
-typedef std::pair<rtl::OUString, com::sun::star::uno::Sequence<
com::sun::star::table::BorderLine> > StringSequencePair;
-
-using rtl::OUString;
+typedef std::map<OUString, com::sun::star::uno::Sequence<
com::sun::star::table::BorderLine> > AllBordersMap;
+typedef std::pair<OUString, com::sun::star::uno::Sequence<
com::sun::star::table::BorderLine> > StringSequencePair;
class Test : public SwModelTestBase
{
@@ -183,7 +181,7 @@ void Test::testOdtBorders()
if (xServiceInfo->supportsService("com.sun.star.text.TextTable"))
{
uno::Reference<text::XTextTable> const
xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
- uno::Sequence<rtl::OUString> const cells =
xTextTable->getCellNames();
+ uno::Sequence<OUString> const cells =
xTextTable->getCellNames();
uno::Sequence< uno::Sequence< sal_Int32 > >
borderWidthSequence;
sal_Int32 nLength = cells.getLength();
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 47246f8..c3d7fc4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -33,8 +33,6 @@
#include <unotools/tempfile.hxx>
-using rtl::OUString;
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f8f161f..fa388f3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -52,8 +52,6 @@
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) :
(((TWIP)*127L-36L)/72L))
-using rtl::OUStringBuffer;
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 67b6242..af4b50c 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -37,10 +37,6 @@
#include <unotools/tempfile.hxx>
#include <vcl/svapp.hxx>
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 873213b..68401dd 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -57,10 +57,6 @@
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) :
(((TWIP)*127L-36L)/72L))
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
class Test : public SwModelTestBase
{
public:
@@ -345,7 +341,7 @@ void Test::testFdo46662()
}
else if ( rProp.Name == "Suffix" )
{
- rtl::OUString sValue;
+ OUString sValue;
rProp.Value >>= sValue;
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength());
}
@@ -740,7 +736,7 @@ void Test::testFdo49692()
if (rProp.Name == "Suffix")
{
- rtl::OUString sValue;
+ OUString sValue;
rProp.Value >>= sValue;
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength());
diff --git a/sw/qa/extras/swmodeltestbase.hxx b/sw/qa/extras/swmodeltestbase.hxx
index 6ebd99c..e4e2a9b 100644
--- a/sw/qa/extras/swmodeltestbase.hxx
+++ b/sw/qa/extras/swmodeltestbase.hxx
@@ -102,7 +102,7 @@ protected:
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess>
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum =
xParaEnumAccess->createEnumeration();
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
while (xParaEnum->hasMoreElements())
{
uno::Reference<container::XEnumerationAccess>
xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
@@ -117,7 +117,7 @@ protected:
}
/// Get a family of styles, see com.sun.star.style.StyleFamilies for
possible values.
- uno::Reference<container::XNameAccess> getStyles(rtl::OUString aFamily)
+ uno::Reference<container::XNameAccess> getStyles(OUString aFamily)
{
uno::Reference<style::XStyleFamiliesSupplier>
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XNameAccess>
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
@@ -130,7 +130,7 @@ protected:
*
* If the attribute is omitted, the text of the node is returned.
*/
- rtl::OUString parseDump(rtl::OString aXPath, rtl::OString aAttribute =
OString())
+ OUString parseDump(rtl::OString aXPath, rtl::OString aAttribute =
OString())
{
if (!mpXmlBuffer)
dumpLayout();
@@ -142,11 +142,11 @@ protected:
xmlNodeSetPtr pXmlNodes = pXmlXpathObj->nodesetval;
CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
- rtl::OUString aRet;
+ OUString aRet;
if (aAttribute.getLength())
- aRet = rtl::OUString::createFromAscii((const
char*)xmlGetProp(pXmlNode, BAD_CAST(aAttribute.getStr())));
+ aRet = OUString::createFromAscii((const char*)xmlGetProp(pXmlNode,
BAD_CAST(aAttribute.getStr())));
else
- aRet = rtl::OUString::createFromAscii((const
char*)XML_GET_CONTENT(pXmlNode));
+ aRet = OUString::createFromAscii((const
char*)XML_GET_CONTENT(pXmlNode));
xmlFreeDoc(pXmlDoc);
@@ -154,7 +154,7 @@ protected:
}
template< typename T >
- T getProperty( uno::Any obj, const rtl::OUString& name ) const
+ T getProperty( uno::Any obj, const OUString& name ) const
{
uno::Reference< beans::XPropertySet > properties( obj, uno::UNO_QUERY
);
T data = T();
@@ -163,7 +163,7 @@ protected:
}
template< typename T >
- T getProperty( uno::Reference< uno::XInterface > obj, const rtl::OUString&
name ) const
+ T getProperty( uno::Reference< uno::XInterface > obj, const OUString& name
) const
{
uno::Reference< beans::XPropertySet > properties( obj, uno::UNO_QUERY
);
T data = T();
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index f8fbba9..b38c1f0 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -35,8 +35,6 @@
#include <unotools/tempfile.hxx>
-using rtl::OUString;
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index e208a9b..49c3ec0 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -37,10 +37,6 @@
#include <vcl/svapp.hxx>
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
class Test : public SwModelTestBase
{
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
