sw/qa/core/layout-test.cxx | 2 -
sw/qa/core/macros-test.cxx | 10 ++++----
sw/qa/extras/inc/bordertest.hxx | 4 +--
sw/qa/extras/mailmerge/mailmerge.cxx | 2 -
sw/qa/extras/odfimport/odfimport.cxx | 4 +--
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 6 ++--
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2 -
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 -
sw/qa/extras/uiwriter/uiwriter.cxx | 32 +++++++++++++-------------
9 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit dc5a6426fac6d6488ff764549dca898fb9d71b6f
Author: Noel Grandin <n...@peralex.com>
Date: Thu Nov 5 15:56:28 2015 +0200
com::sun::star->css in sw/qa/
Change-Id: I4a0282291c7737a981dbff0722228824904f07e4
Reviewed-on: https://gerrit.libreoffice.org/19804
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
index 6261e3f..db04d51 100644
--- a/sw/qa/core/layout-test.cxx
+++ b/sw/qa/core/layout-test.cxx
@@ -86,7 +86,7 @@ void SwLayoutTest::setUp()
m_xWriterComponent =
getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
- mxDesktop = com::sun::star::frame::Desktop::create(
comphelper::getComponentContext(getMultiServiceFactory()) );
+ mxDesktop = css::frame::Desktop::create(
comphelper::getComponentContext(getMultiServiceFactory()) );
}
void SwLayoutTest::tearDown()
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 89b9f0f..e6d21d9 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -126,7 +126,7 @@ void SwMacrosTest::testStarBasic()
OUString aFileExtension(aFileFormats[0].pName,
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
- uno::Reference< com::sun::star::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
+ uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
@@ -161,7 +161,7 @@ void SwMacrosTest::testVba()
{
OUString aFileName;
createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
- uno::Reference< com::sun::star::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
+ uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
OUStringBuffer sMsg( "Failed to load " );
sMsg.append ( aFileName );
CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(),
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -258,7 +258,7 @@ void SwMacrosTest::testControlShapeGrouping()
{
OUString aFileName;
createFileURL("testControlShapeGrouping.", "odt", aFileName);
- Reference< com::sun::star::lang::XComponent > xComponent(
+ Reference< css::lang::XComponent > xComponent(
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument"));
CPPUNIT_ASSERT(xComponent.is());
@@ -395,7 +395,7 @@ void SwMacrosTest::testFdo68983()
{
OUString aFileName;
createFileURL("fdo68983.", "odt", aFileName);
- Reference< com::sun::star::lang::XComponent > xComponent =
+ Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
CPPUNIT_ASSERT_MESSAGE("Failed to load fdo68983.odt", xComponent.is());
@@ -504,7 +504,7 @@ void SwMacrosTest::setUp()
m_xWriterComponent =
getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
- mxDesktop = com::sun::star::frame::Desktop::create(
comphelper::getComponentContext(getMultiServiceFactory()) );
+ mxDesktop = css::frame::Desktop::create(
comphelper::getComponentContext(getMultiServiceFactory()) );
}
void SwMacrosTest::tearDown()
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index fdee574..111bae2 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -14,8 +14,8 @@
#ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
-typedef std::map<OUString, com::sun::star::table::BorderLine> BorderLineMap;
-typedef std::pair<OUString, com::sun::star::table::BorderLine>
StringBorderPair;
+typedef std::map<OUString, css::table::BorderLine> BorderLineMap;
+typedef std::pair<OUString, css::table::BorderLine> StringBorderPair;
using namespace com::sun::star;
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 985b2f8..6f95565 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -200,7 +200,7 @@ protected:
// Returns page number of the first page of a MM document inside the large
MM document (used in the SHELL case).
int documentStartPageNumber( int document ) const;
- uno::Reference< com::sun::star::task::XJob > mxJob;
+ uno::Reference< css::task::XJob > mxJob;
uno::Sequence< beans::NamedValue > mSeqMailMergeArgs;
OUString mailMergeOutputURL;
OUString mailMergeOutputPrefix;
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index bc7b898..64be393 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -29,8 +29,8 @@
#include <olmenu.hxx>
#include <cmdid.h>
-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;
+typedef std::map<OUString, css::uno::Sequence< css::table::BorderLine> >
AllBordersMap;
+typedef std::pair<OUString, css::uno::Sequence< css::table::BorderLine> >
StringSequencePair;
class Test : public SwModelTestBase
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 63cd8ed2..de71773 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -613,7 +613,7 @@ DECLARE_OOXMLEXPORT_TEST(testImageCrop, "ImageCrop.docx")
{
uno::Reference<drawing::XShape> image = getShape(1);
uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY);
- ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+ css::text::GraphicCrop aGraphicCropStruct;
imageProperties->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropStruct;
@@ -742,7 +742,7 @@ DECLARE_OOXMLEXPORT_TEST(testGIFImageCrop,
"test_GIF_ImageCrop.docx")
#if !defined(MACOSX)
uno::Reference<drawing::XShape> image = getShape(1);
uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY);
- ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+ css::text::GraphicCrop aGraphicCropStruct;
imageProperties->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropStruct;
@@ -763,7 +763,7 @@ DECLARE_OOXMLEXPORT_TEST(testPNGImageCrop,
"test_PNG_ImageCrop.docx")
*/
uno::Reference<drawing::XShape> image = getShape(1);
uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY);
- ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+ css::text::GraphicCrop aGraphicCropStruct;
imageProperties->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropStruct;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index a247b21..90daf42 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -658,7 +658,7 @@ DECLARE_OOXMLEXPORT_TEST(testFixedDateFields,
"fixed-date-field.docx")
// Check fixed property was imported and date value was parsed correctly
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xField, "IsFixed"));
- com::sun::star::util::DateTime date =
getProperty<com::sun::star::util::DateTime>(xField, "DateTimeValue");
+ css::util::DateTime date = getProperty<css::util::DateTime>(xField,
"DateTimeValue");
CPPUNIT_ASSERT_EQUAL((sal_uInt16)24, date.Day);
CPPUNIT_ASSERT_EQUAL((sal_uInt16)7, date.Month);
CPPUNIT_ASSERT_EQUAL((sal_Int16)2014, date.Year);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9ab5746..6f1ea3e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1694,7 +1694,7 @@ DECLARE_OOXMLIMPORT_TEST(testChartProp, "chart-prop.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(8890), getProperty<sal_Int32>(xPropertySet,
"Height"));
}
-void lcl_countTextFrames(com::sun::star::uno::Reference< lang::XComponent >&
xComponent,
+void lcl_countTextFrames(css::uno::Reference< lang::XComponent >& xComponent,
sal_Int32 nExpected )
{
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(xComponent,
uno::UNO_QUERY);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 43da84f..0ff3ab5 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1138,7 +1138,7 @@ void SwUiWriterTest::testTdf51741()
void SwUiWriterTest::testDefaultsOfOutlineNumbering()
{
uno::Reference<text::XDefaultNumberingProvider>
xDefNum(m_xSFactory->createInstance("com.sun.star.text.DefaultNumberingProvider"),
uno::UNO_QUERY);
- com::sun::star::lang::Locale alocale;
+ css::lang::Locale alocale;
alocale.Language = "en";
alocale.Country = "US";
uno::Sequence<beans::PropertyValues>
aPropVal(xDefNum->getDefaultContinuousNumberingLevels(alocale));
@@ -1212,18 +1212,18 @@ void SwUiWriterTest::testXFlatParagraph()
//changing the attributes of last para
uno::Sequence<beans::PropertyValue> aDescriptor =
{
- beans::PropertyValue("CharWeight", sal_Int32(0),
uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
beans::PropertyState_DIRECT_VALUE)
+ beans::PropertyValue("CharWeight", sal_Int32(0),
uno::makeAny(float(css::awt::FontWeight::BOLD)),
beans::PropertyState_DIRECT_VALUE)
};
xFlatPara3->changeAttributes(sal_Int32(0), sal_Int32(5), aDescriptor);
//checking Language Portions
uno::Sequence<::sal_Int32>
aLangPortions(xFlatPara4->getLanguagePortions());
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aLangPortions.getLength());
//examining Language of text
- com::sun::star::lang::Locale alocale =
xFlatPara4->getLanguageOfText(sal_Int32(0), sal_Int32(4));
+ css::lang::Locale alocale = xFlatPara4->getLanguageOfText(sal_Int32(0),
sal_Int32(4));
CPPUNIT_ASSERT_EQUAL(OUString("en"), alocale.Language);
CPPUNIT_ASSERT_EQUAL(OUString("US"), alocale.Country);
//examining Primary Language of text
- com::sun::star::lang::Locale aprimarylocale =
xFlatPara4->getPrimaryLanguageOfText(sal_Int32(0), sal_Int32(20));
+ css::lang::Locale aprimarylocale =
xFlatPara4->getPrimaryLanguageOfText(sal_Int32(0), sal_Int32(20));
CPPUNIT_ASSERT_EQUAL(OUString("en"), aprimarylocale.Language);
CPPUNIT_ASSERT_EQUAL(OUString("US"), aprimarylocale.Country);
}
@@ -1231,7 +1231,7 @@ void SwUiWriterTest::testXFlatParagraph()
void SwUiWriterTest::testTdf81995()
{
uno::Reference<text::XDefaultNumberingProvider>
xDefNum(m_xSFactory->createInstance("com.sun.star.text.DefaultNumberingProvider"),
uno::UNO_QUERY);
- com::sun::star::lang::Locale alocale;
+ css::lang::Locale alocale;
alocale.Language = "en";
alocale.Country = "US";
uno::Sequence<uno::Reference<container::XIndexAccess>>
aIndexAccess(xDefNum->getDefaultOutlineNumberings(alocale));
@@ -1407,14 +1407,14 @@ void SwUiWriterTest::testTextSearch()
//setting some properties
uno::Sequence<beans::PropertyValue> aDescriptor =
{
- beans::PropertyValue("CharWeight", sal_Int32(0),
uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
beans::PropertyState_DIRECT_VALUE)
+ beans::PropertyValue("CharWeight", sal_Int32(0),
uno::makeAny(float(css::awt::FontWeight::BOLD)),
beans::PropertyState_DIRECT_VALUE)
};
xProp->setSearchAttributes(aDescriptor);
//receiving the defined properties and asserting them with expected
values, covering UNO
uno::Sequence<beans::PropertyValue>
aPropVal2(xProp->getSearchAttributes());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aPropVal2.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("CharWeight"), aPropVal2[0].Name);
-
CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
aPropVal2[0].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(css::awt::FontWeight::BOLD)),
aPropVal2[0].Value);
//specifying the search attributes
uno::Reference<beans::XPropertySet> xPropSet(xSearchDes,
uno::UNO_QUERY_THROW);
xPropSet->setPropertyValue("SearchWords", uno::makeAny(true));
@@ -1431,7 +1431,7 @@ void SwUiWriterTest::testTextSearch()
uno::Sequence<beans::PropertyValue>
aRepProp(xProp2->getReplaceAttributes());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRepProp.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("CharWeight"), aRepProp[0].Name);
-
CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(com::sun::star::awt::FontWeight::BOLD)),
aRepProp[0].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::makeAny(float(css::awt::FontWeight::BOLD)),
aRepProp[0].Value);
//setting strings for replacement
xReplaceDes->setSearchString("test");
xReplaceDes->setReplaceString("task");
@@ -1697,22 +1697,22 @@ void SwUiWriterTest::testSearchWithTransliterate()
aIdx = SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1);
aPaM = SwPaM(aIdx);
pDoc->getIDocumentContentOperations().InsertString(aPaM,"This is Other
PARAGRAPH");
- com::sun::star::util::SearchOptions SearchOpt;
- SearchOpt.algorithmType = com::sun::star::util::SearchAlgorithms_ABSOLUTE;
+ css::util::SearchOptions SearchOpt;
+ SearchOpt.algorithmType = css::util::SearchAlgorithms_ABSOLUTE;
SearchOpt.searchFlag = 0x00000001;
SearchOpt.searchString = "other";
SearchOpt.replaceString.clear();
SearchOpt.changedChars = 0;
SearchOpt.deletedChars = 0;
SearchOpt.insertedChars = 0;
- SearchOpt.transliterateFlags =
com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
+ SearchOpt.transliterateFlags =
css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
//transliteration option set so that at least one of the search strings is
not found
sal_uLong case1 =
pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
CPPUNIT_ASSERT_EQUAL(0,(int)case1);
SearchOpt.searchString = "paragraph";
- SearchOpt.transliterateFlags =
com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
+ SearchOpt.transliterateFlags =
css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
//transliteration option set so that all search strings are found
sal_uLong case2 =
pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
pShellCrsr = pWrtShell->getShellCrsr(true);
@@ -2191,7 +2191,7 @@ void SwUiWriterTest::testTdf90808()
//inserting the bookmark in same paragraph, at the end
//only one bookmark of this type is allowed in each paragraph an exception
of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the
other bookmark in same paragraph
xCrsr->gotoEndOfParagraph(true);
- CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xHeadingBookmark2,
true), com::sun::star::lang::IllegalArgumentException);
+ CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xHeadingBookmark2,
true), css::lang::IllegalArgumentException);
//now testing for __RefNumPara__
//creating bookmark 1
uno::Reference<text::XTextContent>
xNumBookmark1(xFact->createInstance("com.sun.star.text.Bookmark"),
uno::UNO_QUERY);
@@ -2208,7 +2208,7 @@ void SwUiWriterTest::testTdf90808()
//inserting the bookmark in same paragraph, at the end
//only one bookmark of this type is allowed in each paragraph an exception
of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the
other bookmark in same paragraph
xCrsr->gotoEndOfParagraph(true);
- CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xNumBookmark2, true),
com::sun::star::lang::IllegalArgumentException);
+ CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xNumBookmark2, true),
css::lang::IllegalArgumentException);
}
void SwUiWriterTest::testTdf75137()
@@ -2356,7 +2356,7 @@ void SwUiWriterTest::testTdf88899()
uno::Reference<document::XDocumentPropertiesSupplier>
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<document::XDocumentProperties>
xProps(xDocumentPropertiesSupplier->getDocumentProperties());
uno::Reference<beans::XPropertyContainer>
xUserProps(xProps->getUserDefinedProperties(), uno::UNO_QUERY);
- com::sun::star::util::DateTime aDateTime = {sal_uInt32(1234567),
sal_uInt16(3), sal_uInt16(3), sal_uInt16(3), sal_uInt16(10), sal_uInt16(11),
sal_uInt16(2014), true};
+ css::util::DateTime aDateTime = {sal_uInt32(1234567), sal_uInt16(3),
sal_uInt16(3), sal_uInt16(3), sal_uInt16(10), sal_uInt16(11), sal_uInt16(2014),
true};
xUserProps->addProperty("dateTime",
sal_Int16(beans::PropertyAttribute::OPTIONAL), uno::makeAny(aDateTime));
uno::Reference<lang::XMultiServiceFactory> xFact(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XTextField>
xTextField(xFact->createInstance("com.sun.star.text.textfield.docinfo.Custom"),
uno::UNO_QUERY);
@@ -2366,7 +2366,7 @@ void SwUiWriterTest::testTdf88899()
//Setting NumberFormat
uno::Reference<util::XNumberFormatsSupplier>
xNumberFormatsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<util::XNumberFormatTypes>
xNumFormat(xNumberFormatsSupplier->getNumberFormats(), uno::UNO_QUERY);
- com::sun::star::lang::Locale alocale;
+ css::lang::Locale alocale;
alocale.Language = "en";
alocale.Country = "US";
sal_Int16 key =
xNumFormat->getStandardFormat(util::NumberFormat::DATETIME, alocale);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
