sw/qa/extras/inc/swmodeltestbase.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 44d012aea378bbea7060100ec74e58423e2f6565 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Wed Apr 24 14:47:31 2013 +0200 add comment to the right function (result of mismerge?) Change-Id: I8574e679f6f4ef252ba0eda025b1991bc3e93df4 diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index aa36dde..c367b8f 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -178,7 +178,6 @@ protected: return nRet; } - // Get paragraph (counted from 1), optionally check it contains the given text. uno::Reference<text::XTextContent> getParagraphOrTable(int number, uno::Reference<text::XText> xText = uno::Reference<text::XText>()) const { uno::Reference<container::XEnumerationAccess> paraEnumAccess; @@ -199,6 +198,7 @@ protected: return xElem; } + // Get paragraph (counted from 1), optionally check it contains the given text. uno::Reference< text::XTextRange > getParagraph( int number, OUString content = OUString() ) const { uno::Reference<text::XTextRange> const xParagraph( commit b4c245881a37cb156998a46f1910a49579aab8ed Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Mon Apr 22 18:05:13 2013 +0200 remove executable bit Change-Id: I50ab7a08e680cb5a6354035a058240df15e10bd9 diff --git a/sw/qa/extras/ooxmlimport/data/fdo59638.docx b/sw/qa/extras/ooxmlimport/data/fdo59638.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/fdo61343.docx b/sw/qa/extras/ooxmlimport/data/fdo61343.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/n780645.docx b/sw/qa/extras/ooxmlimport/data/n780645.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/n785767.docx b/sw/qa/extras/ooxmlimport/data/n785767.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/n792778.docx b/sw/qa/extras/ooxmlimport/data/n792778.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/n793262.docx b/sw/qa/extras/ooxmlimport/data/n793262.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/n793998.docx b/sw/qa/extras/ooxmlimport/data/n793998.docx old mode 100755 new mode 100644 diff --git a/sw/qa/extras/ooxmlimport/data/tblr-height.docx b/sw/qa/extras/ooxmlimport/data/tblr-height.docx old mode 100755 new mode 100644
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits