connectivity/qa/connectivity/ado/DriverTest.cxx | 2 +- connectivity/qa/connectivity/mork/DriverTest.cxx | 4 ++-- oox/README | 10 +++++----- oox/source/core/xmlfilterbase.cxx | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 34bbf1a89e4c0219332b9e32f93b7326a2a7fcec Author: David Ostrovsky <[email protected]> Date: Sat Sep 20 11:51:22 2014 +0200 OOX: Update README with recently made changes Change-Id: I2f4db02ede9c15193c21014a297d40a7370a505b diff --git a/oox/README b/oox/README index 7489669..6d01ca5 100644 --- a/oox/README +++ b/oox/README @@ -150,12 +150,12 @@ the source code generation happens in these steps: * import cshape-all.pptx into impress and redirect output to custom-shapes.log - * generate cxx files by running generatePresetsCXX.pl - it uses - debug output from the custom-shapes.log file and prepares the C++ - source code + * generate oox-drawingml-cs-presets data file by running + generatePresetsData.pl - it uses debug output from the custom-shapes.log + file - * check generated source code files customshapepresets[123456].cxx - and move them to oox/source/drawingml/ + * check generated data file oox-drawingml-cs-presets and move them to + oox/source/drawingml/ * build oox with new source files and test commit cf7832d642b749473fe07f83071536ab2c32fb70 Author: David Ostrovsky <[email protected]> Date: Sat Sep 20 11:21:11 2014 +0200 Fix some typos Change-Id: I0f2821c87c03f8d3df2e60bab9e09ce6545e2b2c diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index c711581..c4fdf70 100644 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -117,7 +117,7 @@ void AdoDriverTest::test_select_default_all() Reference< XResultSet > xResultSet = xStatement->executeQuery(); if (!xResultSet.is()) { - CPPUNIT_ASSERT_MESSAGE("cannot execure sql statement!", xResultSet.is()); + CPPUNIT_ASSERT_MESSAGE("cannot execute sql statement!", xResultSet.is()); } Reference< XRow > xDelegatorRow(xResultSet, UNO_QUERY); diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx index 39d45b4..b1c9d9f 100644 --- a/connectivity/qa/connectivity/mork/DriverTest.cxx +++ b/connectivity/qa/connectivity/mork/DriverTest.cxx @@ -137,7 +137,7 @@ void MorkDriverTest::test_select_default_all() Reference< XResultSet > xResultSet = xStatement->executeQuery(); if (!xResultSet.is()) { - CPPUNIT_ASSERT_MESSAGE("cannot execure sql statement!", xResultSet.is()); + CPPUNIT_ASSERT_MESSAGE("cannot execute sql statement!", xResultSet.is()); } Reference< XRow > xDelegatorRow(xResultSet, UNO_QUERY); @@ -177,7 +177,7 @@ void MorkDriverTest::test_select_list_table_joe_doe_5() Reference< XResultSet > xResultSet = xStatement->executeQuery(); if (!xResultSet.is()) { - CPPUNIT_ASSERT_MESSAGE("cannot execure sql statement!", xResultSet.is()); + CPPUNIT_ASSERT_MESSAGE("cannot execute sql statement!", xResultSet.is()); } Reference< XRow > xDelegatorRow(xResultSet, UNO_QUERY); diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 545e444..bf82eef 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -161,7 +161,7 @@ void registerNamespaces( FastParser& rParser ) const Sequence< beans::Pair<OUString, sal_Int32> > ids = NamespaceIds::get(); // Filter out duplicates: a namespace can have multiple URL's, think of - // strict vs trasitional. + // strict vs traditional. std::set<sal_Int32> aSet; for (sal_Int32 i = 0; i < ids.getLength(); ++i) aSet.insert(ids[i].Second); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
