LibreOffice Gerrit News for submodules on 2014-07-02
Moin! ~~ Project dictionaries ~~ * Open changes on master for project dictionaries changed in the last 25 hours: None * Merged changes on master for project dictionaries changed in the last 25 hours: + Update the Swedish spelling dictionary in https://gerrit.libreoffice.org/10019 from Niklas Johansson * Abandoned changes on master for project dictionaries changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ Nothing moved in the project for the last 25 hours Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_connection.cxx| 16 -
mysqlc/source/mysqlc_connection.hxx| 10 -
mysqlc/source/mysqlc_databasemetadata.cxx | 12 -
mysqlc/source/mysqlc_databasemetadata.hxx |8
mysqlc/source/mysqlc_driver.cxx|2
mysqlc/source/mysqlc_preparedstatement.cxx |2
mysqlc/source/mysqlc_services.cxx |2
mysqlc/source/mysqlc_statement.cxx |4
mysqlc/source/mysqlc_subcomponent.hxx |2
mysqlc/source/mysqlc_types.cxx | 274 ++---
mysqlc/source/mysqlc_types.hxx |8
11 files changed, 170 insertions(+), 170 deletions(-)
New commits:
commit dbf99dfb980f772250e8ec4792c1bf5a1458629b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 08:42:58 2014 +0200
mysqlc: sal_Bool - bool
Change-Id: Ie479e1671b03fbb958886d4c01ecff41b2ad1d23
diff --git a/mysqlc/source/mysqlc_connection.cxx
b/mysqlc/source/mysqlc_connection.cxx
index f8274f4..9773703 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -67,9 +67,9 @@ OConnection::OConnection(MysqlCDriver _rDriver, sql::Driver
* _cppDriver)
,m_xMetaData(NULL)
,m_rDriver(_rDriver)
,cppDriver(_cppDriver)
-,m_bClosed(sal_False)
-,m_bUseCatalog(sal_False)
-,m_bUseOldDateFormat(sal_False)
+,m_bClosed(false)
+,m_bUseCatalog(false)
+,m_bUseOldDateFormat(false)
{
OSL_TRACE(OConnection::OConnection);
m_rDriver.acquire();
@@ -106,7 +106,7 @@ void OConnection::construct(const OUString url, const
Sequence PropertyValue
MutexGuard aGuard(m_aMutex);
sal_Int32 nIndex;
-sal_Bool bEmbedded = sal_False;
+bool bEmbedded = false;
OUString token;
OUString aHostName(localhost);
sal_Int32 nPort = 3306;
@@ -121,7 +121,7 @@ void OConnection::construct(const OUString url, const
Sequence PropertyValue
if (url.startsWith(MYSQLC_URI_PREFIX)) {
nIndex = 12;
} else {
-bEmbedded = sal_True;
+bEmbedded = true;
nIndex = 20;
mysqlc_sdbc_driver::throwFeatureNotImplementedException(OConnection::construct
(embedded MySQL), *this);
}
@@ -169,7 +169,7 @@ void OConnection::construct(const OUString url, const
Sequence PropertyValue
}
}
-if (bEmbedded == sal_False) {
+if (!bEmbedded) {
try {
sql::ConnectOptionsMap connProps;
std::string host_str = OUStringToOString(aHostName,
m_settings.encoding).getStr();
@@ -348,7 +348,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-sal_Bool autoCommit = sal_False;
+bool autoCommit = false;
try {
autoCommit = m_settings.cppConnection-getAutoCommit() == true ?
sal_True : sal_False;
} catch (const sql::SQLException e) {
@@ -651,7 +651,7 @@ void OConnection::disposing()
}
m_aStatements.clear();
-m_bClosed = sal_True;
+m_bClosed = true;
m_xMetaData = WeakReference XDatabaseMetaData ();
dispose_ChildImpl();
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 3625341..05eb3bd 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -77,7 +77,7 @@ namespace connectivity
OUString schema;
OUString quoteIdentifier;
OUString connectionURL;
-sal_Bool readOnly;
+bool readOnly;
};
class MysqlCDriver;
@@ -115,9 +115,9 @@ namespace connectivity
MysqlCDriver m_rDriver; // Pointer to the owning driver
object
sql::Driver*cppDriver;
-sal_Boolm_bClosed;
-sal_Boolm_bUseCatalog; // should we use the catalog on
filebased databases
-sal_Boolm_bUseOldDateFormat;
+boolm_bClosed;
+boolm_bUseCatalog; // should we use the catalog on filebased
databases
+boolm_bUseOldDateFormat;
voidbuildTypeInfo() throw(SQLException);
@@ -227,7 +227,7 @@ namespace connectivity
OUString transFormPreparedStatement(const OUString _sSQL);
// should we use the catalog on filebased databases
-inline sal_Bool isCatalogUsed() const { return
m_bUseCatalog; }
+inline bool isCatalogUsed() const { return
m_bUseCatalog; }
inline OUString getUserName() const { return
m_sUser; }
inline const MysqlCDriver getDriver() const { return
m_rDriver;}
inline rtl_TextEncoding getTextEncoding() const { return
m_settings.encoding; }
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx
b/mysqlc/source/mysqlc_databasemetadata.cxx
index 01cda36..46a4d87 100644
---
[Libreoffice-commits] dev-tools.git: scripts/annotate.pl
scripts/annotate.pl |2 --
1 file changed, 2 deletions(-)
New commits:
commit b410eced21f8bc3a99c0f385f0759b5e2f8d18d5
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 09:28:46 2014 +0200
annotate.pl: remove redundant output
diff --git a/scripts/annotate.pl b/scripts/annotate.pl
index fc07b36..14e36e3 100755
--- a/scripts/annotate.pl
+++ b/scripts/annotate.pl
@@ -230,8 +230,6 @@ if (!$list !$stats !$fetch) {
exit 1;
}
-print $note_text' '$note_hash\n;
-
validate_check_note($note_text);
validate_git_hash($note_hash) ||
die Hash on master '$note_hash' doesn't look like a git hash\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svtools/source
svtools/source/svhtml/parhtml.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 32eddb3f48fcea0a052401a8a5dc075c7847f1c5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 1 12:50:45 2014 +0100
fix detection of Salesforce html
Change-Id: Ie777c253e221527cba8affaf766e2eddfc78c103
Reviewed-on: https://gerrit.libreoffice.org/10012
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index 54c1548..13a56c3 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1925,6 +1925,16 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
sCmp = sCmp.toAsciiLowerCase();
+sal_Char c;
+sal_Int32 nPos;
+for (nPos = 0; nPos sCmp.getLength(); ++nPos)
+{
+c = sCmp[nPos];
+if (c != ' ' c != '\n' c != '\t' c != '\r' c != '\f')
+break;
+}
+sCmp = sCmp.copy(nPos);
+
// A HTML document must have a '' in the first line
sal_Int32 nStart = sCmp.indexOf('');
if (nStart == -1)
@@ -1932,8 +1942,6 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
nStart++;
// followed by arbitrary characters followed by a blank or ''
-sal_Char c;
-sal_Int32 nPos;
for( nPos = nStart; nPos sCmp.getLength(); ++nPos )
{
if( ''==(c=sCmp[nPos]) || HTML_ISSPACE(c) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo80522.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 39 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 18 ++
5 files changed, 57 insertions(+)
New commits:
commit f11d6421e4e61ce6f557ebd8272485f79968224e
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date: Thu Jun 26 18:07:26 2014 +0530
fdo#80522 fdo#80523:Embedded Macro-Enabled objects are not preserved
Description :
fdo#80522
- DOCX contain embedded word Macro-Enabled document.
- Embedded word Macro-Enabled object is not preserved.
- .docm preserved as .bin so word Macro-Enabled document is converted to
picture.
fdo#80523
1) Embedded PowerPoint Macro-Enabled Slide
- DOCX contain embedded PowerPoint Macro-Enabled Slide
- Embedded PowerPoint Macro-Enabled Slide is not preserved.
- .sldm preserved as .bin so powerpoint Macro-Enabled slide is converted
to picture.
2) Embedded PowerPoint Macro-Enabled Presentation
- same case with embedded PowerPoint Macro-Enabled Presentation
- Embedded PowerPoint Macro-Enabled presentation is not preserved.
- .pptm preserved as .pptx so powerpoint Macro-Enabled presentation is
converted to picture .
Implementation :
Added sMediaType, sRelationType sFileExtension for these embedded objects.
Change-Id: Ia58662ba921f3d940e8ead04a7f7ae83689a3b35
Reviewed-on: https://gerrit.libreoffice.org/9917
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80522.docx
b/sw/qa/extras/ooxmlexport/data/fdo80522.docx
new file mode 100644
index 000..9445b73
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80522.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
b/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
new file mode 100644
index 000..3140f3b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx
b/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx
new file mode 100644
index 000..e50cda1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8683d56..0d03eb4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3680,6 +3680,45 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm,
fdo79969_xlsm.docx)
/word/embeddings/oleObject1.xlsm);
}
+DECLARE_OOXMLEXPORT_TEST(testfdo80522,fdo80522.docx)
+{
+ xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-word.document.macroEnabled.12'],
+PartName,
+/word/embeddings/oleObject1.docm);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,fdo80523_pptm.docx)
+{
+ xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.presentation.macroEnabled.12'],
+PartName,
+/word/embeddings/oleObject1.pptm);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,fdo80523_sldm.docx)
+{
+ xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.slide.macroEnabled.12'],
+PartName,
+/word/embeddings/oleObject1.sldm);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index fcd5794..1ff9d84 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4357,6 +4357,12 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
sFileExtension = pptx;
}
+else if(sProgID == PowerPoint.ShowMacroEnabled.12)
+{
+sMediaType =
application/vnd.ms-powerpoint.presentation.macroEnabled.12;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+sFileExtension = pptm;
+}
else if( sProgID.startsWith(PowerPoint.Show) )
{
sMediaType = application/vnd.ms-powerpoint;
@@
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo78758.rtf |9 ++
sw/qa/extras/rtfexport/rtfexport.cxx | 10 +++
sw/source/filter/ww8/attributeoutputbase.hxx |2 -
sw/source/filter/ww8/docxattributeoutput.cxx |2 -
sw/source/filter/ww8/docxattributeoutput.hxx |2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 37 +--
sw/source/filter/ww8/rtfattributeoutput.hxx |9 --
sw/source/filter/ww8/wrtw8esh.cxx|2 -
sw/source/filter/ww8/wrtw8nds.cxx|4 +-
sw/source/filter/ww8/wrtww8gr.cxx|2 -
sw/source/filter/ww8/ww8attributeoutput.hxx |2 -
11 files changed, 47 insertions(+), 34 deletions(-)
New commits:
commit f9d7927c615a0998456f2d72b4d88c16a0314c24
Author: Michael Stahl mst...@redhat.com
Date: Fri Jun 27 16:02:45 2014 +0200
fdo#78758: sw: RTF export: don't export multiple \fldrst for one hyperlink
Ensure that we export only one \fldresult per hyperlink by doing that in
StartURL() and EndURL(); the TextINetFormat() is called once per text
portion. This shouldn't cause problems as there can't be anything
between the end of the \field group and the start of \fldresult anyway.
Replace the annoying call to EndURL() from EndRun() with a special case
in EndURL() to store things in the right buffer (hopefully).
(somehow this is regression from c4498251cb7181a9f272b0720f398597c0daef09)
(cherry picked from commit b8907bf3d3b37c686a414ffbbd2d732348aab5b9)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.hxx
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.hxx
sw/source/filter/ww8/ww8attributeoutput.hxx
Change-Id: I209ea7a384fb1cb5d1505a70ecc4a4536bbf26a2
Reviewed-on: https://gerrit.libreoffice.org/10021
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/rtfexport/data/fdo78758.rtf
b/sw/qa/extras/rtfexport/data/fdo78758.rtf
new file mode 100644
index 000..49c0502
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo78758.rtf
@@ -0,0 +1,9 @@
+{\rtf1\ansi
+\par \pard\plain
+{{\field{\*\fldinst HYPERLINK #__RefHeading___Toc264438068 }
+{\fldrslt {\langfe1024\rtlch \ltrch\loch\lang1024
+EE5E EeEEE5EE}{\scaps\langfe1024\rtlch \ltrch\loch\lang1024
+e}{\langfe1024\rtlch \ltrch\loch\lang1024
+\tab 46
+\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index a3fb2cb..e535374 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -457,6 +457,16 @@ DECLARE_RTFEXPORT_TEST(testHyperlink, hyperlink.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(),
getPropertyOUString(getRun(getParagraph(1), 3, !), HyperLinkURL));
}
+DECLARE_RTFEXPORT_TEST(test78758, fdo78758.rtf)
+{
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 1, EE5E EeEEE5EE),
HyperLinkURL));
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 2, e),
HyperLinkURL));
+CPPUNIT_ASSERT_EQUAL(OUString(#__RefHeading___Toc264438068),
+getPropertyOUString(getRun(getParagraph(2), 3, \t46),
HyperLinkURL));
+}
+
DECLARE_RTFEXPORT_TEST(testTextFrameBorders, textframe-borders.rtf)
{
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 34e62ee..dce83ba 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -208,7 +208,7 @@ public:
virtual bool StartURL( const OUString rUrl, const OUString rTarget ) = 0;
/// Output URL end.
-virtual bool EndURL() = 0;
+virtual bool EndURL(bool isAtEndOfParagraph) = 0;
virtual void FieldVanish( const OUString rTxt, ww::eField eType ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 054e946..2056863 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1437,7 +1437,7 @@ bool DocxAttributeOutput::StartURL( const OUString rUrl,
const OUString rTarge
return true;
}
-bool DocxAttributeOutput::EndURL()
+bool DocxAttributeOutput::EndURL(bool const)
{
m_closeHyperlinkInThisRun = true;
return true;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 2099116..5da7715 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -162,7 +162,7 @@ public:
virtual bool StartURL( const OUString rUrl, const OUString rTarget );
/// Output URL end.
-virtual bool EndURL();
+virtual bool
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - vcl/source
vcl/source/app/settings.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 07fee9d02dfd96fb8719ce5b151f4c1199c90d8e
Author: Rachit Gupta rachitgupta1...@gmail.com
Date: Wed Jul 2 14:01:59 2014 +0530
Added feature of clearing the registry in case something goes wrong.
If the installed extension is removed, then the persona settings in
the registry are cleared to avoid odd look in the UI.
Change-Id: Iaa99f4c87ec6ce4a663e1a3cebb3f8ff45e02079
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index fbcb7a6..41a2484 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2163,6 +2163,16 @@ static void setupPersonaHeaderFooter( WhichPersona
eWhich, OUString rHeaderFoot
if ( rHeaderFooterBitmap.IsEmpty() )
rHeaderFooterBitmap = readBitmapEx( $BRAND_BASE_DIR/
LIBO_ETC_FOLDER / + aName );
}
+
+// Something went wrong. Probably, the images are missing. Clear the
persona properties in the registry.
+
+if( rHeaderFooterBitmap.IsEmpty() )
+{
+boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
+officecfg::Office::Common::Misc::Persona::set( no, batch );
+officecfg::Office::Common::Misc::PersonaSettings::set( , batch );
+batch-commit();
+}
}
const BitmapEx StyleSettings::GetPersonaHeader() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - connectivity/source include/tools include/vcl rsc/inc rsc/source vcl/source
connectivity/source/drivers/file/FResultSet.cxx |3 +-
connectivity/source/drivers/odbc/OPreparedStatement.cxx |5 +---
connectivity/source/drivers/odbc/OStatement.cxx | 20
connectivity/source/inc/file/FResultSet.hxx |3 +-
connectivity/source/inc/odbc/OPreparedStatement.hxx |3 +-
connectivity/source/inc/odbc/OStatement.hxx | 11
include/tools/rcid.h|2 -
include/vcl/fixed.hxx |4 ---
rsc/inc/rscdb.hxx |1
rsc/source/parser/rscicpx.cxx | 20
rsc/source/parser/rscinit.cxx |4 ---
vcl/source/control/fixed.cxx| 12 -
12 files changed, 25 insertions(+), 63 deletions(-)
New commits:
commit 6a6d83ace33789de951f8655be0108f70108660e
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 09:33:29 2014 +0100
coverity#706374 Uncaught exception
Change-Id: Ie17e29e6893c6f69f176d77fab9dcb6a90cb432b
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx
b/connectivity/source/drivers/odbc/OStatement.cxx
index 390f2c3..2855ddf 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -196,8 +196,8 @@ void SAL_CALL OStatement::clearBatch( )
throw(SQLException, RuntimeException, s
}
-
-void OStatement_Base::reset() throw (SQLException)
+void OStatement_Base::reset()
+throw (SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/odbc/OStatement.hxx
b/connectivity/source/inc/odbc/OStatement.hxx
index 511b8db..16b9317 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -103,7 +103,7 @@ namespace connectivity
virtual void setResultSetType(sal_Int32 _par0) ;
virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ;
-void reset () throw( ::com::sun::star::sdbc::SQLException);
+void reset() throw (css::sdbc::SQLException,
css::uno::RuntimeException);
void clearMyResultSet() throw (css::sdbc::SQLException,
css::uno::RuntimeException);
void setWarning (const ::com::sun::star::sdbc::SQLWarning ex)
throw (css::sdbc::SQLException, css::uno::RuntimeException);
commit 7501ee9d9daf69915385d2ea2c9f54be9bdd78b1
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 09:32:39 2014 +0100
coverity#706373 Uncaught exception
Change-Id: Iee4774dffd43be3fc3eacbcc81f150706625fcad
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx
b/connectivity/source/drivers/odbc/OStatement.cxx
index 1398efa..390f2c3 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -217,9 +217,8 @@ void OStatement_Base::reset() throw (SQLException)
// clearMyResultSet
// If a ResultSet was created for this Statement, close it
-
-
-void OStatement_Base::clearMyResultSet () throw (SQLException)
+void OStatement_Base::clearMyResultSet()
+throw (SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/odbc/OStatement.hxx
b/connectivity/source/inc/odbc/OStatement.hxx
index 8cfc760..511b8db 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -104,7 +104,7 @@ namespace connectivity
virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ;
void reset () throw( ::com::sun::star::sdbc::SQLException);
-void clearMyResultSet () throw(
::com::sun::star::sdbc::SQLException);
+void clearMyResultSet() throw (css::sdbc::SQLException,
css::uno::RuntimeException);
void setWarning (const ::com::sun::star::sdbc::SQLWarning ex)
throw (css::sdbc::SQLException, css::uno::RuntimeException);
bool lockIfNecessary (const OUString sql) throw(
::com::sun::star::sdbc::SQLException);
commit 051a8f9577fb133a4356d94965cc76a7a287c2e4
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 09:31:43 2014 +0100
coverity#706371 Uncaught exception
Change-Id: I201972b1acb336b3002faca312c658f28671
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx
b/connectivity/source/drivers/odbc/OStatement.cxx
index 3e1f829..1398efa 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -310,9 +310,8 @@ void OStatement_Base::setWarning (const SQLWarning ex)
// getColumnCount
// Return the number of columns in the ResultSet
-
-
-sal_Int32
[Libreoffice-commits] core.git: dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source include/svtools svtools/source
dbaccess/AllLangResTarget_dbu.mk |1
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/CollectionView.cxx | 73 +++-
dbaccess/source/ui/dlg/CollectionView.hrc | 43
dbaccess/source/ui/dlg/CollectionView.src | 151 -
dbaccess/source/ui/dlg/dbadmin2.src| 10 +
dbaccess/source/ui/imagelists/dbimagelists.src | 14 +
dbaccess/source/ui/inc/CollectionView.hxx | 17 -
dbaccess/uiconfig/ui/collectionviewdialog.ui | 219 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/svtools/fileview.hxx |4
include/svtools/svtools.hrc|2
svtools/source/contnr/fileview.cxx | 31 ++-
svtools/source/contnr/templwin.cxx |2
svtools/source/contnr/templwin.src |5
15 files changed, 313 insertions(+), 263 deletions(-)
New commits:
commit a5cc3ce566f1a1ebd5995582efed104fb2793fb0
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Mon Jun 30 15:53:56 2014 +0200
Convert DLG_COLLECTION_VIEW to .ui
Conflicts:
include/svtools/fileview.hxx
svtools/source/contnr/fileview.cxx
Change-Id: I78b590410ec4e55eeecd2da8ab79738f05e403b5
Reviewed-on: https://gerrit.libreoffice.org/9981
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 5e7448e..9cc5850 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/control/undosqledit.src \
dbaccess/source/ui/dlg/admincontrols.src \
dbaccess/source/ui/dlg/AutoControls.src \
-dbaccess/source/ui/dlg/CollectionView.src \
dbaccess/source/ui/dlg/ConnectionPage.src \
dbaccess/source/ui/dlg/dbadmin2.src \
dbaccess/source/ui/dlg/dbadminsetup.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 8919127..197e4a3 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/applycolpage \
dbaccess/uiconfig/ui/choosedatasourcedialog \
+dbaccess/uiconfig/ui/collectionviewdialog \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/copytablepage \
dbaccess/uiconfig/ui/dbaseindexdialog \
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 379e0a2..6d82fc5 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -18,7 +18,6 @@
*/
#include CollectionView.hxx
-#include CollectionView.hrc
#include tools/debug.hxx
#include tools/diagnose_ex.h
#include moduledbu.hxx
@@ -60,42 +59,36 @@ OCollectionView::OCollectionView( Window * pParent
,const Reference XContent _xContent
,const OUString _sDefaultName
,const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext _rxContext)
-: ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW))
-, m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
-, m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
-, m_aUp(this, ModuleRes( BTN_EXPLORERFILE_UP ) )
-, m_aView( this, ModuleRes( CTRL_VIEW ), FILEVIEW_SHOW_ONLYTITLE )
-, m_aFTName(this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
-, m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
-, m_aFL(this, ModuleRes( FL_1 ) )
-, m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) )
-, m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) )
-, m_aPB_HELP( this, ModuleRes( PB_HELP ) )
-, m_sPath( ModuleRes( STR_PATHNAME ) )
+: ModalDialog( pParent, CollectionView,
dbaccess/ui/collectionviewdialog.ui)
, m_xContent(_xContent)
, m_xContext(_rxContext)
, m_bCreateForm(true)
{
-FreeResource();
+get(m_pFTCurrentPath, currentPathLabel);
+get(m_pNewFolder, newFolderButton);
+get(m_pUp, upButton);
+get(m_pView, viewTreeview);
+get(m_pName, fileNameEntry);
+get(m_pPB_OK, ok);
OSL_ENSURE(m_xContent.is(),No valid content!);
-m_aView.Initialize(m_xContent,OUString());
-m_aFTCurrentPath.SetStyle( m_aFTCurrentPath.GetStyle() | WB_PATHELLIPSIS );
+m_pView-Initialize(m_xContent,OUString());
+m_pFTCurrentPath-SetStyle( m_pFTCurrentPath-GetStyle() | WB_PATHELLIPSIS
);
initCurrentPath();
-m_aName.SetText(_sDefaultName);
-m_aName.GrabFocus();
+m_pName-SetText(_sDefaultName);
+m_pName-GrabFocus();
-
[Libreoffice-commits] core.git: 2 commits - dbaccess/inc helpcontent2
dbaccess/inc/dbaccess_helpid.hrc |1 - helpcontent2 |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 263039f30b3cf8a1684cec3c9d1d174755f35973 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 09:49:36 2014 +0100 drop unused helpid Change-Id: I609d1de30ad6e99f664d0a0fb853ea06a581e85e diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 873e657..b99138f 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -162,7 +162,6 @@ #define HID_DSADMIN_PORTNUMBER DBACCESS_HID_DSADMIN_PORTNUMBER #define HID_APP_HELP_TEXT DBACCESS_HID_APP_HELP_TEXT -#define HID_EXPLORERDLG_COLLECTION DBACCESS_HID_EXPLORERDLG_COLLECTION #define UID_APP_DATABASE_VIEW DBACCESS_UID_APP_DATABASE_VIEW #define UID_APP_TASKS_VIEW DBACCESS_UID_APP_TASKS_VIEW #define UID_APP_CONTAINER_VIEW DBACCESS_UID_APP_CONTAINER_VIEW commit 6ecc9dbc06538c91871dd27d325d2b6be2e7f40d Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 09:53:07 2014 +0100 Updated core Project: help 0f1f83aefafb087df4b324437de11c7217f77d1a diff --git a/helpcontent2 b/helpcontent2 index 4afc42f..0f1f83a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4afc42f9eb3f50b542f22414045856bfc588855e +Subproject commit 0f1f83aefafb087df4b324437de11c7217f77d1a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/explorer/database/menufilesave.xhp |9 + 2 files changed, 5 insertions(+), 9 deletions(-) New commits: commit 0f1f83aefafb087df4b324437de11c7217f77d1a Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 09:53:07 2014 +0100 update help ids for collection view .ui conversion Change-Id: I09e7a1ee6f3277eff5afbcda163cee2b2abdf2b9 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ff90cf3..401e55d 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1369,7 +1369,6 @@ HID_EVT_SUBMITTED,38086, HID_EVT_TEXTCHANGED,38087, HID_EVT_UNLOADED,38088, HID_EVT_UNLOADING,38099, -HID_EXPLORERDLG_COLLECTION,39037, HID_EXPLORERDLG_FILE,32998, HID_EXTENSION_MANAGER_LISTBOX,42791, HID_EXTENSION_MANAGER_LISTBOX_DISABLE,42794, @@ -5029,7 +5028,6 @@ dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589, dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588, dbaccess_Edit_DLG_ADABASSTAT_ET_SYSDEVSPACE,1388611585, dbaccess_Edit_DLG_ADABASSTAT_ET_TRANSACTIONLOG,1388611586, -dbaccess_Edit_DLG_COLLECTION_VIEW_ED_EXPLORERFILE_FILENAME,1388759041, dbaccess_Edit_DLG_DOMAINPASSWORD_ET_PASSWORD,1388709890, dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596, dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681, @@ -5044,8 +5042,6 @@ dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059, dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928, dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392, dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080, -dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_NEWFOLDER,1388768769, -dbaccess_ImageButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_UP,1388768770, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN,851635725, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727, dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724, @@ -5066,7 +5062,6 @@ dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778, dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777, dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153, dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697, -dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241, dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626, diff --git a/source/text/shared/explorer/database/menufilesave.xhp b/source/text/shared/explorer/database/menufilesave.xhp index 240a8c3..3256351 100644 --- a/source/text/shared/explorer/database/menufilesave.xhp +++ b/source/text/shared/explorer/database/menufilesave.xhp @@ -31,18 +31,19 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/dbaccess/ui/collectionviewdialog/CollectionView id=bm_id2862637 localize=false/ paragraph role=heading id=par_idN10547 xml-lang=en-US level=1 l10n=NEWSave/paragraph paragraph role=paragraph id=par_idN1054B xml-lang=en-US l10n=NEWIn this dialog, you can specify the position and name of a form commentUFI: spec says also for report, but reports can be created only by Wizard and are autosaved there/commentcommentUFI: spec says also for query, cannot verify/comment that you save within a link href=text/shared/explorer/database/dabadoc.xhpdatabase file/link. The dialog opens automatically when you save a form the first time.commentUFI: no chance to open the dialog a second time/comment/paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER id=bm_id2862636 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/collectionviewdialog/newFolderButton id=bm_id2862636 localize=false/ paragraph role=heading id=par_idN10564 xml-lang=en-US level=2 l10n=NEWCreate New Directory/paragraph paragraph role=paragraph id=par_idN10568 xml-lang=en-US l10n=NEWahelp hid=.Click to create a new folder within the database file./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP id=bm_id2447279 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/collectionviewdialog/upButton id=bm_id2447279 localize=false/ paragraph role=heading id=par_idN1057F xml-lang=en-US level=2 l10n=NEWUp One Level/paragraph paragraph role=paragraph id=par_idN10583 xml-lang=en-US l10n=NEWahelp hid=.Click to go up one level in the folder hierarchy./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME id=bm_id1669362 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/collectionviewdialog/fileNameEntry id=bm_id1669362 localize=false/ paragraph role=heading id=par_idN1059A xml-lang=en-US level=2 l10n=NEWFile name/paragraph paragraph role=paragraph id=par_idN1059E xml-lang=en-US l10n=NEWahelp hid=.Enter the file name for the saved
[Libreoffice-commits] core.git: 2 commits - android/Bootstrap android/experimental desktop/source
android/Bootstrap/src/org/libreoffice/kit/Document.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 134 +++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 33 -
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java
|4
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoGLLayerClient.java
| 265 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
| 174 ++
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java
| 151 +
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java
|4
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
|1
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
| 86 ---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
| 15
desktop/source/lib/lokandroid.cxx
| 10
12 files changed, 244 insertions(+), 635 deletions(-)
New commits:
commit b8ce647194c3c0f715296bee540ff18cfefa3497
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Wed Jul 2 11:11:56 2014 +0200
LOAndroid3: add tiled rendering from document - one tile first
Change-Id: Ib9c27cc8fcc9aee8670c217a4a5ab84bd3035577
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index ea3472b..abcbe65 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -6,6 +6,7 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.util.JsonWriter;
+import android.util.Log;
import org.mozilla.gecko.gfx.ViewportMetrics;
@@ -15,72 +16,110 @@ import java.nio.ByteBuffer;
import java.util.Random;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.libreoffice.kit.LibreOfficeKit;
+import org.libreoffice.kit.Office;
+import org.libreoffice.kit.Document;
+
public class LOKitThread extends Thread {
private static final String LOGTAG = GeckoThread;
+private static final int TILE_SIZE = 256;
+
+public Office mOffice;
+public Document mDocument;
public ConcurrentLinkedQueueLOEvent gEvents = new
ConcurrentLinkedQueueLOEvent();
private ViewportMetrics mViewportMetrics;
-private Random rand = new Random();
LOKitThread() {
}
-private boolean draw() throws InterruptedException {
+private void openDocument() {
+// enable debugging messages as the first thing
+
LibreOfficeKit.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl-INFO.i18nlangtag);
+LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext);
+
+mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle());
+String input = /assets/test1.odt;
+mDocument = mOffice.documentLoad(input);
+}
+
+private synchronized boolean draw() throws InterruptedException {
final LibreOfficeMainActivity application =
LibreOfficeMainActivity.mAppContext;
-Bitmap bitmap =
application.getLayerClient().getLayerController().getDrawable(docu);
-//bitmap = convert(bitmap, Bitmap.Config.ARGB_);
+openDocument();
+
+long height = mDocument.getDocumentHeight();
+long width = mDocument.getDocumentWidth();
+
+Log.e(LOGTAG, Document Size: + width + + height);
+
+int pageWidth = 1024;
+int pageHeight = 1024;
+
+String metadata = createJson(0, 0, 256, 256, pageWidth, pageHeight, 0,
0, 1.0);
+
+Rect bufferRect = application.getLayerClient().beginDrawing(256, 256,
TILE_SIZE, TILE_SIZE, metadata);
+
+/*if (bufferRect == null) {
+Log.e(LOGTAG, beginDrawing - false);
+return false;
+}*/
+
+Log.e(LOGTAG, Filling tiles..);
+
+ByteBuffer buffer = ByteBuffer.allocateDirect(TILE_SIZE * TILE_SIZE *
4);
+
+Log.e(LOGTAG, PaintTile..);
+
+mDocument.paintTile(buffer, 256, 256, 1024, 1024, 4096, 4096);
+
+Log.e(LOGTAG, EndPaintTile..);
-StringWriter stringWriter = new StringWriter();
+Bitmap bitmap = Bitmap.createBitmap(TILE_SIZE, TILE_SIZE,
Bitmap.Config.ARGB_);
+bitmap.copyPixelsFromBuffer(buffer);
+application.getLayerClient().addTile(bitmap, 0, 0);
+
+Log.e(LOGTAG, EndDrawing..);
+application.getLayerClient().endDrawing(0, 0, 256, 256);
+
+return true;
+}
+
+private String createJson(ViewportMetrics
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/gdi/outdev4.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a071dd3179536f1fb523ff082b5c5b155e443c59 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 1 17:48:28 2014 +0200 fdo#80014: vcl: fix drawing of linear gradients There is an off-by-one error in OutputDevice::ImplDrawLinearGradient() that causes the bottom line to remain black. (regression from 04d937c1ec36c2d9fa8c90604c81a37d30e97da6) (cherry picked from commit d51f53fedb8cd68b1b3122c7199c4ea2d3a6980f) Conflicts: vcl/source/outdev/gradient.cxx Change-Id: I33948ec8065e446a9ec7efeab5e506c93fa2e9e8 Reviewed-on: https://gerrit.libreoffice.org/10023 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index e817e57..00e05a9 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -303,7 +303,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle rRect, // Polygon for this color step aRect.Top() = (long)( fGradientLine + ((double) i) * fScanInc ); -aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc + fScanInc*.1 ); +aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc); aPoly[0] = aRect.TopLeft(); aPoly[1] = aRect.TopRight(); aPoly[2] = aRect.BottomRight(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_spritedevicehelper.cxx |8
canvas/source/cairo/cairo_spritedevicehelper.hxx |4 ++--
canvas/source/opengl/ogl_spritedevicehelper.cxx |4 ++--
canvas/source/opengl/ogl_spritedevicehelper.hxx |4 ++--
canvas/source/vcl/spritedevicehelper.cxx |8
canvas/source/vcl/spritedevicehelper.hxx |4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 05a676e86cbca3730c6b9e91ffdf8af214b90708
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 11:45:45 2014 +0200
canvas: sal_Bool - bool
Change-Id: I4292b0e8810fac781e64272b315dd32eced3623c
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx
b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 9673aec..8288186 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -85,16 +85,16 @@ namespace cairocanvas
// _always_ will have exactly one backbuffer
}
-sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
+bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL(Not supposed to be called, handled by SpriteCanvas);
-return sal_False;
+return false;
}
-sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
+bool SpriteDeviceHelper::switchBuffer( bool, bool )
{
OSL_FAIL(Not supposed to be called, handled by SpriteCanvas);
-return sal_False;
+return false;
}
uno::Any SpriteDeviceHelper::isAccelerated() const
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx
b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index bcd9a84..b359de0 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -54,8 +54,8 @@ namespace cairocanvas
// XWindowGraphicDevice
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
voiddestroyBuffers( );
-sal_Bool showBuffer( bool, sal_Bool );
-sal_Bool switchBuffer( bool, sal_Bool bUpdateAll );
+bool showBuffer( bool, bool );
+bool switchBuffer( bool, bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index d0dd6bb..781beaf 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -875,7 +875,7 @@ namespace oglcanvas
};
}
-sal_Bool SpriteDeviceHelper::showBuffer( bool bIsVisible, sal_Bool
/*bUpdateAll*/ )
+bool SpriteDeviceHelper::showBuffer( bool bIsVisible, bool /*bUpdateAll*/ )
{
// hidden or disposed?
if( !bIsVisible || !mpChildWindow || !mpSpriteCanvas )
@@ -940,7 +940,7 @@ namespace oglcanvas
return true;
}
-sal_Bool SpriteDeviceHelper::switchBuffer( bool bIsVisible, sal_Bool
bUpdateAll )
+bool SpriteDeviceHelper::switchBuffer( bool bIsVisible, bool bUpdateAll )
{
// no difference for VCL canvas
return showBuffer( bIsVisible, bUpdateAll );
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx
b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 29a02bf..5fe9ed1 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -75,8 +75,8 @@ namespace oglcanvas
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
voiddestroyBuffers( );
-sal_Bool showBuffer( bool bIsVisible, sal_Bool bUpdateAll );
-sal_Bool switchBuffer( bool bIsVisible, sal_Bool bUpdateAll );
+bool showBuffer( bool bIsVisible, bool bUpdateAll );
+bool switchBuffer( bool bIsVisible, bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx
b/canvas/source/vcl/spritedevicehelper.cxx
index c33bc7b..dca0451 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -74,16 +74,16 @@ namespace vclcanvas
// _always_ will have exactly one backbuffer
}
-sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool )
+bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL(Not supposed to be called, handled by SpriteCanvas);
-return sal_False;
+return false;
}
-sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool )
+bool SpriteDeviceHelper::switchBuffer( bool, bool )
{
OSL_FAIL(Not supposed to be called, handled by SpriteCanvas);
-return sal_False;
+return false;
}
void SpriteDeviceHelper::disposing()
diff --git a/canvas/source/vcl/spritedevicehelper.hxx
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ab/b629c4741dd12328c86e7583370213d9598a2e
ab/b629c4741dd12328c86e7583370213d9598a2e |1 + 1 file changed, 1 insertion(+) New commits: commit f39e6b6d122e69e6c850fa567325f160735ba41c Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 10:47:18 2014 +0100 Notes added by 'git notes add' diff --git a/ab/b629c4741dd12328c86e7583370213d9598a2e b/ab/b629c4741dd12328c86e7583370213d9598a2e new file mode 100644 index 000..f4977901 --- /dev/null +++ b/ab/b629c4741dd12328c86e7583370213d9598a2e @@ -0,0 +1 @@ +merged as: fa0421c763a92dbfead1d0144b434a3b6ab9dccb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - connectivity/source extensions/source sw/source xmloff/source
connectivity/source/parse/sqlnode.cxx |2
extensions/source/plugin/base/context.cxx |4 -
extensions/source/plugin/base/manager.cxx |5 +-
extensions/source/plugin/base/xplugin.cxx |3 -
extensions/source/plugin/inc/plugin/impl.hxx |8 ++-
sw/source/core/doc/SwStyleNameMapper.cxx |4 -
sw/source/filter/ww8/ww8par.cxx| 40
sw/source/filter/ww8/ww8par.hxx|7 ++
sw/source/filter/ww8/ww8par2.cxx | 10 ++--
sw/source/filter/ww8/ww8par3.cxx | 60 +++--
xmloff/source/transform/StyleOASISTContext.cxx |1
11 files changed, 67 insertions(+), 77 deletions(-)
New commits:
commit 8871a650b951a012a251a72aa1d3de46628d4c2d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 10:41:25 2014 +0100
SAL_WARN-assert
immediately dereferenced
Change-Id: I96a657973c219facbaa64dd079dc3c1c4dd8
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 1b83a24..fa7f395 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1994,7 +1994,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*
pSearchCondition, bool
pNewComparison = new
OSQLParseNode(OUString(=),SQL_NODE_EQUAL,SQL_EQUAL);
break;
default:
-SAL_WARN( connectivity.parse,
OSQLParseNode::negateSearchCondition: unexpected node type! );
+assert(false OSQLParseNode::negateSearchCondition:
unexpected node type!);
break;
}
pSearchCondition-replace(pComparison, pNewComparison);
commit c7eb405d226e7594b5e9c6f62dab60c127b1167f
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 10:39:43 2014 +0100
coverity#1209529 Explicit null dereferenced
Change-Id: I3d5f1880deaa43fd4d40f456c0d265c18bb9b9c5
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6bff575..deabe3c 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -468,9 +468,7 @@ const NameToIdHash SwStyleNameMapper::getHashTable (
SwGetPoolIdFromName eFlag
break;
default:
{
-// TODO: Is there a better way of failing here?
-*pHashPointer = new NameToIdHash( 0 );
-return **pHashPointer;
+assert(false unknown pool family);
}
break;
}
commit 63bfc8ab1038477bce0059e6b75982635527fcab
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 10:24:44 2014 +0100
coverity#705353 Missing break in switch, probably intentional
Change-Id: I17d22443f24de5b4bf5c259e38912abc2c14ab94
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx
b/xmloff/source/transform/StyleOASISTContext.cxx
index 0e78db0..4807b1d 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -864,6 +864,7 @@ void XMLStyleOASISTContext::StartElement(
break;
case XML_ATACTION_DECODE_STYLE_NAME:
m_bControlStyle = rAttrValue.startsWith( ctrl );
+// fall-through
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
commit fa0421c763a92dbfead1d0144b434a3b6ab9dccb
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jul 1 15:20:58 2014 +
Related: #i78498# some further improvements and corrections for outlines
- apply default outline level to WW8 Build-in Heading Styles
- get WW8 Build-In Heading Styles' list level applied to the paragraphs
- apply list level properties of WW8 Built-In Heading Styles only, if
the list level of the WW8 Build-In Heading Style corresponds to its
outline level
(cherry picked from commit 90ea610040acc8cc2ae66e774aff11b0bafcc59c)
(cherry picked from commit 2b0eadc3a706a2b2b41c48caa4f01691978f1190)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par2.hxx
sw/source/filter/ww8/ww8par3.cxx
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b9c9771..53d7aa5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5794,12 +5794,6 @@ void SwWW8ImplReader::SetOutlineStyles()
}
}
-if (pChosenWW8ListStyle == NULL)
-{
-// no WW8 list style for Outline Style found -- nothing to do
-return;
-}
-
// - set list level properties of Outline Style - ODF's list style applied
// by default to headings
// - assign corresponding Heading Paragraph Styles to the Outline Style
@@ -5807,8 +5801,9 @@ void SwWW8ImplReader::SetOutlineStyles()
// had been
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docstyle.hxx |6 -
sw/source/uibase/app/docstyle.cxx | 40 +++---
2 files changed, 34 insertions(+), 12 deletions(-)
New commits:
commit 64b1566e55677217c9c0dd13e5fbf8faf40810f9
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Jul 2 10:14:15 2014 +0100
fdo#76260 - switch O(N^2) lookup in SwStyleSheetIterator to O(N)
The SwStyleSheetIterator is called a lot on import of DOCX;
potentially another N times - so this change saves 15%+ of load time,
81bn cycles of 457bn to startup and load the document.
Change-Id: I70ef0f1ebd3f4e05519be68c8a67f65b00f54719
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 63a30e0..0862077 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -25,6 +25,7 @@
#include svl/style.hxx
#include svl/itemset.hxx
#include swdllapi.h
+#include boost/unordered_map.hpp
#include vector
@@ -141,10 +142,13 @@ class SwStyleSheetIterator : public
SfxStyleSheetIterator, public SfxListener
class SwPoolFmtList
{
std::vectorOUString maImpl;
+typedef boost::unordered_mapOUString, sal_uInt32, OUStringHash
UniqueHash;
+UniqueHash maUnique;
+void rehash();
public:
SwPoolFmtList() {}
void Append( char cChar, const OUString rStr );
-void Erase() { maImpl.clear(); }
+void clear() { maImpl.clear(); maUnique.clear(); }
size_t size() { return maImpl.size(); }
bool empty() { return maImpl.empty(); }
sal_uInt32 FindName(SfxStyleFamily eFam, const OUString rName);
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index 146022b..3f09c0f 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -321,31 +321,49 @@ sal_uInt32
SwStyleSheetIterator::SwPoolFmtList::FindName(SfxStyleFamily eFam,
break;
}
const OUString sSrch = OUString(cStyle) + rName;
-for(size_t i = 0; i maImpl.size(); ++i)
-if(maImpl[i] == sSrch)
-return i;
+
+UniqueHash::const_iterator it = maUnique.find(sSrch);
+if (it != maUnique.end())
+{
+sal_uInt32 nIdx = it-second;
+assert (nIdx maImpl.size());
+assert (maImpl.size() == maUnique.size());
+return nIdx;
+}
}
return SAL_MAX_UINT32;
}
+void SwStyleSheetIterator::SwPoolFmtList::rehash()
+{
+maUnique.clear();
+for (size_t i = 0; i maImpl.size(); i++)
+maUnique[maImpl[i]] = i;
+assert (maImpl.size() == maUnique.size());
+}
+
void SwStyleSheetIterator::SwPoolFmtList::RemoveName(SfxStyleFamily eFam,
const OUString rName)
{
sal_uInt32 nTmpPos = FindName( eFam, rName );
if( nTmpPos maImpl.size() )
maImpl.erase(maImpl.begin() + nTmpPos);
+
+// assumption: this seldom occurs, the iterator is built, then emptied.
+rehash();
+assert (maImpl.size() == maUnique.size());
}
// Add Strings to the list of templates
void SwStyleSheetIterator::SwPoolFmtList::Append( char cChar, const OUString
rStr )
{
const OUString aStr = OUString(cChar) + rStr;
-for(std::vectorOUString::const_iterator i = maImpl.begin();
-i != maImpl.end(); ++i)
-{
-if(*i == aStr)
-return;
-}
+
+UniqueHash::const_iterator it = maUnique.find(aStr);
+if (it != maUnique.end())
+return;
+
+maUnique[aStr] = (sal_uInt32)maImpl.size();
maImpl.push_back(aStr);
}
@@ -2553,7 +2571,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
// Delete old list
bFirstCalled = true;
nLastPos = 0;
-aLst.Erase();
+aLst.clear();
// Delete current
mxIterSheet-Reset();
@@ -3010,7 +3028,7 @@ void SwStyleSheetIterator::InvalidateIterator()
// this iterator not use a map?
bFirstCalled = false;
nLastPos = 0;
-aLst.Erase();
+aLst.clear();
}
void SwStyleSheetIterator::Notify( SfxBroadcaster, const SfxHint rHint )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit efe87c0d84e5f76034378d48d0d1fc2025a37645
Author: Jürgen Schmidt j...@apache.org
Date: Wed Jul 2 08:19:37 2014 +
#124856# correct return number of accessible actions for dropdown box
Patch By: hanya
Review By: jsc
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 00d8bc8..f09e1eb 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -182,7 +182,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent rVclWindowEven
case VCLEVENT_COMBOBOX_SELECT:
{
VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
- if (pList != NULL)
+ if (pList != NULL m_xText.is())
{
ReferenceXAccessibleText xText
(m_xText-getAccessibleContext(), UNO_QUERY);
if ( xText.is() )
@@ -416,7 +416,7 @@ sal_Int32 SAL_CALL
VCLXAccessibleBox::getAccessibleActionCount (void)
// There is one action for drop down boxes (toggle popup) and none for
// the other boxes.
-return m_bIsDropDownBox ? 0 : 1;
+return m_bIsDropDownBox ? 1 : 0;
}
sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
@@ -463,11 +463,8 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction
(sal_Int32 nIndex)
::osl::Guard ::osl::Mutex aGuard( GetMutex() );
if (nIndex0 || nIndex=getAccessibleActionCount())
throw ::com::sun::star::lang::IndexOutOfBoundsException();
-//Solution:When combo_box,it should not has action information.
-//return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
-if (m_aBoxType == LISTBOX)
-return ::rtl::OUString();
-return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING(
RID_STR_ACC_ACTION_TOGGLEPOPUP);
+
+return m_bIsDropDownBox ? TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP) :
::rtl::OUString();
}
Reference XAccessibleKeyBinding
VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - fpicker/source include/vcl vcl/source
fpicker/source/office/iodlgimp.hxx |2 +-
include/vcl/builder.hxx|3 +++
vcl/source/window/builder.cxx |7 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 5a83b31acab390785505b84895359fa9fbc25ed9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 11:43:45 2014 +0100
expose a way to drop ownership of a window from builder tree
Change-Id: I6f6bff32271ed1d6c328ba211a6b1249fda039dd
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 3f4841e..baa77d3 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -297,6 +297,9 @@ public:
OString get_by_window(const ::Window *pWindow) const;
void delete_by_window(const ::Window *pWindow);
+//release ownership of pWindow, i.e. don't delete it
+void drop_ownership(const ::Window *pWindow);
+
//apply the properties of rProps to pWindow
static void set_properties(::Window *pWindow, const stringmap rProps);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 98055fc..e336a05 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2998,12 +2998,17 @@ void VclBuilder::delete_by_name(const OString sID)
void VclBuilder::delete_by_window(const Window *pWindow)
{
+drop_ownership(pWindow);
+delete pWindow;
+}
+
+void VclBuilder::drop_ownership(const Window *pWindow)
+{
for (std::vectorWinAndId::iterator aI = m_aChildren.begin(),
aEnd = m_aChildren.end(); aI != aEnd; ++aI)
{
if (aI-m_pWindow == pWindow)
{
-delete aI-m_pWindow;
m_aChildren.erase(aI);
break;
}
commit 5983675eccd9517915d8f5558c25f47c952edb24
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 11:09:22 2014 +0100
fix crash when m_aType is '*'
Change-Id: If2c4ca98814a58b785cd2670eac1e522e70464fd
diff --git a/fpicker/source/office/iodlgimp.hxx
b/fpicker/source/office/iodlgimp.hxx
index 9b5d5e2..9461af9 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,7 +57,7 @@ public:
const OUString GetName() const { return m_aName; }
const OUString GetType() const { return m_aType; }
-const OUString GetExtension() const{ return m_aType.copy( 2 ); }
+const OUString GetExtension() const{ return m_aType.getLength()
2 ? m_aType.copy( 2 ) : OUString(); }
boolisGroupSeparator() const{ return m_aType.isEmpty(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/swriter/01/mm_emabod.xhp |5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) New commits: commit 5e7710362c86e7559f15d9c3dea4e392c2605caf Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 12:09:41 2014 +0100 update help ids for mailmerge body dialog .ui conversion Change-Id: I7f312236f7bb3398724eec24ab2d674068380661 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 401e55d..34d66d6 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2026,8 +2026,6 @@ HID_MM_BODY_LB_MALE,55029, HID_MM_BODY_PB_FEMALE,55028, HID_MM_BODY_PB_MALE,55030, HID_MM_CUSTOMFIELDS,54986, -HID_MM_DBTABLEPREVIEWDIALOG,54965, -HID_MM_MAILBODY,54982, HID_MM_MAILSTATUS_TLB,54988, HID_MM_NEXT_PAGE,55016, HID_MM_PREV_PAGE,55017, @@ -5740,7 +5738,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942, sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940, sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938, sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961, -sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279, sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186, sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196, sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858, @@ -5774,7 +5771,6 @@ sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969, sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975, -sw_FT_BODY_DLG_MM_MAILBODY,1435402240, sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832, @@ -5829,7 +5825,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718, sw_ModalDialog_DLG_CHANGE_DB,1419591680, sw_ModalDialog_DLG_DBSELECTION,1435009024, sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176, -sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831, sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395, sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045, sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047, diff --git a/source/text/swriter/01/mm_emabod.xhp b/source/text/swriter/01/mm_emabod.xhp index 1b7501d..e407eb2 100644 --- a/source/text/swriter/01/mm_emabod.xhp +++ b/source/text/swriter/01/mm_emabod.xhp @@ -31,9 +31,10 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmailbody/MailBodyDialog id=bm_id495011 localize=false/ paragraph role=heading id=par_idN1053C xml-lang=en-US level=1 l10n=NEWE-Mail Message/paragraph paragraph role=paragraph id=par_idN10540 xml-lang=en-US l10n=NEWType the message and the salutation for files that you send as link href=text/swriter/01/mailmerge08.xhpe-mail/link attachments./paragraph -bookmark xml-lang=en-US branch=hid/SW_CHECKBOX_DLG_MM_MAILBODY_CB_GREETINGLINE id=bm_id1831110 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmailbody/greeting id=bm_id1831110 localize=false/ paragraph role=heading id=par_idN10554 xml-lang=en-US level=2 l10n=NEWThis e-mail should contain a salutation/paragraph paragraph role=paragraph id=par_idN10558 xml-lang=en-US l10n=NEWahelp hid=.Adds a salutation to the e-mail./ahelp/paragraph !-- removed HID 1435403266 -- @@ -60,7 +61,7 @@ !-- removed HID 1435406350 -- paragraph role=heading id=par_idN105A8 xml-lang=en-US level=3 l10n=NEWGeneral salutation/paragraph paragraph role=paragraph id=par_idN105AC xml-lang=en-US l10n=NEWahelp hid=.Select the default greeting to use if a personalized salutation cannot be created./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/SW_MULTILINEEDIT_DLG_MM_MAILBODY_MLE_BODY id=bm_id495010 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmailbody/bodymle id=bm_id495010 localize=false/ paragraph role=heading id=par_idN105AF xml-lang=en-US level=3 l10n=NEWWrite your message here/paragraph paragraph role=paragraph id=par_idN105B3 xml-lang=en-US l10n=NEWahelp hid=.Enter the main text of the e-mail./ahelp/paragraph /body ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 186bf6c0adfc57888c474050dbdb1e29c63c1f75 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 12:09:41 2014 +0100 Updated core Project: help 5e7710362c86e7559f15d9c3dea4e392c2605caf diff --git a/helpcontent2 b/helpcontent2 index 0f1f83a..5e77103 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0f1f83aefafb087df4b324437de11c7217f77d1a +Subproject commit 5e7710362c86e7559f15d9c3dea4e392c2605caf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - accessibility/source sw/inc
accessibility/source/standard/vclxaccessiblebox.cxx | 61 +---
sw/inc/helpid.h |2
2 files changed, 18 insertions(+), 45 deletions(-)
New commits:
commit 775a86af2989ae0ed6873917ae2c2b727e161ff9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 12:14:10 2014 +0100
drop unused helpids
Change-Id: I6bab5d141e0891611ab0a9e1f4f1029bc53b845a
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5465bb2..2f8dc9e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -365,8 +365,6 @@
#define HID_MODULE_TOOLBOX
SW_HID_MODULE_TOOLBOX
#define HID_MM_SELECTDBTABLEDDIALOG
SW_HID_MM_SELECTDBTABLEDDIALOG
-#define HID_MM_DBTABLEPREVIEWDIALOG
SW_HID_MM_DBTABLEPREVIEWDIALOG
-#define HID_MM_MAILBODY
SW_HID_MM_MAILBODY
#define HID_MM_SENDMAILS
SW_HID_MM_SENDMAILS
#define HID_MM_SENDMAILS_STATUSLB
SW_HID_MM_SENDMAILS_STATUSLB
#define HID_MAILMERGECHILD
SW_HID_MAILMERGECHILD
commit cfdc2cf64ae2a09f9d15bbe6ebdad30efece1489
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 12:13:20 2014 +0100
fix some more indent and strip ::rtl::
Change-Id: I8a4f220e6e07babbb2fa8f8dcab524ba90e62986
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 20aa8f3..fdf2e58 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -175,13 +175,13 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent rVclWindowEven
}
case VCLEVENT_COMBOBOX_SELECT:
{
- VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
- if (pList != NULL m_xText.is())
- {
+VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
+if (pList != NULL m_xText.is())
+{
ReferenceXAccessibleText xText
(m_xText-getAccessibleContext(), UNO_QUERY);
if ( xText.is() )
{
-::rtl::OUString sText = xText-getSelectedText();
+OUString sText = xText-getSelectedText();
if ( sText.isEmpty() )
sText = xText-getText();
pList-UpdateSelection_Acc(sText, m_bIsDropDownBox);
@@ -478,7 +478,7 @@ Any VCLXAccessibleBox::getCurrentValue( )
ReferenceXAccessibleText xText (m_xText-getAccessibleContext(),
UNO_QUERY);
if ( xText.is() )
{
-::rtl::OUString sText = xText-getText();
+OUString sText = xText-getText();
aAny = sText;
}
}
@@ -508,7 +508,7 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any
aNumber )
SolarMutexGuard aSolarGuard;
::osl::Guard ::osl::Mutex aGuard( GetMutex() );
-::rtl::OUString fValue;
+OUString fValue;
bool bValid = (aNumber = fValue);
if( bValid )
{
@@ -538,7 +538,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet(
utl::AccessibleStateSetHelper r
VCLXAccessibleComponent::FillAccessibleStateSet(rStateSet);
if (m_aBoxType == COMBOBOX )
{
-::rtl::OUString sText;
+OUString sText;
sal_Int32 nEntryCount = 0;
ComboBox* pComboBox = static_castComboBox*(GetWindow());
if (pComboBox != NULL)
commit 192e087f97166d2b3ff6151de04d16abbe45a1d4
Author: Jürgen Schmidt j...@apache.org
Date: Wed Jul 2 08:19:37 2014 +
Related: #i124856# guard against crash
Patch By: hanya
Review By: jsc
(cherry picked from commit efe87c0d84e5f76034378d48d0d1fc2025a37645)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
Change-Id: I24fd4278406dacea33230cc1bf1528e3c5aaedf2
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index f9a63d6..20aa8f3 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -176,7 +176,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent rVclWindowEven
case VCLEVENT_COMBOBOX_SELECT:
{
VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
- if (pList != NULL)
+ if (pList != NULL m_xText.is())
{
ReferenceXAccessibleText xText
(m_xText-getAccessibleContext(), UNO_QUERY);
if ( xText.is() )
commit 0f1d72510a81094c245bfdb70f18ec15a7b557ce
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 12:03:36 2014 +0100
fix some mangled indentation
Change-Id:
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/e87c0d84e5f76034378d48d0d1fc2025a37645
ef/e87c0d84e5f76034378d48d0d1fc2025a37645 |1 + 1 file changed, 1 insertion(+) New commits: commit 7a54a7a3b80d969f3f3545b3d20e20a049278144 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 2 12:16:27 2014 +0100 Notes added by 'git notes add' diff --git a/ef/e87c0d84e5f76034378d48d0d1fc2025a37645 b/ef/e87c0d84e5f76034378d48d0d1fc2025a37645 new file mode 100644 index 000..64b7c39 --- /dev/null +++ b/ef/e87c0d84e5f76034378d48d0d1fc2025a37645 @@ -0,0 +1 @@ +merged as: 192e087f97166d2b3ff6151de04d16abbe45a1d4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/ConnectionPage.cxx | 11 ++-
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 10 ++
dbaccess/source/ui/dlg/detailpages.cxx|7 ---
3 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit bcdd1f3179ab6f4ae72c6ac5b82f7fb4d2e54c16
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sat Jun 28 17:24:10 2014 +0200
fdo#68341 Remove space of java class when testing class
When user hit Test class it trims the string
User should test class name before going next step
Change-Id: Ic4aa6cb4b821f156cf0ec8c0c09a27db8bd6d51c
Reviewed-on: https://gerrit.libreoffice.org/9953
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index a3eb754..ddb1a76 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -246,7 +246,7 @@ namespace dbaui
m_aJavaDriverLabel.Show(bEnableJDBC);
m_aJavaDriver.Show(bEnableJDBC);
m_aTestJavaDriver.Show(bEnableJDBC);
-m_aTestJavaDriver.Enable( !m_aJavaDriver.GetText().isEmpty() );
+m_aTestJavaDriver.Enable(
!m_aJavaDriver.GetText().trim().isEmpty() );
m_aFL3.Show(bEnableJDBC);
checkTestConnection();
@@ -307,10 +307,11 @@ namespace dbaui
#if HAVE_FEATURE_JAVA
try
{
-if ( !m_aJavaDriver.GetText().isEmpty() )
+if ( !m_aJavaDriver.GetText().trim().isEmpty() )
{
::rtl::Reference jvmaccess::VirtualMachine xJVM =
::connectivity::getJavaVM( m_pAdminDialog-getORB() );
-bSuccess =
::connectivity::existsJavaClassByName(xJVM,m_aJavaDriver.GetText());
+m_aJavaDriver.SetText(m_aJavaDriver.GetText().trim()); //
fdo#68341
+bSuccess =
::connectivity::existsJavaClassByName(xJVM,m_aJavaDriver.GetText().trim());
}
}
catch(Exception)
@@ -329,14 +330,14 @@ namespace dbaui
OSL_ENSURE(m_pAdminDialog,No Admin dialog set! -GPF);
bool bEnableTestConnection = !m_aConnectionURL.IsVisible() ||
!m_aConnectionURL.GetTextNoPrefix().isEmpty();
if ( m_pCollection-determineType(m_eType) == ::dbaccess::DST_JDBC )
-bEnableTestConnection = bEnableTestConnection
(!m_aJavaDriver.GetText().isEmpty());
+bEnableTestConnection = bEnableTestConnection
(!m_aJavaDriver.GetText().trim().isEmpty());
m_aTestConnection.Enable(bEnableTestConnection);
return true;
}
IMPL_LINK(OConnectionTabPage, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == m_aJavaDriver )
-m_aTestJavaDriver.Enable( !m_aJavaDriver.GetText().isEmpty() );
+m_aTestJavaDriver.Enable(
!m_aJavaDriver.GetText().trim().isEmpty() );
checkTestConnection();
// tell the listener we were modified
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 27d5b97..0944649 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -479,7 +479,7 @@ using namespace ::com::sun::star;
OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
// to get the correct value when saveValue was called by base class
-if ( m_aETDriverClass.GetText().isEmpty() )
+if ( m_aETDriverClass.GetText().trim().isEmpty() )
{
m_aETDriverClass.SetText(m_sDefaultJdbcDriverName);
m_aETDriverClass.SetModifyFlag();
@@ -498,10 +498,11 @@ using namespace ::com::sun::star;
#if HAVE_FEATURE_JAVA
try
{
-if ( !m_aETDriverClass.GetText().isEmpty() )
+if ( !m_aETDriverClass.GetText().trim().isEmpty() )
{
// TODO change jvmaccess
::rtl::Reference jvmaccess::VirtualMachine xJVM =
::connectivity::getJavaVM( m_pAdminDialog-getORB() );
+m_aETDriverClass.SetText(m_aETDriverClass.GetText().trim());
// fdo#68341
bSuccess =
::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText());
}
}
@@ -519,8 +520,8 @@ using namespace ::com::sun::star;
IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*,
_pEdit)
{
if ( _pEdit == m_aETDriverClass )
-m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().isEmpty()
);
-bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) (
!m_aETHostname.GetText().isEmpty() ) (!m_aNFPortNumber.GetText().isEmpty() )
( !m_aETDriverClass.GetText().isEmpty() ));
+m_aPBTestJavaDriver.Enable(
!m_aETDriverClass.GetText().trim().isEmpty() );
+bool bRoadmapState =
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/lokandroid.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3a25b45122c374bee92bca5c417e47a27a9e57d2 Author: Michael Meeks michael.me...@collabora.com Date: Wed Jul 2 12:41:03 2014 +0100 WaE: couple of android / LibreOfficeKit bits. Change-Id: I2ee864977d8bb266861af95fb64eb5c0852acee8 diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx index c23415f..d796342 100644 --- a/desktop/source/lib/lokandroid.cxx +++ b/desktop/source/lib/lokandroid.cxx @@ -19,7 +19,7 @@ #include LibreOfficeKit/LibreOfficeKit.h -#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LibreOfficeKit, __VA_ARGS__)) +// #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LibreOfficeKit, __VA_ARGS__)) /* LibreOfficeKit */ @@ -99,7 +99,7 @@ extern C SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_paintTi LibreOfficeKitDocument* pDocument = getHandleLibreOfficeKitDocument(pEnv, aObject); unsigned char* buffer = (unsigned char*) pEnv-GetDirectBufferAddress(aByteBuffer); -jlong capacity = pEnv-GetDirectBufferCapacity(aByteBuffer); +//jlong capacity = pEnv-GetDirectBufferCapacity(aByteBuffer); int nStride = 0; pDocument-pClass-paintTile(pDocument, buffer, nCanvasWidth, nCanvasHeight, nStride, nTilePosX, nTilePosY, nTileWidth, nTileHeight); (void) nStride; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0390ebd3d3d45145d07c865a25064b320de44608
Author: Jürgen Schmidt j...@apache.org
Date: Wed Jul 2 08:19:37 2014 +
Related: #i124856# guard against crash
Patch By: hanya
Review By: jsc
(cherry picked from commit efe87c0d84e5f76034378d48d0d1fc2025a37645)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
(cherry picked from commit 192e087f97166d2b3ff6151de04d16abbe45a1d4)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
Change-Id: I24fd4278406dacea33230cc1bf1528e3c5aaedf2
Reviewed-on: https://gerrit.libreoffice.org/10029
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index a1281db..2e49375 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -175,11 +175,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent rVclWindowEven
}
case VCLEVENT_COMBOBOX_SELECT:
{
- VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
- if (pList != NULL)
- {
-ReferenceXAccessibleText xText
(m_xText-getAccessibleContext(), UNO_QUERY);
-if ( xText.is() )
+VCLXAccessibleList* pList =
static_castVCLXAccessibleList*(m_xList.get());
+if (pList != NULL m_xText.is())
+{
+ReferenceXAccessibleText xText
(m_xText-getAccessibleContext(), UNO_QUERY);
+if ( xText.is() )
{
::rtl::OUString sText = xText-getSelectedText();
if ( sText.isEmpty() )
@@ -195,7 +195,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent rVclWindowEven
NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue);
}
-}
+}
break;
}
//case VCLEVENT_DROPDOWN_OPEN:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test sc/qa test/source
include/test/sheet/xsheetannotations.hxx |1
sc/qa/extras/scannotationsobj.cxx|3 +
test/source/sheet/xsheetannotations.cxx | 49 +++
3 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit 17d0d12b8d2cc92f6e83dbea467f7d00a97795bb
Author: Laurent Godard lgodard.li...@laposte.net
Date: Fri Jun 27 15:35:32 2014 +0200
unit test XSheetAnnotations GetByIndex for #fdo80551
Change-Id: I89ebc3d5ac257f3c754a050caf3776959b81d8b3
Reviewed-on: https://gerrit.libreoffice.org/9933
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/test/sheet/xsheetannotations.hxx
b/include/test/sheet/xsheetannotations.hxx
index 09a29b5..ff44f65 100644
--- a/include/test/sheet/xsheetannotations.hxx
+++ b/include/test/sheet/xsheetannotations.hxx
@@ -21,6 +21,7 @@ public:
virtual css::uno::Reference css::uno::XInterface init() = 0;
// XSheetAnnotations
+void testGetByIndex();
void testInsertNew();
void testRemoveByIndex();
void testCount();
diff --git a/sc/qa/extras/scannotationsobj.cxx
b/sc/qa/extras/scannotationsobj.cxx
index 49874b1..9bcd60e 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -20,7 +20,7 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 3
+#define NUMBER_OF_TESTS 4
class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations
{
@@ -37,6 +37,7 @@ public:
CPPUNIT_TEST(testInsertNew);
CPPUNIT_TEST(testRemoveByIndex);
CPPUNIT_TEST(testCount);
+CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/source/sheet/xsheetannotations.cxx
b/test/source/sheet/xsheetannotations.cxx
index cf4b82a..66a7b8d 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -155,6 +155,55 @@ void XSheetAnnotations::testRemoveByIndex()
CPPUNIT_ASSERT_EQUAL_MESSAGE(
Remove Annotation - Wrong string,
OUString(an inserted annotation 1), aPreviousString);
+}
+
+void XSheetAnnotations::testGetByIndex()
+{
+
+// testing #fdo80551 - getByIndex not on the first sheet
+
+// insert annotations in first sheet
+uno::Reference sheet::XSheetAnnotations aSheet0Annotations (init(),
UNO_QUERY_THROW);
+table::CellAddress xTargetCellAddress0 (0,0,1);
+aSheet0Annotations-insertNew(xTargetCellAddress0, an inserted annotation
1 on sheet 1);
+table::CellAddress xSecondTargetCellAddress0 (0,0,2);
+aSheet0Annotations-insertNew(xSecondTargetCellAddress0, an inserted
annotation 2 on sheet 1);
+table::CellAddress xThirdCellAddress0 (0,0,3);
+aSheet0Annotations-insertNew(xThirdCellAddress0, an inserted annotation
3 on sheet 1);
+
+// insert annotations in second sheet
+uno::Reference sheet::XSheetAnnotations aSheet1Annotations
(getAnnotations(1), UNO_QUERY_THROW);
+table::CellAddress xTargetCellAddress1 (1,4,5);
+aSheet1Annotations-insertNew(xTargetCellAddress1, an inserted annotation
1 on sheet 2);
+table::CellAddress xSecondTargetCellAddress1 (1,5,6);
+aSheet1Annotations-insertNew(xSecondTargetCellAddress1, an inserted
annotation 2 on sheet 2);
+table::CellAddress xThirdCellAddress1 (1,7,8);
+aSheet1Annotations-insertNew(xThirdCellAddress1, an inserted annotation
3 on sheet 2);
+
+// get second annotation for second sheet
+uno::Reference sheet::XSheetAnnotations aSheetAnnotations
(getAnnotations(1), UNO_QUERY_THROW);
+uno::Reference container::XIndexAccess xAnnotationsIndex
(aSheetAnnotations, UNO_QUERY_THROW);
+uno::Reference sheet::XSheetAnnotation aAnnotation
(xAnnotationsIndex-getByIndex(1), UNO_QUERY_THROW);
+
+table::CellAddress xToBeAnalyzedCellAddress = aAnnotation-getPosition();
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+GetByIndex Annotation - Wrong SHEET reference position,
+xSecondTargetCellAddress1.Sheet, xToBeAnalyzedCellAddress.Sheet);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+GetByIndex Annotation - Wrong COLUMN reference position,
+xSecondTargetCellAddress1.Column, xToBeAnalyzedCellAddress.Column);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+GetByIndex Annotation - Wrong ROW reference position,
+xSecondTargetCellAddress1.Row, xToBeAnalyzedCellAddress.Row);
+
+// is the string ok ?
+uno::Reference text::XTextRange aTextSheetAnnotation(aAnnotation,
UNO_QUERY_THROW);
+OUString aString = aTextSheetAnnotation-getString();
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+GetByIndex Annotation - Wrong string,
+OUString(an inserted annotation 2 on sheet 2), aString);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Haiku port
Hello, I am hacking on LibreOffice Haiku port and I have two questions: First of all, is The Document Foundation willing to accept the code of the port into the main tree when it is finished? Secondly, I have a problem with UNO (I think). When I'm trying to run ui-previewer it throws Deployment exception, after some debugging I found that the problem is null process service factory. If I remove UniversalContentBroker call it runs fine (no exception, but it is hiding the problem rather than solving it). My question is where should I start looking in order to solve it? Regards, Kacper ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/template_manager_improvements' - sfx2/source sfx2/uiconfig
sfx2/source/dialog/backingwindow.cxx | 322 ++-
sfx2/source/dialog/backingwindow.hxx | 12 -
sfx2/uiconfig/ui/startcenter.ui | 217 ---
3 files changed, 24 insertions(+), 527 deletions(-)
New commits:
commit 2b3fe5ce075fa3633b42b913c11d42bc8d48c107
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Wed Jul 2 15:18:28 2014 +0300
Code Cleanup
Some unneccesary code cleaned up.
Change-Id: Iebc43ddc8276d5865c640b7fa955152a3361eb36
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 8cc1f3a..daa5322 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -70,14 +70,14 @@ const char TEMPLATE_URL[] = slot:5500;
const char OPEN_URL[] = .uno:Open;
const char SERVICENAME_CFGREADACCESS[] =
com.sun.star.configuration.ConfigurationAccess;
-const char TEMPLATEBAR_SAVE[] = template_save;
-const char TEMPLATEBAR_OPEN[] = open;
-const char TEMPLATEBAR_EDIT[] = edit;
-const char TEMPLATEBAR_PROPERTIES[] = properties;
-const char TEMPLATEBAR_DEFAULT[] = default;
-const char TEMPLATEBAR_MOVE[] = move;
-const char TEMPLATEBAR_EXPORT[] = export;
-const char TEMPLATEBAR_DELETE[] = template_delete;
+//const char TEMPLATEBAR_SAVE[] = template_save;
+//const char TEMPLATEBAR_OPEN[] = open;
+//const char TEMPLATEBAR_EDIT[] = edit;
+//const char TEMPLATEBAR_PROPERTIES[] = properties;
+//const char TEMPLATEBAR_DEFAULT[] = default;
+//const char TEMPLATEBAR_MOVE[] = move;
+//const char TEMPLATEBAR_EXPORT[] = export;
+//const char TEMPLATEBAR_DELETE[] = template_delete;
const int nButtonsFontSize = 15;
const Color aButtonsBackground(114, 168, 84); // TDF green
@@ -123,8 +123,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpHelpButton, help);
get(mpExtensionsButton, extensions);
-get(mpViewBar, action_view);
-get(mpTemplateBar, action_templates);
+//get(mpViewBar, action_view);
+//get(mpTemplateBar, action_templates);
//Containers are invisible to cursor traversal
//So on pressing right when in Help the
@@ -279,21 +279,21 @@ void BackingWindow::initControls()
mpCurrentView = mpLocalView;
-mpViewBar-SetButtonType(BUTTON_SYMBOLTEXT);
-mpViewBar-SetItemBits(mpViewBar-GetItemId(repository),
TIB_DROPDOWNONLY);
+//mpViewBar-SetButtonType(BUTTON_SYMBOLTEXT);
+//mpViewBar-SetItemBits(mpViewBar-GetItemId(repository),
TIB_DROPDOWNONLY);
//mpViewBar-SetClickHdl(LINK(this,BackingWindow,TBXViewHdl));
//mpViewBar-SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl));
-mpViewBar-Hide();
-mpViewBar-HideItem(import);
+//mpViewBar-Hide();
+//mpViewBar-HideItem(import);
-mpTemplateBar-SetButtonType(BUTTON_SYMBOLTEXT);
-mpTemplateBar-SetItemBits(mpTemplateBar-GetItemId(TEMPLATEBAR_MOVE),
TIB_DROPDOWNONLY);
+//mpTemplateBar-SetButtonType(BUTTON_SYMBOLTEXT);
+//mpTemplateBar-SetItemBits(mpTemplateBar-GetItemId(TEMPLATEBAR_MOVE),
TIB_DROPDOWNONLY);
//mpTemplateBar-SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) );
//mpTemplateBar-SetDoubleClickHdl( LINK(this, BackingWindow,
OpenTemplateHdl) );
//mpTemplateBar-SetDropdownClickHdl(LINK(this,
BackingWindow,TBXDropdownHdl));
//set handlers
-mpLocalView-setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl));
+//mpLocalView-setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl));
mpLocalView-setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl));
mpLocalView-setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
@@ -490,207 +490,6 @@ void BackingWindow::Resize()
Invalidate();
}
-//Editing related method
-/*
-void BackingWindow::OnTemplateImport ()
-{
-size_t nDialogType =
-com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
-
-sfx2::FileDialogHelper aFileDlg(nDialogType, SFXWB_MULTISELECTION);
-
-// add All filter
-aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL).toString(),
-OUString(FILEDIALOG_FILTER_ALL) );
-
-// add template filter
-OUString sFilterExt;
-OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ).toString() );
-
-// add filters of modules which are installed
-SvtModuleOptions aModuleOpt;
-if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-sFilterExt += *.ott;*.stw;*.oth;
-
-if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-{
-if ( !sFilterExt.isEmpty() )
-sFilterExt += ;;
-
-sFilterExt += *.ots;*.stc;
-}
-
-if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-{
-if ( !sFilterExt.isEmpty() )
-sFilterExt += ;;
-
-sFilterExt += *.otp;*.sti;
-}
-
-if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-{
-if ( !sFilterExt.isEmpty() )
-
[Libreoffice-commits] core.git: 3 commits - framework/inc framework/source include/ucbhelper ucbhelper/source ucb/source
framework/inc/threadhelp/itransactionmanager.h | 133
framework/inc/threadhelp/transactionguard.hxx |8
framework/inc/threadhelp/transactionmanager.hxx | 85 ++-
framework/source/fwi/threadhelp/transactionmanager.cxx | 73 +++---
include/ucbhelper/interactionrequest.hxx| 54
include/ucbhelper/simplenameclashresolverequest.hxx |9
ucb/source/core/ucbcmds.cxx |1
ucbhelper/source/provider/interactionrequest.cxx| 104 -
ucbhelper/source/provider/simplenameclashresolverequest.cxx | 127 +++
9 files changed, 244 insertions(+), 350 deletions(-)
New commits:
commit b807a02850e4b5cc25707e5af8eb36d76c76af61
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 14:14:12 2014 +0200
InteractionSupplyName is a detail of SimpleNameClashResolveRequest
Change-Id: Iecc77b1c4749bd14ce79f1a7f3e98f45fa3abbba
diff --git a/include/ucbhelper/interactionrequest.hxx
b/include/ucbhelper/interactionrequest.hxx
index 51883c7..a6d0447 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -28,7 +28,6 @@
#include com/sun/star/task/XInteractionDisapprove.hpp
#include com/sun/star/ucb/XInteractionReplaceExistingData.hpp
#include com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp
-#include com/sun/star/ucb/XInteractionSupplyName.hpp
#include rtl/ref.hxx
#include cppuhelper/weak.hxx
#include ucbhelper/ucbhelperdllapi.h
@@ -626,59 +625,6 @@ inline
InteractionSupplyAuthentication::InteractionSupplyAuthentication(
/**
* This class implements a standard interaction continuation, namely the
- * interface XInteractionSupplyName. Instances of this class can be passed
- * along with an interaction request to indicate the possibility to
- * supply a new name.
- */
-class InteractionSupplyName : public InteractionContinuation,
- public com::sun::star::lang::XTypeProvider,
- public
com::sun::star::ucb::XInteractionSupplyName
-{
-OUString m_aName;
-
-public:
-InteractionSupplyName( InteractionRequest * pRequest )
-: InteractionContinuation( pRequest ) {}
-
-// XInterface
-virtual com::sun::star::uno::Any SAL_CALL
-queryInterface( const com::sun::star::uno::Type rType )
-throw( com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-virtual void SAL_CALL acquire()
-throw() SAL_OVERRIDE;
-virtual void SAL_CALL release()
-throw() SAL_OVERRIDE;
-
-// XTypeProvider
-virtual com::sun::star::uno::Sequence com::sun::star::uno::Type SAL_CALL
-getTypes()
-throw( com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-virtual com::sun::star::uno::Sequence sal_Int8 SAL_CALL
-getImplementationId()
-throw( com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-
-// XInteractionContinuation
-virtual void SAL_CALL select()
-throw( com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-
-// XInteractionSupplyName
-virtual void SAL_CALL setName( const OUString Name )
-throw ( com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
-
-// Non-interface methods.
-
-/**
- * This method returns the name that was supplied by the interaction
- * handler.
- *
- * @return the name.
- */
-const OUString getName() const { return m_aName; }
-};
-
-
-/**
- * This class implements a standard interaction continuation, namely the
* interface XInteractionReplaceExistingData. Instances of this class can be
* passed along with an interaction request to indicate the possibility to
* replace existing data.
diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx
b/include/ucbhelper/simplenameclashresolverequest.hxx
index 33a58b3..c773097 100644
--- a/include/ucbhelper/simplenameclashresolverequest.hxx
+++ b/include/ucbhelper/simplenameclashresolverequest.hxx
@@ -26,6 +26,8 @@
namespace ucbhelper {
+class InteractionSupplyName;
+
/**
* This class implements a simple name clash resolve interaction request.
* Instances can be passed directly to XInteractionHandler::handle(...). Each
@@ -36,12 +38,13 @@ namespace ucbhelper {
* @see com::sun::star::ucb::NameClashResolveRequest
* @see InteractionAbort
* @see InteractioneplaceExistingData
- * @see InteractionSupplyName
*/
class UCBHELPER_DLLPUBLIC SimpleNameClashResolveRequest : public
ucbhelper::InteractionRequest
{
rtl::Reference InteractionSupplyName m_xNameSupplier;
+virtual ~SimpleNameClashResolveRequest();
+
public:
/**
* Constructor.
@@ -65,9 +68,7 @@ public:
*
* @return the new name, if supplied.
*/
-const OUString getNewName() const
-{ return m_xNameSupplier-getName();
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/docuno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d528eb158cce3c44cd976a0d5a65b7f0c012672c Author: Laurent Godard lgodard.li...@laposte.net Date: Fri Jun 27 16:19:03 2014 +0200 call the correct GetNotePosition method #fdo80551 unit test is ok on Sheet but fails on Col Change-Id: I28084118e088838b47b77537b981ebe7422ab722 Reviewed-on: https://gerrit.libreoffice.org/9934 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 2662e4c..6852d1c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3538,7 +3538,7 @@ bool ScAnnotationsObj::GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress rPos return false; ScDocument rDoc = pDocShell-GetDocument(); -rPos = rDoc.GetNotePosition(nIndex); +rPos = rDoc.GetNotePosition(nIndex, nTab); return rPos.IsValid(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/sheet/xsheetannotations.cxx | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit c103775cd15b658bf5db1bda081c1ba5bd653c2a Author: Laurent Godard lgodard.li...@laposte.net Date: Fri Jun 27 17:09:15 2014 +0200 correct XSheetAnnotations GetByIndex test for #fdo#80551 the previous testGetCount test already added a note on sheet 2 testGetByIndex now works on sheet 3 Change-Id: I2cd49aa2bbf5c1b707287518e0f15088f3ee5ec0 Reviewed-on: https://gerrit.libreoffice.org/9938 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index 66a7b8d..d6e521f 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -171,31 +171,32 @@ void XSheetAnnotations::testGetByIndex() table::CellAddress xThirdCellAddress0 (0,0,3); aSheet0Annotations-insertNew(xThirdCellAddress0, an inserted annotation 3 on sheet 1); -// insert annotations in second sheet -uno::Reference sheet::XSheetAnnotations aSheet1Annotations (getAnnotations(1), UNO_QUERY_THROW); -table::CellAddress xTargetCellAddress1 (1,4,5); -aSheet1Annotations-insertNew(xTargetCellAddress1, an inserted annotation 1 on sheet 2); -table::CellAddress xSecondTargetCellAddress1 (1,5,6); -aSheet1Annotations-insertNew(xSecondTargetCellAddress1, an inserted annotation 2 on sheet 2); -table::CellAddress xThirdCellAddress1 (1,7,8); -aSheet1Annotations-insertNew(xThirdCellAddress1, an inserted annotation 3 on sheet 2); +// insert annotations in third sheet +uno::Reference sheet::XSheetAnnotations aSheet2Annotations (getAnnotations(2), UNO_QUERY_THROW); +table::CellAddress xTargetCellAddress2 (2,4,5); +aSheet2Annotations-insertNew(xTargetCellAddress2, an inserted annotation 1 on sheet 3); +table::CellAddress xSecondTargetCellAddress2 (2,5,6); +aSheet2Annotations-insertNew(xSecondTargetCellAddress2, an inserted annotation 2 on sheet 3); +table::CellAddress xThirdCellAddress2 (2,7,8); +aSheet2Annotations-insertNew(xThirdCellAddress2, an inserted annotation 3 on sheet 3); // get second annotation for second sheet -uno::Reference sheet::XSheetAnnotations aSheetAnnotations (getAnnotations(1), UNO_QUERY_THROW); +uno::Reference sheet::XSheetAnnotations aSheetAnnotations (getAnnotations(2), UNO_QUERY_THROW); uno::Reference container::XIndexAccess xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW); uno::Reference sheet::XSheetAnnotation aAnnotation (xAnnotationsIndex-getByIndex(1), UNO_QUERY_THROW); table::CellAddress xToBeAnalyzedCellAddress = aAnnotation-getPosition(); +// is the CellAddress ok ? CPPUNIT_ASSERT_EQUAL_MESSAGE( GetByIndex Annotation - Wrong SHEET reference position, -xSecondTargetCellAddress1.Sheet, xToBeAnalyzedCellAddress.Sheet); +xSecondTargetCellAddress2.Sheet, xToBeAnalyzedCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE( GetByIndex Annotation - Wrong COLUMN reference position, -xSecondTargetCellAddress1.Column, xToBeAnalyzedCellAddress.Column); +xSecondTargetCellAddress2.Column, xToBeAnalyzedCellAddress.Column); CPPUNIT_ASSERT_EQUAL_MESSAGE( GetByIndex Annotation - Wrong ROW reference position, -xSecondTargetCellAddress1.Row, xToBeAnalyzedCellAddress.Row); +xSecondTargetCellAddress2.Row, xToBeAnalyzedCellAddress.Row); // is the string ok ? uno::Reference text::XTextRange aTextSheetAnnotation(aAnnotation, UNO_QUERY_THROW); @@ -203,8 +204,7 @@ void XSheetAnnotations::testGetByIndex() CPPUNIT_ASSERT_EQUAL_MESSAGE( GetByIndex Annotation - Wrong string, -OUString(an inserted annotation 2 on sheet 2), aString); - +OUString(an inserted annotation 2 on sheet 3), aString); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source include/svx sw/source
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx |
33 ++---
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
39 --
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |
57 +-
chart2/source/controller/main/ChartController_Insert.cxx |
2
chart2/source/inc/RegressionCurveHelper.hxx |
22 ---
chart2/source/tools/RegressionCurveHelper.cxx|
48
include/svx/chrtitem.hxx |
7 -
sw/source/core/layout/atrfrm.cxx |
40 ++-
8 files changed, 95 insertions(+), 153 deletions(-)
New commits:
commit 2b0df7420699e77d8a6e2f9e758939743e94986d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 13:54:11 2014 +0100
coverity#705381 Mixing enum types
Change-Id: I1dad21f91f5195585ca9125b7f8f47c7bd5a1a76
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 63ca034..3237455 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1126,6 +1126,36 @@ sal_uInt16 SwFmtSurround::GetValueCount() const
return SURROUND_END - SURROUND_BEGIN;
}
+namespace
+{
+text::WrapTextMode SwSurroundToWrapMode(SwSurround eSurround)
+{
+text::WrapTextMode eRet;
+switch(eSurround)
+{
+case SURROUND_THROUGHT:
+eRet = css::text::WrapTextMode_THROUGHT;
+break;
+case SURROUND_PARALLEL:
+eRet = css::text::WrapTextMode_PARALLEL;
+break;
+case SURROUND_IDEAL:
+eRet = css::text::WrapTextMode_DYNAMIC;
+break;
+case SURROUND_LEFT:
+eRet = css::text::WrapTextMode_LEFT;
+break;
+case SURROUND_RIGHT:
+eRet = css::text::WrapTextMode_RIGHT;
+break;
+default:
+eRet = css::text::WrapTextMode_NONE;
+break;
+}
+return eRet;
+}
+}
+
bool SwFmtSurround::QueryValue( uno::Any rVal, sal_uInt8 nMemberId ) const
{
// here we convert always!
@@ -1134,26 +1164,26 @@ bool SwFmtSurround::QueryValue( uno::Any rVal,
sal_uInt8 nMemberId ) const
switch ( nMemberId )
{
case MID_SURROUND_SURROUNDTYPE:
-rVal = (text::WrapTextMode)GetSurround();
-break;
+rVal = SwSurroundToWrapMode(GetSurround());
+break;
case MID_SURROUND_ANCHORONLY:
{
bool bTmp = IsAnchorOnly();
rVal.setValue(bTmp, ::getBooleanCppuType());
+break;
}
-break;
case MID_SURROUND_CONTOUR:
{
bool bTmp = IsContour();
rVal.setValue(bTmp, ::getBooleanCppuType());
+break;
}
-break;
case MID_SURROUND_CONTOUROUTSIDE:
{
bool bTmp = IsOutside();
rVal.setValue(bTmp, ::getBooleanCppuType());
+break;
}
-break;
default:
OSL_ENSURE( !this, unknown MemberId );
bRet = false;
commit 8918dabbeed24d68a746309165e6c09a09b7b2f3
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 2 13:42:16 2014 +0100
coverity#705359 Mixing enum types
and
coverity#705361 Mixing enum types
coverity#705362 Mixing enum types
Change-Id: I557d7178277e5d497e3bbab12b75724c05653f57
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 8dd0f80..1c63fe6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -56,27 +56,27 @@ Any lcl_getRegressionDefault()
return aRet;
}
-::com::sun::star::chart::ChartRegressionCurveType lcl_getRegressionCurveType(
RegressionCurveHelper::tRegressionType eRegressionType )
+::com::sun::star::chart::ChartRegressionCurveType
lcl_getRegressionCurveType(SvxChartRegress eRegressionType)
{
::com::sun::star::chart::ChartRegressionCurveType eRet =
::com::sun::star::chart::ChartRegressionCurveType_NONE;
switch(eRegressionType)
{
-case RegressionCurveHelper::REGRESSION_TYPE_LINEAR:
+case CHREGRESS_LINEAR:
eRet = ::com::sun::star::chart::ChartRegressionCurveType_LINEAR;
break;
-case RegressionCurveHelper::REGRESSION_TYPE_LOG:
+case CHREGRESS_LOG:
eRet = ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM;
break;
-case RegressionCurveHelper::REGRESSION_TYPE_EXP:
+case CHREGRESS_EXP:
eRet =
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecolumn.cxx |4
svx/source/table/tablerow.cxx|4
2 files changed, 8 insertions(+)
New commits:
commit b7075e97a4323671fccfd581a9606b1f1ed4b103
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Jun 30 18:17:06 2014 +0900
Do not leave unreachable TableColumnUndo/TableRowUndo in case of exceptions
... which might be a memory leak otherwise.
Change-Id: I5e911ba815c3df519365236043fccc7ff21c60b4
Reviewed-on: https://gerrit.libreoffice.org/9979
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 2909f3e..1b0aa17 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -209,10 +209,14 @@ void SAL_CALL TableColumn::setFastPropertyValue(
sal_Int32 nHandle, const Any a
break;
}
default:
+delete pUndo;
throw UnknownPropertyException();
}
if( !bOk )
+{
+delete pUndo;
throw IllegalArgumentException();
+}
if( bChange )
{
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index c213e49..d7449ba 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -283,10 +283,14 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32
nHandle, const Any aVal
break;
}
default:
+delete pUndo;
throw UnknownPropertyException();
}
if( !bOk )
+{
+delete pUndo;
throw IllegalArgumentException();
+}
if( bChange )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8635fa156ba63e5f63565b6d19ea798a61643b01
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date: Fri Jun 20 15:16:58 2014 +0200
fdo#79216 correct description of NORM.S.DIST function
Change-Id: I5b95e4d648793253b0ac3c5ccd4019a145a3e762
Reviewed-on: https://gerrit.libreoffice.org/9839
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index f8e1264..0e55514 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7172,7 +7172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
String 1 // Description
{
-Text [ en-US ] = The values of the standard normal cumulative
distribution. ;
+Text [ en-US ] = The values of the standard normal distribution.
;
};
ExtraData =
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Haiku port
On 07/02/2014 02:35 PM, Kacper Kasper wrote: I am hacking on LibreOffice Haiku port and I have two questions: ...whatever that Haiku is... When I'm trying to run ui-previewer it throws Deployment exception, after some debugging I found that the problem is null process service factory. If I remove UniversalContentBroker call it runs fine (no exception, but it is hiding the problem rather than solving it). My question is where should I start looking in order to solve it? You mean you run into the throw DeploymentException( null process service factory ); in getProcessServiceFactory (comphelper/source/processfactory/processfactory.cxx)? Does that happen before or after you've reached comphelper::setProcessServiceFactory(xSFactory); in UIPreviewApp::Init (vcl/source/uipreviewer/previewer.cxx)? If the former, what's the call stack leading up to getProcessServiceFactory? If the latter, that xSFactory in the setProcessServiceFactory was a non-null Reference, right? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: bin_library_info script
the error message is correct: popd does not take a directory parameter - fixed on master by commit ffa354e2defcdc86d93c257159f9428e276c2d2e Thank you ;) -- Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RID_CONDFORMAT conversion
Hello! I'm making RID_CONDFORMAT conversion to .ui. It contains a Control( http://opengrok.libreoffice.org/xref/core/reportdesign/source/ui/dlg/CondFormat.src#25). I'd like to convert this Control( http://opengrok.libreoffice.org/xref/core/reportdesign/source/ui/dlg/Condition.hxx#64) to .ui. It was inherited VclBuilderContainer and I allocate memory for m_pUIBuilder in ctor and use 'get' function to connect variable with ui file's widgets. It compiled but not work. I see my dialog but don't draw converted control. Did I miss out something? Best regards, Mihály ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/calctiledrendering3'
New branch 'feature/calctiledrendering3' available with the following commits: commit 1f60bec148f6e8be6e983da46074924ab74c721e Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Jun 25 22:37:54 2014 +0100 Use OutputDevice scaling for column-/rowbars too. This means we now match the new gridwindow dimensions. There are however some issues around selection/painting now, which are presumably related to some parts of the code still assuming pixel rather than logical dimensions. Change-Id: I15c2bc7210f26cededd63bc89dbd782e6e4c03b8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - i18npool/source include/svl setup_native/Library_getuid.mk
i18npool/source/breakiterator/xdictionary.cxx | 22 +++---
include/svl/inethist.hxx | 20 ++--
setup_native/Library_getuid.mk|2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit be8d4a5d8aa711e8eb9265fd38d17c8290770a0e
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 16:07:07 2014 +0200
-fsanitize=function
Change-Id: I29d648c45471e6d3503922ff00f7cd6491bb88f3
diff --git a/i18npool/source/breakiterator/xdictionary.cxx
b/i18npool/source/breakiterator/xdictionary.cxx
index ddf6f20..1067e33 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -169,17 +169,17 @@ void xdictionary::initDictionaryData(const sal_Char
*pLang)
aBuf.appendAscii( dict_ ).appendAscii( pLang ).appendAscii(
SAL_DLLEXTENSION );
aEntry.mhModule = osl_loadModuleRelative( thisModule,
aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
if( aEntry.mhModule ) {
-sal_IntPtr (*func)();
-func = (sal_IntPtr(*)()) osl_getFunctionSymbol( aEntry.mhModule,
OUString(getExistMark).pData );
-aEntry.maData.existMark = (sal_uInt8*) (*func)();
-func = (sal_IntPtr(*)()) osl_getFunctionSymbol( aEntry.mhModule,
OUString(getIndex1).pData );
-aEntry.maData.index1 = (sal_Int16*) (*func)();
-func = (sal_IntPtr(*)()) osl_getFunctionSymbol( aEntry.mhModule,
OUString(getIndex2).pData );
-aEntry.maData.index2 = (sal_Int32*) (*func)();
-func = (sal_IntPtr(*)()) osl_getFunctionSymbol( aEntry.mhModule,
OUString(getLenArray).pData );
-aEntry.maData.lenArray = (sal_Int32*) (*func)();
-func = (sal_IntPtr(*)()) osl_getFunctionSymbol( aEntry.mhModule,
OUString(getDataArea).pData );
-aEntry.maData.dataArea = (sal_Unicode*) (*func)();
+oslGenericFunction func;
+func = osl_getAsciiFunctionSymbol( aEntry.mhModule, getExistMark );
+aEntry.maData.existMark = ((sal_uInt8 const * (*)()) func)();
+func = osl_getAsciiFunctionSymbol( aEntry.mhModule, getIndex1 );
+aEntry.maData.index1 = ((sal_Int16 const * (*)()) func)();
+func = osl_getAsciiFunctionSymbol( aEntry.mhModule, getIndex2 );
+aEntry.maData.index2 = ((sal_Int32 const * (*)()) func)();
+func = osl_getAsciiFunctionSymbol( aEntry.mhModule, getLenArray );
+aEntry.maData.lenArray = ((sal_Int32 const * (*)()) func)();
+func = osl_getAsciiFunctionSymbol( aEntry.mhModule, getDataArea );
+aEntry.maData.dataArea = ((sal_Unicode const * (*)()) func)();
}
data = aEntry.maData;
commit 80a1a2599e04142683d2286d0e32d0e13fb45de3
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 16:01:51 2014 +0200
Generally better to have DLLPUBLIC class with some DLLPRIVATE members
...than the other way around an implicitly DLLPRIVATE class with some
DLLPUBLIC
members, so that any symbols implicitly added by the compiler have the right
visibility (e.g., RTTI as needed by -fsanitize=function).
Change-Id: I4898dee0ccc6fdc4e7e1f3fb19db94661563444f
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 96e728a..91964f8 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -25,9 +25,9 @@
#include tools/urlobj.hxx
class INetURLHistory_Impl;
-class INetURLHistory : public SfxBroadcaster
+class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster
{
-struct StaticInstance
+struct SAL_DLLPRIVATE StaticInstance
{
INetURLHistory * operator()();
};
@@ -39,25 +39,25 @@ class INetURLHistory : public SfxBroadcaster
/** Construction/Destruction.
*/
-INetURLHistory (void);
-virtual ~INetURLHistory (void);
+SAL_DLLPRIVATE INetURLHistory (void);
+SAL_DLLPRIVATE virtual ~INetURLHistory (void);
/** Implementation.
*/
-static void NormalizeUrl_Impl (INetURLObject rUrl);
+SAL_DLLPRIVATE static void NormalizeUrl_Impl (INetURLObject rUrl);
-SVL_DLLPUBLIC void PutUrl_Impl (const INetURLObject rUrl);
-SVL_DLLPUBLIC bool QueryUrl_Impl (const INetURLObject rUrl);
+void PutUrl_Impl (const INetURLObject rUrl);
+bool QueryUrl_Impl (const INetURLObject rUrl);
/** Not implemented.
*/
-INetURLHistory (const INetURLHistory);
-INetURLHistory operator= (const INetURLHistory);
+SAL_DLLPRIVATE INetURLHistory (const INetURLHistory);
+SAL_DLLPRIVATE INetURLHistory operator= (const INetURLHistory);
public:
/** GetOrCreate.
*/
-SVL_DLLPUBLIC static INetURLHistory* GetOrCreate (void);
+static INetURLHistory* GetOrCreate (void);
/** QueryProtocol.
*/
commit b0080192e51fe80b682d805c19530da0655b4667
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 15:56:23 2014 +0200
Filter out all -fsanitize= args when building libgetuid.so
Change-Id:
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/salbool.cxx | 63 --
1 file changed, 40 insertions(+), 23 deletions(-)
New commits:
commit 6397b93eb36aebad3c22b2c10dcb457d3fbcbd39
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 17:03:54 2014 +0200
loplugin:salbool: Fix handling of potentially overriding functions
Change-Id: I63d00cf5ab1dac953fae07ca4eb4d987610551a2
diff --git a/compilerplugins/clang/salbool.cxx
b/compilerplugins/clang/salbool.cxx
index a3476be..6ef85b3 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -52,15 +52,20 @@ bool hasCLanguageLinkageType(FunctionDecl const * decl) {
return false;
}
-bool canOverrideTemplateArgumentMember(CXXMethodDecl const * decl) {
-CXXRecordDecl const * r = dyn_castCXXRecordDecl(decl-getDeclContext());
-assert(r != nullptr);
-for (auto b = r-bases_begin(); b != r-bases_end(); ++b) {
-if (b-getType()-isTemplateTypeParmType()) {
-return true;
-}
+enum class OverrideKind { NO, YES, MAYBE };
+
+OverrideKind getOverrideKind(FunctionDecl const * decl) {
+CXXMethodDecl const * m = dyn_castCXXMethodDecl(decl);
+if (m == nullptr) {
+return OverrideKind::NO;
}
-return false;
+if (m-size_overridden_methods() != 0 || m-hasAttrOverrideAttr()) {
+return OverrideKind::YES;
+}
+if (!dyn_castCXXRecordDecl(m-getDeclContext())-hasAnyDependentBases())
{
+return OverrideKind::NO;
+}
+return OverrideKind::MAYBE;
}
//TODO: current implementation is not at all general, just tests what we
@@ -284,11 +289,8 @@ bool SalBool::VisitParmVarDecl(ParmVarDecl const * decl) {
|| hasBoolOverload(f)))
|| f-isDeleted()))
{
-CXXMethodDecl const * m = dyn_castCXXMethodDecl(f);
-//XXX: canOverrideTemplateArgumentMember(m) does not require
-// !m-isVirtual()
-if ((m == nullptr || !m-isVirtual()))
-{
+OverrideKind k = getOverrideKind(f);
+if (k != OverrideKind::YES) {
SourceLocation loc { decl-getLocStart() };
TypeSourceInfo * tsi = decl-getTypeSourceInfo();
if (tsi != nullptr) {
@@ -326,7 +328,14 @@ bool SalBool::VisitParmVarDecl(ParmVarDecl const * decl) {
// definition (in a main file only processed later) to fail
// with a mismatch error before the rewriter had a chance
// to act upon the definition (but use the heuristic of
-// assuming pure virtual functions do not have
definitions):
+// assuming pure virtual functions do not have
definitions);
+// also, do not automatically rewrite functions that could
+// implicitly override depend base functions (and thus stop
+// doing so after the rewrite; note that this is less
+// dangerous for return types than for parameter types,
+// where the function would still implicitly override and
+// cause a compilation error due to the incompatible return
+// type):
if (fullMode_
!((compat::isInMainFile(
compiler.getSourceManager(),
@@ -335,12 +344,18 @@ bool SalBool::VisitParmVarDecl(ParmVarDecl const * decl) {
decl-getDeclContext())
-getNameInfo().getLoc()))
|| f-isDefined() || f-isPure())
- rewrite(loc)))
+ k != OverrideKind::MAYBE rewrite(loc)))
{
report(
DiagnosticsEngine::Warning,
-ParmVarDecl, use \bool\ instead of
\sal_Bool\,
+(ParmVarDecl, use \bool\ instead of
+ \sal_Bool\%0),
loc)
+ (k == OverrideKind::MAYBE
+? ( (unless this member function overrides a
+dependent base member function, even
+though it is not marked 'override'))
+: )
decl-getSourceRange();
}
}
@@ -437,12 +452,8 @@ bool SalBool::VisitFunctionDecl(FunctionDecl const * decl)
{
}
if (isSalBool(compat::getReturnType(*decl).getNonReferenceType())) {
FunctionDecl const * f = decl-getCanonicalDecl();
-CXXMethodDecl const * m = dyn_castCXXMethodDecl(f);
-//XXX: canOverrideTemplateArgumentMember(m) does not require
-//
[Libreoffice-commits] core.git: 2 commits - svx/source
svx/source/tbxctrls/extrusioncontrols.cxx |2 +-
svx/source/tbxctrls/fillctrl.cxx | 16 +++-
svx/source/tbxctrls/fontworkgallery.cxx |7 +++
svx/source/tbxctrls/linectrl.cxx | 16 +++-
svx/source/unodraw/UnoGraphicExporter.cxx |8 +++-
svx/source/unodraw/UnoNameItemTable.cxx |4 ++--
svx/source/unodraw/unoshape.cxx |4 ++--
7 files changed, 25 insertions(+), 32 deletions(-)
New commits:
commit 8374bbe589511721cbca6adacf15380c5f2dc0f5
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jul 2 22:05:18 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I7878d425cea773338799fb784c25039e6b923e47
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 4a26ac4..097d475 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -36,6 +36,7 @@
#include svx/itemwin.hxx
#include svx/dialmgr.hxx
#include helpid.hrc
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -317,9 +318,9 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem*
pState)
}
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
-XGradientEntry* pEntry = new
XGradientEntry(mpGradientItem-GetGradientValue(), aTmpStr);
+boost::scoped_ptrXGradientEntry pEntry(new
XGradientEntry(mpGradientItem-GetGradientValue(), aTmpStr));
XGradientList aGradientList( , /*TODO?*/ );
-aGradientList.Insert( pEntry );
+aGradientList.Insert( pEntry.get() );
aGradientList.SetDirty( false );
const Bitmap aBmp = aGradientList.GetUiBitmap( 0 );
@@ -330,7 +331,6 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem*
pState)
}
aGradientList.Remove( 0 );
-delete pEntry;
}
}
else
@@ -363,9 +363,9 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem*
pState)
}
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
-XHatchEntry* pEntry = new
XHatchEntry(mpHatchItem-GetHatchValue(), aTmpStr);
+boost::scoped_ptrXHatchEntry pEntry(new
XHatchEntry(mpHatchItem-GetHatchValue(), aTmpStr));
XHatchList aHatchList( , /*TODO?*/ );
-aHatchList.Insert( pEntry );
+aHatchList.Insert( pEntry.get() );
aHatchList.SetDirty( false );
const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
@@ -376,7 +376,6 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem*
pState)
}
aHatchList.Remove( 0 );
-delete pEntry;
}
}
else
@@ -409,16 +408,15 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem*
pState)
}
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
-XBitmapEntry* pEntry = new
XBitmapEntry(mpBitmapItem-GetGraphicObject(), aTmpStr);
+boost::scoped_ptrXBitmapEntry pEntry(new
XBitmapEntry(mpBitmapItem-GetGraphicObject(), aTmpStr));
XBitmapListRef xBitmapList =
XPropertyList::CreatePropertyList(XBITMAP_LIST,
OUString(TmpList), /*TODO?*/)-AsBitmapList();
-xBitmapList-Insert( pEntry );
+xBitmapList-Insert( pEntry.get() );
xBitmapList-SetDirty( false );
mpFillAttrLB-Fill( xBitmapList );
mpFillAttrLB-SelectEntryPos(mpFillAttrLB-GetEntryCount() - 1);
xBitmapList-Remove( 0 );
-delete pEntry;
}
}
else
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 1f7281d..270c83c 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -52,6 +52,7 @@
#include fontworkgallery.hrc
#include algorithm
+#include boost/scoped_ptr.hpp
#include helpid.hrc
@@ -202,10 +203,10 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
if( nItemId 0 )
{
-FmFormModel* pModel = new FmFormModel();
+boost::scoped_ptrFmFormModel pModel(new FmFormModel());
pModel-GetItemPool().FreezeIdRanges();
-if( GalleryExplorer::GetSdrObj( mnThemeId, nItemId-1, pModel ) )
+if( GalleryExplorer::GetSdrObj( mnThemeId, nItemId-1, pModel.get() ) )
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source
sw/inc/cmdid.h |1
sw/inc/unoprnms.hxx | 104 ++--
sw/source/core/unocore/unostyle.cxx | 49
3 files changed, 53 insertions(+), 101 deletions(-)
New commits:
commit 7a361dc2aa02b7518c83ba5ca5d3c687c3de6cff
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 2 17:20:28 2014 +0200
sw: SwXAutoStyle::mpSet is read-only
... because it is an alias to the item set that is stored in the core
auto-style cache, which must _not_ be modified.
So remove the implementation of SwXAutoStyle::setPropertiesToDefault().
(regression from commit 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: If529862d14a1c1e700ac898964560f386bf488f8
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 4c13a5c..8e75c49 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4869,56 +4869,9 @@ void SwXAutoStyle::setAllPropertiesToDefault( )
}
void SwXAutoStyle::setPropertiesToDefault(
-const uno::Sequence OUString rPropertyNames )
+const uno::Sequence OUString /*rPropertyNames*/ )
throw (beans::UnknownPropertyException, uno::RuntimeException,
std::exception)
{
-if( !mpSet.get() )
-{
-throw uno::RuntimeException();
-}
-
-const bool bTakeCareOfDrawingLayerFillStyle(IStyleAccess::AUTO_STYLE_PARA
== meFamily);
-
-if(!bTakeCareOfDrawingLayerFillStyle)
-{
-return;
-}
-
-// support DrawingLayer FillStyle slots from here on
-SolarMutexGuard aGuard;
-const OUString* pNames = rPropertyNames.getConstArray();
-sal_Int8 nPropSetId = PROPERTY_MAP_CHAR_AUTO_STYLE;
-
-switch(meFamily)
-{
-case IStyleAccess::AUTO_STYLE_CHAR : nPropSetId =
PROPERTY_MAP_CHAR_AUTO_STYLE; break;
-case IStyleAccess::AUTO_STYLE_RUBY : nPropSetId =
PROPERTY_MAP_RUBY_AUTO_STYLE; break;
-case IStyleAccess::AUTO_STYLE_PARA : nPropSetId =
PROPERTY_MAP_PARA_AUTO_STYLE; break;
-default: ;
-}
-
-const SfxItemPropertySet* pPropSet =
aSwMapProvider.GetPropertySet(nPropSetId);
-const SfxItemPropertyMap rMap = pPropSet-getPropertyMap();
-
-for(sal_Int32 i = 0; i rPropertyNames.getLength(); i++)
-{
-const OUString rPropName = pNames[i];
-const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
-
-if(!pEntry)
-{
-throw beans::UnknownPropertyException(OUString (
RTL_CONSTASCII_USTRINGPARAM ( Unknown property: ) ) + rPropName, static_cast
cppu::OWeakObject * ( this ) );
-}
-
-switch(pEntry-nWID)
-{
-case OWN_ATTR_FILLBMP_MODE:
-{
-mpSet-ClearItem(XATTR_FILLBMP_STRETCH);
-mpSet-ClearItem(XATTR_FILLBMP_TILE);
-}
-}
-}
}
uno::Sequence uno::Any SwXAutoStyle::getPropertyDefaults(
commit 79677440c88b269c7fef53b3c43f30e357050402
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 2 17:17:46 2014 +0200
sw: clean up over-abstracted string constants
Grepping for a property name should find something.
Change-Id: I908d514d5dcfd16951ebbb0157a6af9646e6db53
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 1974304..863b5ce 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -663,59 +663,59 @@
#define UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME
UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
#define UNO_NAME_SW_FILLCOLOR_2 UNO_NAME_FILLCOLOR_2
-#define UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE Header
UNO_NAME_FILLBMP_LOGICAL_SIZE
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_X Header UNO_NAME_FILLBMP_OFFSET_X
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_Y Header UNO_NAME_FILLBMP_OFFSET_Y
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X Header
UNO_NAME_FILLBMP_POSITION_OFFSET_X
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y Header
UNO_NAME_FILLBMP_POSITION_OFFSET_Y
-#define UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT Header
UNO_NAME_FILLBMP_RECTANGLE_POINT
-#define UNO_NAME_HEADER_FILLBMP_SIZE_X Header UNO_NAME_FILLBMP_SIZE_X
-#define UNO_NAME_HEADER_FILLBMP_SIZE_Y Header UNO_NAME_FILLBMP_SIZE_Y
-#define UNO_NAME_HEADER_FILLBMP_STRETCH Header UNO_NAME_FILLBMP_STRETCH
-#define UNO_NAME_HEADER_FILLBMP_TILE Header UNO_NAME_FILLBMP_TILE
-#define UNO_NAME_HEADER_FILLBMP_MODE Header UNO_NAME_FILLBMP_MODE
-#define UNO_NAME_HEADER_FILLCOLOR Header UNO_NAME_FILLCOLOR
-#define UNO_NAME_HEADER_FILLBACKGROUND Header UNO_NAME_FILLBACKGROUND
-#define UNO_NAME_HEADER_FILLBITMAP Header UNO_NAME_FILLBITMAP
-#define UNO_NAME_HEADER_FILLBITMAPNAME Header UNO_NAME_FILLBITMAPNAME
-#define UNO_NAME_HEADER_FILLBITMAPURL Header UNO_NAME_FILLBITMAPURL
-#define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT Header
UNO_NAME_FILLGRADIENTSTEPCOUNT
-#define UNO_NAME_HEADER_FILLGRADIENT Header UNO_NAME_FILLGRADIENT
-#define UNO_NAME_HEADER_FILLGRADIENTNAME
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/accimplaccess.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ffef410b1251a5daceb9d8cdeed2b8b2eedb8f32 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jul 2 17:58:38 2014 +0200 No need for these functions to be virtual Change-Id: I1f01d07fea397e686609f49b909f5898c7f412e1 diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index 2027772..f416e14 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -81,11 +81,11 @@ namespace comphelper sal_Int64 implGetForeignControlledStates( ) const; /// sets the accessible parent component -virtual voidsetAccessibleParent( +void setAccessibleParent( const ::com::sun::star::uno::Reference ::com::sun::star::accessibility::XAccessible _rxAccParent ); /// sets or resets a bit of the foreign controlled states -virtual voidsetStateBit( const sal_Int16 _nState, const sal_Bool _bSet ); +void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet ); protected: OAccessibleImplementationAccess( ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/table-btlr-center.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 17 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx |7 ++
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
6 files changed, 35 insertions(+)
New commits:
commit 3325e0f206ce864730468c3556ce06760042c157
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jul 2 17:33:03 2014 +0200
bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLr
Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d
diff --git a/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx
new file mode 100644
index 000..79cb53e
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b209755..6562b97 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2221,6 +2221,15 @@ DECLARE_OOXMLIMPORT_TEST(testFootnote, footnote.docx)
CPPUNIT_ASSERT(aFootnote.endsWith(bar));
}
+DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, table-btlr-center.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+// Cell vertical alignment was NONE, should be CENTER.
+CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER,
getPropertysal_Int16(xTable-getCellByName(A2), VertOrient));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 16b367c..8243bf6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -28,6 +28,8 @@
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
+#include com/sun/star/text/VertOrientation.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
#include dmapperLoggers.hxx
#include TablePositionHandler.hxx
@@ -826,6 +828,21 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
aCellIterator-get()-erase(PROP_HORIZONTAL_MERGE);
}
+
+// Cell direction is not an UNO Property, either.
+const PropertyMap::const_iterator aCellDirectionIter =
aCellIterator-get()-find(PROP_CELL_DIRECTION);
+if (aCellDirectionIter != aCellIterator-get()-end())
+{
+if (aCellDirectionIter-second.getValue().getsal_Int32()
== 3)
+{
+// btLr, so map ParagraphAdjust_CENTER to
VertOrientation::CENTER.
+uno::Referencebeans::XPropertySet
xPropertySet((*m_pTableSeq)[nRow][nCell][0], uno::UNO_QUERY);
+if
(xPropertySet-getPropertyValue(ParaAdjust).getsal_Int16() ==
style::ParagraphAdjust_CENTER)
+aCellIterator-get()-Insert(PROP_VERT_ORIENT,
uno::makeAny(text::VertOrientation::CENTER));
+}
+aCellIterator-get()-erase(PROP_CELL_DIRECTION);
+}
+
pSingleCellProperties[nCell] =
aCellIterator-get()-GetPropertyValues();
#ifdef DEBUG_DOMAINMAPPER
dmapper_logger-endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 7502a84..d776561 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -328,6 +328,13 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
case NS_ooxml::LN_CT_TcPrBase_textDirection:
{
TablePropertyMapPtr pPropMap( new TablePropertyMap );
+
+// Remember the cell direction, so later in
+// DomainMapperTableHandler::endTableGetCellProperties() can we
+// handle the combination of the cell direction and paragraph
+// alignment as necessary.
+pPropMap-Insert(PROP_CELL_DIRECTION, uno::Any(sal_Int32(3)));
+
bool bInsertCellProps = true;
switch ( nIntValue )
{
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 66e1773..e5b9918 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
[ANNOUNCE] Branch libreoffice-4-3-0 and Tag libreoffice-4.3.0.2 created
Hi all, The tag libreoffice-4.3.0.2 (AKA 4.3.0 RC2) and the corresponding branch libreoffice-4-3-0 have been created. The branch will be used for fine tuning of the 4.3.0 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything Remember to submit your still-pending patches to the libreoffice-4-3-0 branch The 'libreoffice-4-3' branch is still active and will be used for the 4.3.1 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-0 origin/libreoffice-4-3-0 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.0.2 libreoffice-4.3.0.2 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-2-5 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.0 RC1 Happy hacking, Christian + core + : Crash when playing with a Group inside a Group (fdo#54155) [Julien Nabet] + a better approach for getting element names. (fdo#76260) [Michael Meeks] + accelerate non-poolable item add / remove. (fdo#79851, fdo#38513) [Michael Meeks] + accept also one cell chart ranges for external data provider, (fdo#79772) [Markus Mohrhard] + after execute() a ResultSet is expected to be BeforeFirst (fdo#79427) [Lionel Elie Mamane] + bah, const issue [Caolán McNamara] + bin_library_info.sh: popd does not take a directory parameter [Michael Stahl] + branch libreoffice-4-3-0 [Christian Lohmaier] + bump product version to 4.3.0.1.0+ [Christian Lohmaier] + bump product version to 4.3.0.2 [Christian Lohmaier] + calc invalid image position on zooming (fdo#76160) [Damien Chambe] + check for empty() before calling top(). [Kohei Yoshida] + check only one radio button in a group (fdo#80422) [David Tardon] + check SwFmt::GetItemState()'s ppItem parameter... (i#125071) [Herbert Dürr] + clang: Use-after-free [Caolán McNamara] + create clipping polygon correctly (fdo#79615) [David Tardon] + do not hide top of the first row when editing text in table cells. (bnc#882631) [Matúš Kukan] + don't go further and pop the stack if it's empty. [Kohei Yoshida] + don't try to set property mapping if there is no value [Markus Mohrhard] + enable Impress Remote Dialog menu item for all view shells. (fdo#63378) [Andrzej Hunt] + error: no matching function for call to 'assertEquals' [Matúš Kukan] + file driver PreparedStatement: close previous ResultSet on reexec (fdo#80084) [Lionel Elie Mamane] + fix broken redlines after undoing column count change (cp#171) [Luboš Luňák] + fix build to work with older harfbuzz versions. [Thorsten Behrens] + fix expanded/condensed text breaking... (i#124935) [Herbert Dürr] + fix hyphenation (fdo#79372, fdo#56392) [László Németh] + fix path of redline_tmpl.hrc (fdo#80324) [Andras Timar] + fix reading of section margins (bnc#875715) [Luboš Luňák] + fix SDK examples [Stephan Bergmann] + fix tab order on ReadyToInstall dialog (fdo#80527) [Andras Timar] + fixed the old vector length (fdo#37401, i#39528) [Hideki Ikeda] + fixes for up-casting to ReferenceXInterface [Noel Grandin] + flush modified data to the model when pressing OK in the data table dialog. [Kohei Yoshida] + followup fix (fdo#80332) [Andras Timar] + inverted spell-check continue logic (fdo#80140) [Caolán McNamara] + libgltf: fix Linux-with-check build [Zolnai Tamás] + limits need to multiplied by num of decimal places (fdo#42747) [Caolán McNamara] + lok: It is expected that we point directly to the program/ directory. [Jan Holesovsky] + LOK: kill double initialize. [Andrzej Hunt] + LOK: kill saveAsWithOptions. [Andrzej Hunt] + make title of dialog localisable (fdo#51763) [Joren De Cuyper] + mismatched icons in Chart Data Table dialog (fdo#80295) [Joren De Cuyper] + MSWord uses \xb for linebreaks in DB fields, take 2 (bnc#878854) [Luboš Luňák] + no need to offset column index by category labels. (fdo#79151) [Kohei Yoshida] + notify mispelled word to accessibility (fdo#71558) [Jacobo Aragunde Pérez] + numbering too small on
[Libreoffice-commits] core.git: 2 commits - comphelper/source compilerplugins/clang configmgr/source include/comphelper
comphelper/source/misc/accessibleselectionhelper.cxx |8 +++---
comphelper/source/misc/accimplaccess.cxx |2 -
compilerplugins/clang/salbool.cxx| 22 +++
configmgr/source/writemodfile.cxx|2 +
include/comphelper/accessibleselectionhelper.hxx |2 -
include/comphelper/accimplaccess.hxx |2 -
6 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit c95ff75df274e3d84458e928ee96870bc8b663b3
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 18:49:31 2014 +0200
comphelper: sal_Bool - bool
Change-Id: Icde90101b6adfa766c8abbeb55c518725e6596e1
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx
b/comphelper/source/misc/accessibleselectionhelper.cxx
index 35c6622..814faa1 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -42,7 +42,7 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32
nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
-implSelect( nChildIndex, sal_True );
+implSelect( nChildIndex, true );
}
@@ -54,13 +54,13 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( )
throw (RuntimeException)
{
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_False );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
}
void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( )
throw (RuntimeException)
{
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_True );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
}
@@ -102,7 +102,7 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild(
sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException,
RuntimeException)
{
-implSelect( nSelectedChildIndex, sal_False );
+implSelect( nSelectedChildIndex, false );
}
diff --git a/comphelper/source/misc/accimplaccess.cxx
b/comphelper/source/misc/accimplaccess.cxx
index 6cf5637..96f255d 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -84,7 +84,7 @@ namespace comphelper
}
-void OAccessibleImplementationAccess::setStateBit( const sal_Int16
_nState, const sal_Bool _bSet )
+void OAccessibleImplementationAccess::setStateBit( const sal_Int16
_nState, const bool _bSet )
{
OSL_ENSURE( _nState = 0 static_cast sal_uInt16 (_nState)
sizeof( sal_Int64 ) * 8, OAccessibleImplementationAccess::setStateBit: no more
bits (shutting down the universe now)! );
diff --git a/include/comphelper/accessibleselectionhelper.hxx
b/include/comphelper/accessibleselectionhelper.hxx
index dbc4c20..4bb64a9 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -62,7 +62,7 @@ namespace comphelper
// select the specified child = watch for special ChildIndexes
(ACCESSIBLE_SELECTION_CHILD_xxx)
virtual void
-implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
+implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
throw (css::lang::IndexOutOfBoundsException,
css::uno::RuntimeException, std::exception) = 0;
protected:
diff --git a/include/comphelper/accimplaccess.hxx
b/include/comphelper/accimplaccess.hxx
index f416e14..2c6f159 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -85,7 +85,7 @@ namespace comphelper
const ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible _rxAccParent );
/// sets or resets a bit of the foreign controlled states
-void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
+void setStateBit( const sal_Int16 _nState, const bool _bSet );
protected:
OAccessibleImplementationAccess( );
commit 0e8d69fa7df1e238bc82b08d37babe9cd4cb5f5d
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 18:48:18 2014 +0200
Make configmgr loplugin:salbool-clean
Change-Id: Ib1f33387c50bcd853140eb2fc46995d23d7f367b
diff --git a/compilerplugins/clang/salbool.cxx
b/compilerplugins/clang/salbool.cxx
index 6ef85b3..f8ae35e 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -70,23 +70,19 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) {
//TODO: current implementation is not at all general, just tests what we
// encounter in practice:
-bool hasBoolOverload(FunctionDecl const * decl) {
-if (isaCXXMethodDecl(decl)) {
-unsigned n = decl-getNumParams();
-CXXRecordDecl const * r = dyn_castCXXRecordDecl(
-decl-getDeclContext());
-assert(r !=
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/accessibleselectionhelper.cxx |8
comphelper/source/misc/accimplaccess.cxx |2 +-
include/comphelper/accessibleselectionhelper.hxx |2 +-
include/comphelper/accimplaccess.hxx |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 37b18359728b06091de02156053f2e0eecc556ed
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 18:54:32 2014 +0200
Revert comphelper: sal_Bool - bool
Oops, this reverts commit c95ff75df274e3d84458e928ee96870bc8b663b3.
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx
b/comphelper/source/misc/accessibleselectionhelper.cxx
index 814faa1..35c6622 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -42,7 +42,7 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32
nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
-implSelect( nChildIndex, true );
+implSelect( nChildIndex, sal_True );
}
@@ -54,13 +54,13 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( )
throw (RuntimeException)
{
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_False );
}
void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( )
throw (RuntimeException)
{
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_True );
}
@@ -102,7 +102,7 @@ namespace comphelper
void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild(
sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException,
RuntimeException)
{
-implSelect( nSelectedChildIndex, false );
+implSelect( nSelectedChildIndex, sal_False );
}
diff --git a/comphelper/source/misc/accimplaccess.cxx
b/comphelper/source/misc/accimplaccess.cxx
index 96f255d..6cf5637 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -84,7 +84,7 @@ namespace comphelper
}
-void OAccessibleImplementationAccess::setStateBit( const sal_Int16
_nState, const bool _bSet )
+void OAccessibleImplementationAccess::setStateBit( const sal_Int16
_nState, const sal_Bool _bSet )
{
OSL_ENSURE( _nState = 0 static_cast sal_uInt16 (_nState)
sizeof( sal_Int64 ) * 8, OAccessibleImplementationAccess::setStateBit: no more
bits (shutting down the universe now)! );
diff --git a/include/comphelper/accessibleselectionhelper.hxx
b/include/comphelper/accessibleselectionhelper.hxx
index 4bb64a9..dbc4c20 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -62,7 +62,7 @@ namespace comphelper
// select the specified child = watch for special ChildIndexes
(ACCESSIBLE_SELECTION_CHILD_xxx)
virtual void
-implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
+implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
throw (css::lang::IndexOutOfBoundsException,
css::uno::RuntimeException, std::exception) = 0;
protected:
diff --git a/include/comphelper/accimplaccess.hxx
b/include/comphelper/accimplaccess.hxx
index 2c6f159..f416e14 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -85,7 +85,7 @@ namespace comphelper
const ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible _rxAccParent );
/// sets or resets a bit of the foreign controlled states
-void setStateBit( const sal_Int16 _nState, const bool _bSet );
+void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
protected:
OAccessibleImplementationAccess( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering3' - include/LibreOfficeKit libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h |7 +
libreofficekit/source/gtk/lokdocview.c | 114 -
2 files changed, 101 insertions(+), 20 deletions(-)
New commits:
commit 0d70e5f95a9dceb05fe14dc63063a404f6916909
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jul 2 18:57:41 2014 +0200
gtktiledviewer: Show 4 tiles at varying scale factors. DON'T MERGE
I.e. subdivide the document into 4 tiles: one at 100% scaling,
one at 200%, one at 50%, one at 25% -- these are then post-scaled
(in gdk) and assembled to show as one document again.
This is only for test purposes, and shouldnt go into master. Could probably
be useful as a separate test widget though.
Change-Id: Id26a5418d88ce17525358d27d313cf9884fa1494
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index f160925..724f7ad 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -34,8 +34,9 @@ struct _LOKDocView
GtkScrolledWindow scrollWindow;
GtkWidget* pEventBox;
-GtkWidget* pCanvas;
-GdkPixbuf* pPixBuf;
+GtkWidget* pGrid;
+GtkWidget* pCanvas[2][2];
+GdkPixbuf* pPixBuf[2][2];
float fZoom;
@@ -62,4 +63,4 @@ float lok_docview_get_zoom(LOKDocView*
pDocView);
}
#endif
-#endif
\ No newline at end of file
+#endif
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index f813e68..296155f 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -57,6 +57,8 @@ static void lok_docview_class_init( LOKDocViewClass* pClass )
static void lok_docview_init( LOKDocView* pDocView )
{
+int x, y;
+
// Gtk ScrolledWindow is apparently not fully initialised yet, we
specifically
// have to set the [hv]adjustment to prevent GTK assertions from firing,
see
// https://bugzilla.gnome.org/show_bug.cgi?id=438114 for more info.
@@ -67,13 +69,24 @@ static void lok_docview_init( LOKDocView* pDocView )
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(pDocView),
pDocView-pEventBox );
-pDocView-pCanvas = gtk_image_new();
-gtk_container_add( GTK_CONTAINER( pDocView-pEventBox ), pDocView-pCanvas
);
+pDocView-pGrid = gtk_table_new( 2, 2, TRUE );
+gtk_container_add( GTK_CONTAINER( pDocView-pEventBox ), pDocView-pGrid );
-gtk_widget_show( pDocView-pCanvas );
-gtk_widget_show( pDocView-pEventBox );
+for ( x = 0; x 2; x++ )
+{
+for ( y = 0; y 2; y++ )
+{
+pDocView-pCanvas[x][y] = gtk_image_new();
+gtk_table_attach_defaults( GTK_TABLE( pDocView-pGrid ),
pDocView-pCanvas[x][y], x, x+1, y, y+1 );
+//gtk_container_add( GTK_CONTAINER( pDocView-pEventBox ),
pDocView-pCanvas );
+gtk_widget_show( pDocView-pCanvas[x][y] );
+
+pDocView-pPixBuf[x][y] = 0;
+}
+}
-pDocView-pPixBuf = 0;
+gtk_widget_show( pDocView-pGrid );
+gtk_widget_show( pDocView-pEventBox );
// TODO: figure out a clever view of getting paths set up.
pDocView-pOffice = 0;
@@ -96,14 +109,21 @@ void renderDocument( LOKDocView* pDocView )
{
long nWidth, nHeight;
int nRenderWidth, nRenderHeight;
-unsigned char* pBuffer;
int nRowStride;
+int x, y;
+GdkPixbuf* pTempBuf;
g_assert( pDocView-pDocument );
-if ( pDocView-pPixBuf )
+for ( x = 0; x 2; x++ )
{
-g_object_unref( G_OBJECT( pDocView-pPixBuf ) );
+for ( y = 0; y 2; y++ )
+{
+if ( pDocView-pPixBuf[x][y] )
+{
+g_object_unref( G_OBJECT( pDocView-pPixBuf[x][y] ) );
+}
+}
}
pDocView-pDocument-pClass-getDocumentSize( pDocView-pDocument,
nWidth, nHeight );
@@ -115,24 +135,84 @@ void renderDocument( LOKDocView* pDocView )
nRenderWidth = nWidth * pDocView-fZoom / 10;
nRenderHeight = nHeight * pDocView-fZoom / 10;
-pDocView-pPixBuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB,
-TRUE, 8,
-nRenderWidth, nRenderHeight);
-
+// TOP-LEFT: standard
+// TOP-RIGHT: 2x resolution rendered (post-scaled to 50%)
+// BOTTOM-LEFT: 1/2 resolution rendered (post-scaled 200%)
+// BOTTOM-RIGHT: 1/2 resolution rendered (post-scaled 400%)
+pDocView-pPixBuf[0][0] = gdk_pixbuf_new( GDK_COLORSPACE_RGB,
+ TRUE, 8,
+ nRenderWidth / 2, nRenderHeight
/ 2 );
+pDocView-pDocument-pClass-paintTile( pDocView-pDocument,
+gdk_pixbuf_get_pixels(
pDocView-pPixBuf[0][0] ),
+nRenderWidth / 2, nRenderHeight /
2,
+
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx | 20
compilerplugins/clang/salbool.cxx |6 --
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 4da8281d5a93bb3d253be348cd6cc444546121b7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 2 19:19:17 2014 +0200
compat for Clang 3.2
Change-Id: I2746abd05edd00dadfe613c17b9874b1035c3be4
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 7389f63..5533e8f 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -160,6 +160,26 @@ inline std::unique_ptrllvm::raw_fd_ostream
create_raw_fd_ostream(
#endif
}
+inline clang::NamedDecl * const * begin(
+clang::DeclContextLookupConstResult const result)
+{
+#if (__clang_major__ == 3 __clang_minor__ = 3) || __clang_major__ 3
+return result.begin();
+#else
+return result.first;
+#endif
+}
+
+inline clang::NamedDecl * const * end(
+clang::DeclContextLookupConstResult const result)
+{
+#if (__clang_major__ == 3 __clang_minor__ = 3) || __clang_major__ 3
+return result.end();
+#else
+return result.second;
+#endif
+}
+
}
#endif
diff --git a/compilerplugins/clang/salbool.cxx
b/compilerplugins/clang/salbool.cxx
index f8ae35e..5eddba6 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -72,8 +72,10 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) {
// encounter in practice:
bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) {
unsigned n = decl-getNumParams();
-for (auto d: decl-getDeclContext()-lookup(decl-getDeclName())) {
-FunctionDecl const * f = dyn_castFunctionDecl(d);
+DeclContextLookupConstResult res
+= decl-getDeclContext()-lookup(decl-getDeclName());
+for (auto d = compat::begin(res); d != compat::end(res); ++d) {
+FunctionDecl const * f = dyn_castFunctionDecl(*d);
if (f != nullptr (!mustBeDeleted || f-isDeleted())) {
if (f-getNumParams() == n) {
bool hasSB = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source sw/source
svx/source/unodraw/unobrushitemhelper.cxx | 30 +++-
sw/source/core/layout/paintfrm.cxx| 56 +++---
2 files changed, 73 insertions(+), 13 deletions(-)
New commits:
commit 63f53dbd6cac4fcd7fe568af62f29ae19768085f
Author: Armin Le Grand a...@apache.org
Date: Wed Jul 2 16:06:42 2014 +
i125189 corrected used transparency and handling to values used in the
fallback SvxBrushItem
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx
b/svx/source/unodraw/unobrushitemhelper.cxx
index 733f3c9..ff83649 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -62,8 +62,9 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const
SvxBrushItem rBrush, SfxI
rToSet.Put(XFillStyleItem(XFILL_SOLID));
rToSet.Put(XFillColorItem(String(), aColor));
-// nTransparency is in range [0..255], convert to [0..100] which is
used in XFillTransparenceItem
-rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) +
127) / 255));
+// #125189# nTransparency is in range [0..254], convert to [0..100]
which is used in
+// XFillTransparenceItem (caution with the range which is in an
*item-specific* range)
+rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) +
127) / 254));
}
else if(GPOS_NONE != rBrush.GetGraphicPos())
{
@@ -182,8 +183,12 @@ SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet
rSourceSet, sal_Bool bSea
if(0 != nFillTransparence)
{
-// nFillTransparence is in range [0..100] and needs to be in [0..255]
unsigned
-aFillColor.SetTransparency(static_cast sal_uInt8 ((nFillTransparence
* 255) / 100));
+// #i125189# nFillTransparence is in range [0..100] and needs to be in
[0..254] unsigned
+// It is necessary to use the maximum of 0xfe for transparence for the
SvxBrushItem
+// since the oxff value is used for special purposes (like no fill and
derive from parent)
+const sal_uInt8 aTargetTrans(std::min(sal_uInt8(0xfe), static_cast
sal_uInt8 ((nFillTransparence * 254) / 100)));
+
+aFillColor.SetTransparency(aTargetTrans);
}
return SvxBrushItem(aFillColor, nBackgroundID);
@@ -233,8 +238,12 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const
SfxItemSet rSourceSet, sal_uInt
if(0 != nFillTransparence)
{
-// nFillTransparence is in range [0..100] and needs to be in
[0..255] unsigned
-aMixedColor.SetTransparency(static_cast sal_uInt8
((nFillTransparence * 255) / 100));
+// #i125189# nFillTransparence is in range [0..100] and needs
to be in [0..254] unsigned
+// It is necessary to use the maximum of 0xfe for transparence
for the SvxBrushItem
+// since the oxff value is used for special purposes (like no
fill and derive from parent)
+const sal_uInt8 aTargetTrans(std::min(sal_uInt8(0xfe),
static_cast sal_uInt8 ((nFillTransparence * 254) / 100)));
+
+aMixedColor.SetTransparency(aTargetTrans);
}
aRetval = SvxBrushItem(aMixedColor, nBackgroundID);
@@ -263,9 +272,12 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const
SfxItemSet rSourceSet, sal_uInt
// take half orig transparence, add half transparent, clamp
result
nFillTransparence =
basegfx::clamp((sal_uInt16)((nFillTransparence / 2) + 50), (sal_uInt16)0,
(sal_uInt16)255);
-// nFillTransparence is in range [0..100] and needs to be in
[0..255] unsigned
-aHatchColor.SetTransparency(static_cast sal_uInt8
((nFillTransparence * 255) / 100));
+// #i125189# nFillTransparence is in range [0..100] and needs
to be in [0..254] unsigned
+// It is necessary to use the maximum of 0xfe for transparence
for the SvxBrushItem
+// since the oxff value is used for special purposes (like no
fill and derive from parent)
+const sal_uInt8 aTargetTrans(std::min(sal_uInt8(0xfe),
static_cast sal_uInt8 ((nFillTransparence * 254) / 100)));
+aHatchColor.SetTransparency(aTargetTrans);
aRetval = SvxBrushItem(aHatchColor, nBackgroundID);
}
@@ -316,7 +328,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet
rSourceSet, sal_uInt
if(0 != nFillTransparence)
{
-// nFillTransparence is in range [0..100] and needs to be in
[0..100] signed
+// #i125189# nFillTransparence is in range [0..100] and needs
to be in [0..100] signed
aRetval.setGraphicTransparency(static_cast sal_Int8
(nFillTransparence));
}
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 2b61006..2cb2186 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++
Too big commit
Hi, My commit 9954 https://gerrit.libreoffice.org/9954 has been accepted but I received an automatic message from libreoffice-commits-ow...@lists.freedesktop.org which said Your mail to 'Libreoffice-commits' with the subject core.git: extras/AllLangCustomTarget_autotextshare.mk [...] Is being held until the list moderator can review it for approval. The reason it is being held: Message body is too big: 504168 bytes with a limit of 200 KB I don't know if I have something special to do or if the commit will continue its way. Laurent BP - LibreOffice 4.2.4.2 -- View this message in context: http://nabble.documentfoundation.org/Too-big-commit-tp4114413.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Too big commit
On Wed, Jul 2, 2014 at 8:40 PM, Laurent BP jumbo4...@yahoo.fr wrote: Hi, My commit 9954 https://gerrit.libreoffice.org/9954 has been accepted but I received an automatic message from libreoffice-commits-ow...@lists.freedesktop.org which said Your mail to 'Libreoffice-commits' with the subject core.git: extras/AllLangCustomTarget_autotextshare.mk [...] Is being held until the list moderator can review it for approval. The reason it is being held: Message body is too big: 504168 bytes with a limit of 200 KB I don't know if I have something special to do or if the commit will continue its way. Laurent BP Hey, everything is fine. This is only about the commits mailing list which has a limit for the mail size. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Too big commit
On Wed, 2014-07-02 at 11:40 -0700, Laurent BP wrote: I don't know if I have something special to do or if the commit will continue its way. FYI, when that happens to me (which happens from time to time), I just cancel it. That announcement is just for archiving all git commits to the commit mailing list; your actual commit has gone through just fine. HTH, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Too big commit
Hello Markus and Kohei, Many thanks for your prompt answers :) Best regards, Laurent BP - LibreOffice 4.1.6.2 -- View this message in context: http://nabble.documentfoundation.org/Too-big-commit-tp4114413p4114419.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Haiku port
Hello FYI Le Wed, 02 Jul 2014 15:16:30 +0200, Stephan Bergmann sberg...@redhat.com a écrit: On 07/02/2014 02:35 PM, Kacper Kasper wrote: I am hacking on LibreOffice Haiku port and I have two questions: ...whatever that Haiku is... BeOS inspired OS: https://www.haiku-os.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Haiku port
On Wed, Jul 2, 2014 at 2:35 PM, Kacper Kasper kacperkas...@gmail.com wrote: Hello, I am hacking on LibreOffice Haiku port and I have two questions: First of all, is The Document Foundation willing to accept the code of the port into the main tree when it is finished? Provided that it is done properly, not overly invasive, and there is manpower to cater to the port(*), I'd say chances are good we would accept the patches. But, I strongly urge you to not wait 'when it is finished'. A big code dump is very unlikely to be reviewed favorably... I strongly encourage to get involved early with this dev community, and seek review of your work early to insure that you are on a track that will allow a smooth upstreaming. Norbert PS: for the curious: https://www.haiku-os.org/ :-) (*) Libreoffice is a fairly active and large project. any port will need some sustained attention to keep up. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salinst.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f711b333cfa24f3c7134f799b39a634ca1a0a885
Author: Douglas Mencken dougmenc...@gmail.com
Date: Wed Jul 2 05:40:09 2014 -0400
fix 'NSImage' may not respond to '-lockFocusFlipped:'
related commit: b3818f53812053e94196a58bbe474e2c3b72ac69
Change-Id: Ica27b3c2e474ebb85a69149e35021835f8183b69
Reviewed-on: https://gerrit.libreoffice.org/10011
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 9e9b35c..3104733 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1049,8 +1049,12 @@ NSImage* CreateNSImage( const Image rImage )
NSImage* pImage = [[NSImage alloc] initWithSize: NSMakeSize(
aSize.Width(), aSize.Height() )];
if( pImage )
{
+#if MAC_OS_X_VERSION_MAX_ALLOWED 1060
+[pImage setFlipped:YES];
+[pImage lockFocus];
+#else
[pImage lockFocusFlipped:YES];
-
+#endif
NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
CGContextRef rCGContext = reinterpret_castCGContextRef([pContext
graphicsPort]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/DropTarget.cxx |8 1 file changed, 8 insertions(+) New commits: commit fcb08724793611ea5e84ff2b848a1907bbfec60a Author: Douglas Mencken dougmenc...@gmail.com Date: Tue Jul 1 08:11:19 2014 -0400 fix 'NSCursor' may not respond to operationNotAllowedCursor,dragCopyCursor related commit: e4653eee7680831e6d0995d51d80fb63309c03ab Change-Id: Iba30c90336bf08d15d5990d6e1380867eee3564e Reviewed-on: https://gerrit.libreoffice.org/10013 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 7ee0f5b..e8179a9 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -264,9 +264,17 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } if (dragOp == NSDragOperationNone) +#if MAC_OS_X_VERSION_MAX_ALLOWED 1060 +SetThemeCursor(kThemeNotAllowedCursor); +#else [[NSCursor operationNotAllowedCursor] set]; +#endif else if (dragOp == NSDragOperationCopy) +#if MAC_OS_X_VERSION_MAX_ALLOWED 1060 +SetThemeCursor(kThemeCopyArrowCursor); +#else [[NSCursor dragCopyCursor] set]; +#endif else [[NSCursor arrowCursor] set]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/fmcomp/gridcell.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit faa00db418db8a2885973306e5ad10f6b5307ca0 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 1 13:29:03 2014 +0100 Resolves: fdo#42747 limits need to multiplied by num of decimal places NumericFormatter limits need to multiplied by num of decimal places because the arg is a long so to retain decimal places its got to be raised up by the num of places Change-Id: Idbc49a9b1dde5fe176e5170d3be605a998050da5 (cherry picked from commit 63885c86f866411f01f1b6fceaa07f054a5a3550) Reviewed-on: https://gerrit.libreoffice.org/10015 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b47d510..2ded750 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2090,6 +2090,13 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference XPropertyS sal_BoolbThousand = getBOOL( _rxModel-getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) ); OUString aStr( getString( _rxModel-getPropertyValue(FM_PROP_CURRENCYSYMBOL ) ) ); +//fdo#42747 the min/max/first/last of vcl NumericFormatters needs to be +//multiplied by the no of decimal places. See also +//VclBuilder::mungeAdjustment +int nMul = rtl_math_pow10Exp(1, m_nScale); +nMin *= nMul; +nMax *= nMul; + static_cast LongCurrencyField* ( m_pWindow )-SetUseThousandSep( bThousand ); static_cast LongCurrencyField* ( m_pWindow )-SetDecimalDigits( m_nScale ); static_cast LongCurrencyField* ( m_pWindow )-SetCurrencySymbol( aStr ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/ooxml/pass/fdo79838.docx |binary
sw/source/core/text/itrform2.cxx |7 +++
2 files changed, 7 insertions(+)
New commits:
commit 0459e43ae63191ce9846bbcc7fe797fd949e3878
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Fri Jun 27 14:52:34 2014 +0530
fdo#79838 : DOCX : File crashes on open
Issue :
DOCX containing nested form fields FORMCHECKBOX inside
FORMTEXT crashes at open.
Implementation :
- Handled case for FORMTEXT.
- Added issue file isnide sw/qa/core/data/ooxml/pass/
NOTE : This is a due to regression. Issue file opened
successfully on LO-3.5 and LO-4.1.
Code changes that caused regression is :
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=a52ee51269a47e52d68405caf8507e1abaa6fd8f
Change-Id: I59dbe7bb2d58c1bcb0ddd144cf7891cbec5cdb24
Reviewed-on: https://gerrit.libreoffice.org/9932
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/qa/core/data/ooxml/pass/fdo79838.docx
b/sw/qa/core/data/ooxml/pass/fdo79838.docx
new file mode 100644
index 000..eef1e59
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79838.docx differ
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 8bf8437..8e03566 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -894,6 +894,13 @@ SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo
rInf ) const
{
pPor = new
SwFieldFormDropDownPortion(sw::mark::ExpandFieldmark(pBM));
}
+/* we need to check for ODF_FORMTEXT for scenario
having FormFields inside FORMTEXT.
+ * Otherwise file will crash on open.
+ */
+else if (pBM-GetFieldname( ) == ODF_FORMTEXT)
+{
+pPor = new SwFieldMarkPortion();
+}
else
{
assert( false );// unknown type...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 31 ++-
1 file changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 836e504c859a5b67f7ab7ba842785951d41058cd
Author: Eike Rathke er...@redhat.com
Date: Wed Jul 2 22:24:52 2014 +0200
resolved fdo#80166 check input against date acceptance pattern plausibility
... to prevent confusion of #.### input with D.M that then later is
discarded as invalid date input instead of accepted as valid numeric
input.
Change-Id: I178e28b7ef3b26d04eecc73e5e5c61ee41f89e32
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d63fd56..c2946c3 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1174,6 +1174,8 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern(
sal_uInt16 nStartPatternAt )
}
nDatePatternStart = nStartPatternAt; // remember start particle
+const sal_Int32 nMonthsInYear =
pFormatter-GetCalendar()-getNumberOfMonthsInYear();
+
for (sal_Int32 nPattern=0; nPattern sDateAcceptancePatterns.getLength();
++nPattern)
{
sal_uInt16 nNext = nDatePatternStart;
@@ -1183,12 +1185,39 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern(
sal_uInt16 nStartPatternAt )
sal_Int32 nPat = 0;
for ( ; nPat rPat.getLength() bOk nNext nAnzStrings; ++nPat,
++nNext)
{
-switch (rPat[nPat])
+const sal_Unicode c = rPat[nPat];
+switch (c)
{
case 'Y':
case 'M':
case 'D':
bOk = IsNum[nNext];
+if (bOk (c == 'M' || c == 'D'))
+{
+// Check the D and M cases for plausibility. This also
+// prevents recognition of date instead of number with a
+// numeric group input if date separator is identical to
+// group separator, for example with D.M as a pattern and
+// #.### as a group.
+sal_Int32 nMaxLen, nMaxVal;
+switch (c)
+{
+case 'M':
+nMaxLen = 2;
+nMaxVal = nMonthsInYear;
+break;
+case 'D':
+nMaxLen = 2;
+nMaxVal = 31;
+break;
+}
+bOk = (sStrArray[nNext].getLength() = nMaxLen);
+if (bOk)
+{
+sal_Int32 nNum = sStrArray[nNext].toInt32();
+bOk = (1 = nNum nNum = nMaxVal);
+}
+}
if (bOk)
++nDatePatternNumbers;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 397362d8532d7b0abe38f2024dd2cefe2482d6a3 Author: Eike Rathke er...@redhat.com Date: Thu Jul 3 00:08:51 2014 +0200 work around nonsense -Werror=maybe-uninitialized, fdo#80166 follow-up Change-Id: I0f9cf74550e43d174bf6ac75e70c51ab7f51ccf8 diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index c2946c3..993b712 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1210,6 +1210,13 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( sal_uInt16 nStartPatternAt ) nMaxLen = 2; nMaxVal = 31; break; +default: +// This merely exists against +// -Werror=maybe-uninitialized, which is nonsense +// after the (c == 'M' || c == 'D') check above, +// but ... +nMaxLen = 2; +nMaxVal = 31; } bOk = (sStrArray[nNext].getLength() = nMaxLen); if (bOk) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/qa chart2/source dbaccess/source include/oox offapi/com oox/source sc/inc sc/source sw/inc sw/source
chart2/qa/extras/chart2import.cxx | 30 ++-
chart2/source/inc/InternalDataProvider.hxx |8
chart2/source/tools/InternalDataProvider.cxx | 200 ++---
dbaccess/source/core/inc/DatabaseDataProvider.hxx |6
dbaccess/source/core/misc/DatabaseDataProvider.cxx |8
include/oox/drawingml/chart/chartconverter.hxx |8
offapi/com/sun/star/chart2/data/XDataProvider.idl |3
oox/source/drawingml/chart/chartconverter.cxx |6
oox/source/drawingml/chart/datasourceconverter.cxx |4
oox/source/drawingml/chart/seriesconverter.cxx |6
sc/inc/chart2uno.hxx |4
sc/source/filter/inc/excelchartconverter.hxx |8
sc/source/filter/oox/excelchartconverter.cxx |3
sc/source/ui/unoobj/chart2uno.cxx |8
sw/inc/unochart.hxx|5
sw/source/core/unocore/unochart.cxx|8
16 files changed, 235 insertions(+), 80 deletions(-)
New commits:
commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 2 09:53:54 2014 -0400
bnc#812796: Correctly handle static value array for OOXML charts.
We need to pass the role of the data sequence in order to avoid unreliable
guess work when importing static value array.
Also, not all Excel's scatter plots have real numeric X values; some have
textural X values in which case Excel switch to generating 1, 2, 3, ... as
X values. When importing to our chart implementation, using categories
role
in such cases instead of values-x results in a more faithful chart
rendering.
Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78
diff --git a/chart2/source/inc/InternalDataProvider.hxx
b/chart2/source/inc/InternalDataProvider.hxx
index 526ca2d..459ffb8 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -134,6 +134,11 @@ public:
const OUString aRangeRepresentation )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
+
+virtual css::uno::Referencecss::chart2::data::XDataSequence SAL_CALL
+createDataSequenceByValueArray( const OUString aRole, const OUString
aRangeRepresentation )
+throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
virtual ::com::sun::star::uno::Reference
::com::sun::star::sheet::XRangeSelection SAL_CALL getRangeSelection()
throw (::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
@@ -230,6 +235,9 @@ private:
::com::sun::star::chart2::data::XDataSequence
createDataSequenceAndAddToMap( const OUString rRangeRepresentation );
+css::uno::Referencecss::chart2::data::XDataSequence
+createDataSequenceFromArray( const OUString rArrayStr, const
OUString rRole );
+
void deleteMapReferences( const OUString rRangeRepresentation );
void adaptMapReferences(
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index 20886fa..ee2dcfe 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -491,79 +491,155 @@ void InternalDataProvider::decreaseMapReferences(
Reference chart2::data::XDataSequence
InternalDataProvider::createDataSequenceAndAddToMap(
const OUString rRangeRepresentation )
{
-OUString aRangeRepresentation = rRangeRepresentation;
-if( aRangeRepresentation.indexOf('{') = 0 )
-{
-::std::vector double aNewData;
-::std::vector uno::Any aNewLabels;
-OUStringaToken;
-sal_Int32 nCategories = 0;
-sal_Int32 nIndex = 0;
-boolbValues = true;
-boolbLabelSet = false;
-OUString str = aRangeRepresentation.replace('{',' ').replace('}',' ');
-
-m_aInternalData.clearDefaultData();
-sal_Int32 n = m_aInternalData.getColumnCount();
-if( n )
-n = n - 1;
-
-do
+Referencechart2::data::XDataSequence xSeq =
createDataSequenceFromArray(rRangeRepresentation, OUString());
+if (xSeq.is())
+return xSeq;
+
+xSeq.set(new UncachedDataSequence(this, rRangeRepresentation));
+addDataSequenceToMap(rRangeRepresentation, xSeq);
+return xSeq;
+}
+
+uno::Referencechart2::data::XDataSequence
+InternalDataProvider::createDataSequenceFromArray( const OUString rArrayStr,
const OUString rRole )
+{
+if (rArrayStr.indexOf('{') != 0 || rArrayStr[rArrayStr.getLength()-1] !=
'}')
+{
+// Not an array string.
+return uno::Referencechart2::data::XDataSequence();
+}
+
+bool bAllNumeric = true;
+uno::Referencechart2::data::XDataSequence xSeq;
+
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - chart2/inc chart2/source include/svx offapi/com svx/source
chart2/inc/ChartModel.hxx |2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 33 +-
chart2/source/model/main/ChartModel.cxx |5
chart2/source/view/main/ShapeFactory.cxx | 13 +-
include/svx/unopage.hxx | 12 +-
include/svx/unoshape.hxx |4
offapi/com/sun/star/drawing/XShapes2.idl |4
svx/source/unodraw/unopage.cxx| 53
+-
8 files changed, 108 insertions(+), 18 deletions(-)
New commits:
commit e5dfba48e2a930eb35ac6e72f4ea695f5f048c44
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Apr 25 20:36:26 2014 +0200
quick fix for inheritance problems
Change-Id: I41c5c937d62d6ba0b3df2d4a0101319f272495a7
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 538bc13..f90ca50 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -33,6 +33,7 @@
#include com/sun/star/lang/XUnoTunnel.hpp
#include com/sun/star/awt/Point.hpp
#include com/sun/star/drawing/PolygonKind.hpp
+#include com/sun/star/drawing/XShapes.hpp
#include com/sun/star/drawing/XShapes2.hpp
#include com/sun/star/drawing/XShapeGroup.hpp
#include com/sun/star/container/XIndexAccess.hpp
@@ -383,7 +384,8 @@ public:
***/
class SvxShapeGroup : public SvxShape,
public ::com::sun::star::drawing::XShapeGroup,
- public ::com::sun::star::drawing::XShapes2
+ public ::com::sun::star::drawing::XShapes2,
+ public ::com::sun::star::drawing::XShapes
{
private:
rtl::Reference SvxDrawPage mxPage;
diff --git a/offapi/com/sun/star/drawing/XShapes2.idl
b/offapi/com/sun/star/drawing/XShapes2.idl
index 80b9936..52909ce 100644
--- a/offapi/com/sun/star/drawing/XShapes2.idl
+++ b/offapi/com/sun/star/drawing/XShapes2.idl
@@ -15,11 +15,11 @@
module com { module sun { module star { module drawing {
/**
- * Extend XShapes to allow insertion of shapes at different positions.
+ * Allows insertion of shapes at different positions.
*
* @since LibreOffice 4.2
*/
-interface XShapes2 : com::sun::star::drawing::XShapes
+interface XShapes2
{
/**
* Insert a new shape to the top of the stack.
commit 76cd42bce3016a39d5ca647dce8318d33f0401f6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Apr 25 19:49:09 2014 +0200
fix missing service factory during import, related fdo#74333, cp#157
Conflicts:
chart2/inc/ChartModel.hxx
chart2/source/model/main/ChartModel.cxx
Change-Id: I2cce561587d82b0434ef2d3e65e5d35b7ff99260
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 028ce0e..6b28b8e 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -585,6 +585,8 @@ public:
// normal methods
::com::sun::star::uno::Reference
::com::sun::star::util::XNumberFormatsSupplier
getNumberFormatsSupplier();
+
+com::sun::star::uno::Reference com::sun::star::uno::XInterface
getChartView();
};
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index de42006..35ba049 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1143,6 +1143,24 @@ uno::Reference drawing::XDrawPage
ChartDocumentWrapper::impl_getDrawPage() co
return m_spChart2ModelContact-getDrawPage();
}
+namespace {
+
+uno::Reference lang::XMultiServiceFactory
getShapeFactory(uno::Referenceuno::XInterface xChartView)
+{
+Reference lang::XUnoTunnel xUnoTunnel(xChartView,uno::UNO_QUERY);
+if(xUnoTunnel.is())
+{
+ExplicitValueProvider* pProvider =
reinterpret_castExplicitValueProvider*(xUnoTunnel-getSomething(
+ExplicitValueProvider::getUnoTunnelId() ));
+if( pProvider )
+return pProvider-getDrawModelWrapper()-getShapeFactory();
+
+}
+return uno::Reference lang::XMultiServiceFactory ();
+}
+
+}
+
// XMultiServiceFactory
uno::Reference uno::XInterface SAL_CALL
ChartDocumentWrapper::createInstance(
const OUString aServiceSpecifier )
@@ -1372,15 +1390,18 @@ uno::Reference uno::XInterface SAL_CALL
ChartDocumentWrapper::createInstance(
{
if( !m_xShapeFactory.is() m_xChartView.is() )
{
-Reference lang::XUnoTunnel
xUnoTunnel(m_xChartView,uno::UNO_QUERY);
-if(xUnoTunnel.is())
+m_xShapeFactory = getShapeFactory( m_xChartView );
+}
+else
+{
+ChartModel*
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - chart2/qa chart2/source dbaccess/source include/oox offapi/com oox/source sc/inc sc/source sw/inc sw/source
chart2/qa/extras/chart2import.cxx | 30 ++-
chart2/qa/extras/charttest.hxx | 89 +
chart2/source/inc/InternalDataProvider.hxx |8
chart2/source/tools/InternalDataProvider.cxx | 200 ++---
dbaccess/source/core/inc/DatabaseDataProvider.hxx |6
dbaccess/source/core/misc/DatabaseDataProvider.cxx |8
include/oox/drawingml/chart/chartconverter.hxx |8
offapi/com/sun/star/chart2/data/XDataProvider.idl |3
oox/source/drawingml/chart/chartconverter.cxx |6
oox/source/drawingml/chart/datasourceconverter.cxx |4
oox/source/drawingml/chart/seriesconverter.cxx |6
sc/inc/chart2uno.hxx |4
sc/source/filter/inc/excelchartconverter.hxx |2
sc/source/filter/oox/excelchartconverter.cxx |3
sc/source/ui/unoobj/chart2uno.cxx |8
sw/inc/unochart.hxx|5
sw/source/core/unocore/unochart.cxx|8
17 files changed, 321 insertions(+), 77 deletions(-)
New commits:
commit d4088f84a9617f886173fddf4a3426345ce1704b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 2 11:19:05 2014 -0400
More fine-grained check of data series labels in the unit test.
(cherry picked from commit bdad8d9051c207b2eff0d5a7842da83e6119a600)
Change-Id: I6b23126816bb114407f2b75545094bc297ee7cc3
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 9ca95b6..1441903 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -244,10 +244,17 @@ void Chart2ImportTest::testDOCChartSeries()
void Chart2ImportTest::testDOCXChartSeries()
{
load(/chart2/qa/extras/data/docx/, chart.docx);
-uno::Sequence OUString seriesList =
getWriterChartColumnDescriptions(mxComponent);
-CPPUNIT_ASSERT_EQUAL(OUString(Series 1), seriesList[0]);
-CPPUNIT_ASSERT_EQUAL(OUString(Series 2), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString(Series 3), seriesList[2]);
+Referencechart2::XChartDocument xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Referencechart2::XChartType xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+std::vectoruno::Sequenceuno::Any aLabels =
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString(Series 1), aLabels[0][0].getOUString());
+CPPUNIT_ASSERT_EQUAL(OUString(Series 2), aLabels[1][0].getOUString());
+CPPUNIT_ASSERT_EQUAL(OUString(Series 3), aLabels[2][0].getOUString());
}
void Chart2ImportTest::testPPTChartSeries()
@@ -264,11 +271,18 @@ void Chart2ImportTest::testPPTChartSeries()
void Chart2ImportTest::testPPTXChartSeries()
{
//test chart series names for pptx
-uno::Sequence OUString seriesList =
getImpressChartColumnDescriptions(/chart2/qa/extras/data/pptx/, chart.pptx);
-CPPUNIT_ASSERT_EQUAL(OUString(Column 1), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString(Column 2), seriesList[2]);
-CPPUNIT_ASSERT_EQUAL(OUString(Column 3), seriesList[3]);
+load(/chart2/qa/extras/data/pptx/, chart.pptx);
+Referencechart2::XChartDocument xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Referencechart2::XChartType xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+std::vectoruno::Sequenceuno::Any aLabels =
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString(Column 1), aLabels[0][0].getOUString());
+CPPUNIT_ASSERT_EQUAL(OUString(Column 2), aLabels[1][0].getOUString());
+CPPUNIT_ASSERT_EQUAL(OUString(Column 3), aLabels[2][0].getOUString());
}
void Chart2ImportTest::testODPChartSeries()
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 637cfe0..53a465b 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -50,6 +50,10 @@ public:
void reload( const OUString rFilterName );
uno::Sequence OUString getImpressChartColumnDescriptions( const char*
pDir, const char* pName );
+uno::Referencechart::XChartDocument getChartDocFromWriter( sal_Int32
nShape );
+
+uno::Referencechart::XChartDocument getChartDocFromDrawImpress(
sal_Int32 nPage, sal_Int32 nShape );
+
virtual void setUp();
virtual void tearDown();
protected:
@@ -205,4 +209,89 @@ uno::Sequence OUString
ChartTest::getImpressChartColumnDescriptions( const c
return seriesList;
}
+uno::Referencechart::XChartDocument ChartTest::getChartDocFromWriter(
sal_Int32 nShape )
+{
+Referencedrawing::XDrawPageSupplier xPageSupp(mxComponent,
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPageSupp.is());
+
+Referencedrawing::XDrawPage xPage = xPageSupp-getDrawPage();
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - writerfilter/source
writerfilter/source/dmapper/CellColorHandler.cxx | 20 +---
writerfilter/source/dmapper/CellColorHandler.hxx |5 +++--
writerfilter/source/dmapper/DomainMapper.cxx | 12 +++-
3 files changed, 31 insertions(+), 6 deletions(-)
New commits:
commit 29072b501b276ac4d0129a86ab31d0b8634e5283
Author: Steve Yin stev...@apache.org
Date: Thu Jul 3 02:52:17 2014 +
Issue 119044 - Highlighter from DOCX file not imported correctly
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index feba9c6..deafbb6 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -44,7 +44,7 @@ LoggedProperties(dmapper_logger, CellColorHandler),
m_nShadowType( 0 ),
m_nColor( 0x ),
m_nFillColor( 0x ),
-m_bParagraph( false )
+m_eType( Others )
{
}
/*-- 24.04.2007 09:06:35---
@@ -225,8 +225,22 @@ TablePropertyMapPtr CellColorHandler::getProperties()
nApplyColor = ( (nRed/1000) 0x10 ) + ((nGreen/1000) 8) +
nBlue/1000;
}
-pPropertyMap-Insert( m_bParagraph ? PROP_PARA_BACK_COLOR :
PROP_BACK_COLOR, false,
-uno::makeAny( nApplyColor ));
+sal_Int32 objType = PROP_CHAR_BACK_COLOR;
+
+switch(m_eType)
+{
+case P:
+pPropertyMap-Insert( PROP_PARA_BACK_COLOR, false, uno::makeAny(
nApplyColor ));
+break;
+case C:
+pPropertyMap-Insert( PROP_CHAR_BACK_COLOR, false, uno::makeAny(
nApplyColor ));
+break;
+case Others:
+default:
+pPropertyMap-Insert( PROP_BACK_COLOR, false, uno::makeAny(
nApplyColor ));
+break;
+}
+
return pPropertyMap;
}
} //namespace dmapper
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx
b/writerfilter/source/dmapper/CellColorHandler.hxx
index 3ecfe68..b65c4d0 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -39,7 +39,8 @@ public:
sal_Int32 m_nShadowType;
sal_Int32 m_nColor;
sal_Int32 m_nFillColor;
-bool m_bParagraph;
+enum Type {P, C, Others};
+Type m_eType;
private:
// Properties
@@ -52,7 +53,7 @@ public:
::boost::shared_ptrTablePropertyMapgetProperties();
-void setParagraph() { m_bParagraph = true; }
+void setType(Type type) { m_eType = type; }
};
typedef boost::shared_ptr CellColorHandler CellColorHandlerPtr;
}}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 02248d2..4a06a1e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2617,7 +2617,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
if( pProperties.get())
{
CellColorHandlerPtr pCellColorHandler( new CellColorHandler );
-pCellColorHandler-setParagraph();
+pCellColorHandler-setType(CellColorHandler::P);
pProperties-resolve(*pCellColorHandler);
rContext-insert( pCellColorHandler-getProperties(), true );
}
@@ -3186,6 +3186,16 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break; // sprmCBrc
case NS_sprm::LN_CShd:
/* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+{
+writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
+if( pProperties.get())
+{
+CellColorHandlerPtr pCellColorHandler( new CellColorHandler );
+pCellColorHandler-setType(CellColorHandler::C);
+pProperties-resolve(*pCellColorHandler);
+rContext-insert( pCellColorHandler-getProperties(), true );
+}
+}
break; // sprmCShd
case NS_sprm::LN_CIdslRMarkDel:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] 4.3.0 new features and communication
Le 01/07/2014 16:13, Marina Latini a écrit : Hi Sophie, All :) - Messaggio originale - Da: Sophie gautier.sop...@gmail.com A: LibreOffice-QA libreoffice-qa@lists.freedesktop.org Inviato: Martedì, 1 luglio 2014 15:27:52 Oggetto: [Libreoffice-qa] 4.3.0 new features and communication Hi Joel, Robinson, In order to prepare the communication on the 4.3.0 release, is there some areas that are not stable enough, or where some bugs remain problematics and should be known by the marketing team? bug: https://bugs.freedesktop.org/show_bug.cgi?id=79673 is a Mac specific problem releted to Nonprinting Characters. They are unusable :( Thanks for your feedback Marina, this is noted, but as this is font/zoom dependent and only Mac, that won't affect the largest user base. Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.3.0 new features and communication
Hi Joel, Le 01/07/2014 16:57, Joel Madero a écrit : On 07/01/2014 06:27 AM, Sophie wrote: Hi Joel, Robinson, In order to prepare the communication on the 4.3.0 release, is there some areas that are not stable enough, or where some bugs remain problematics and should be known by the marketing team? Monitoring the MAB didn't give me this impression, but I prefer to have your opinion :) As far as I know there are none. I'll poke bugzilla tonight to see what I can find out. Jay might have some feedback here also (Jay thoughts? Any bugs that indicate that there is an area of 4.3 that is not stable enough or bugs so problematic that we need marketing involved?). ok, thanks a lot! Thanks Sophie for tackling this :) you're welcome :) Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.3.0 new features and communication
Hi Joel, All, I dont see anything from the 4.3 mabs that stands out to me on why it should be released, except for maybe the high contrast icons in the control center. :) Regards, Jay Philips On 07/01/2014 06:57 PM, Joel Madero wrote: On 07/01/2014 06:27 AM, Sophie wrote: Hi Joel, Robinson, In order to prepare the communication on the 4.3.0 release, is there some areas that are not stable enough, or where some bugs remain problematics and should be known by the marketing team? Monitoring the MAB didn't give me this impression, but I prefer to have your opinion :) As far as I know there are none. I'll poke bugzilla tonight to see what I can find out. Jay might have some feedback here also (Jay thoughts? Any bugs that indicate that there is an area of 4.3 that is not stable enough or bugs so problematic that we need marketing involved?). Thanks Sophie for tackling this :) Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.3.0 new features and communication
Hi Alex, Le 02/07/2014 07:45, Alex Thurgood a écrit : Le 01/07/2014 15:27, Sophie a écrit : Hi Sophie, In order to prepare the communication on the 4.3.0 release, is there some areas that are not stable enough, or where some bugs remain problematics and should be known by the marketing team? Monitoring the MAB didn't give me this impression, but I prefer to have your opinion :) I assume that we are not yet announcing Firebird as the default embedded db ? It's still an experimental feature, so no :) Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Rewritten backtrace with WinDbg
Hi All, After going through many pains to understand how to get backtracing done through WinDbg, even after reading the wiki and watching the video, I have rewritten the introduction, first time setup and debugging sections of the wiki page. I'm currently adding images to the wiki to make it a bit more visual for the step by step process. It would be great for those familiar with the process to have a quick read over it. For those that havent done it before and have Windows, it would be good for them to give it a try to make sure the process is easily understandable, as we are suggesting our users to go through the same process. :) https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg -- Regards, Jay Philips ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.3.0 new features and communication
- Messaggio originale - Da: Sophie gautier.sop...@gmail.com A: libreoffice-qa@lists.freedesktop.org Inviato: Mercoledì, 2 luglio 2014 16:18:13 Oggetto: Re: [Libreoffice-qa] 4.3.0 new features and communication Thanks for your feedback Marina, this is noted, but as this is font/zoom dependent and only Mac, that won't affect the largest user base. Hi Sophie, JFYI, the bug is Mac specific but is font and zoom independent. I'm agree with you, Windows and GNU/Linux users aren't affected but all Mac users can't use nonprinting characters. See Italo's and Joren's attachements to the bug. Have a nice day, Marina -- Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.3.0 new features and communication
Le 02/07/2014 16:41, Marina Latini a écrit : - Messaggio originale - Da: Sophie gautier.sop...@gmail.com A: libreoffice-qa@lists.freedesktop.org Inviato: Mercoledì, 2 luglio 2014 16:18:13 Oggetto: Re: [Libreoffice-qa] 4.3.0 new features and communication Thanks for your feedback Marina, this is noted, but as this is font/zoom dependent and only Mac, that won't affect the largest user base. Hi Sophie, JFYI, the bug is Mac specific but is font and zoom independent. I'm agree with you, Windows and GNU/Linux users aren't affected but all Mac users can't use nonprinting characters. See Italo's and Joren's attachements to the bug. Oh, I don't say it's not important of course :) just that that doesn't concern the PR on new features in general. Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANNOUNCE] Branch libreoffice-4-3-0 and Tag libreoffice-4.3.0.2 created
Hi all, The tag libreoffice-4.3.0.2 (AKA 4.3.0 RC2) and the corresponding branch libreoffice-4-3-0 have been created. The branch will be used for fine tuning of the 4.3.0 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything Remember to submit your still-pending patches to the libreoffice-4-3-0 branch The 'libreoffice-4-3' branch is still active and will be used for the 4.3.1 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-0 origin/libreoffice-4-3-0 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.0.2 libreoffice-4.3.0.2 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-2-5 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.0 RC1 Happy hacking, Christian + core + : Crash when playing with a Group inside a Group (fdo#54155) [Julien Nabet] + a better approach for getting element names. (fdo#76260) [Michael Meeks] + accelerate non-poolable item add / remove. (fdo#79851, fdo#38513) [Michael Meeks] + accept also one cell chart ranges for external data provider, (fdo#79772) [Markus Mohrhard] + after execute() a ResultSet is expected to be BeforeFirst (fdo#79427) [Lionel Elie Mamane] + bah, const issue [Caolán McNamara] + bin_library_info.sh: popd does not take a directory parameter [Michael Stahl] + branch libreoffice-4-3-0 [Christian Lohmaier] + bump product version to 4.3.0.1.0+ [Christian Lohmaier] + bump product version to 4.3.0.2 [Christian Lohmaier] + calc invalid image position on zooming (fdo#76160) [Damien Chambe] + check for empty() before calling top(). [Kohei Yoshida] + check only one radio button in a group (fdo#80422) [David Tardon] + check SwFmt::GetItemState()'s ppItem parameter... (i#125071) [Herbert Dürr] + clang: Use-after-free [Caolán McNamara] + create clipping polygon correctly (fdo#79615) [David Tardon] + do not hide top of the first row when editing text in table cells. (bnc#882631) [Matúš Kukan] + don't go further and pop the stack if it's empty. [Kohei Yoshida] + don't try to set property mapping if there is no value [Markus Mohrhard] + enable Impress Remote Dialog menu item for all view shells. (fdo#63378) [Andrzej Hunt] + error: no matching function for call to 'assertEquals' [Matúš Kukan] + file driver PreparedStatement: close previous ResultSet on reexec (fdo#80084) [Lionel Elie Mamane] + fix broken redlines after undoing column count change (cp#171) [Luboš Luňák] + fix build to work with older harfbuzz versions. [Thorsten Behrens] + fix expanded/condensed text breaking... (i#124935) [Herbert Dürr] + fix hyphenation (fdo#79372, fdo#56392) [László Németh] + fix path of redline_tmpl.hrc (fdo#80324) [Andras Timar] + fix reading of section margins (bnc#875715) [Luboš Luňák] + fix SDK examples [Stephan Bergmann] + fix tab order on ReadyToInstall dialog (fdo#80527) [Andras Timar] + fixed the old vector length (fdo#37401, i#39528) [Hideki Ikeda] + fixes for up-casting to ReferenceXInterface [Noel Grandin] + flush modified data to the model when pressing OK in the data table dialog. [Kohei Yoshida] + followup fix (fdo#80332) [Andras Timar] + inverted spell-check continue logic (fdo#80140) [Caolán McNamara] + libgltf: fix Linux-with-check build [Zolnai Tamás] + limits need to multiplied by num of decimal places (fdo#42747) [Caolán McNamara] + lok: It is expected that we point directly to the program/ directory. [Jan Holesovsky] + LOK: kill double initialize. [Andrzej Hunt] + LOK: kill saveAsWithOptions. [Andrzej Hunt] + make title of dialog localisable (fdo#51763) [Joren De Cuyper] + mismatched icons in Chart Data Table dialog (fdo#80295) [Joren De Cuyper] + MSWord uses \xb for linebreaks in DB fields, take 2 (bnc#878854) [Luboš Luňák] + no need to offset column index by category labels. (fdo#79151) [Kohei Yoshida] + notify mispelled word to accessibility (fdo#71558) [Jacobo Aragunde Pérez] + numbering too small on
[Libreoffice-bugs] [Bug 77328] Cross reference not working with footnotes
https://bugs.freedesktop.org/show_bug.cgi?id=77328 Kumāra kumaras...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||kumaras...@gmail.com Ever confirmed|0 |1 --- Comment #7 from Kumāra kumaras...@gmail.com --- I've tried this on 4.1.6.2 and notice no issues with a footnote 88 on page 48 (Total 77 pages). Can you all please provide the earliest version this bug is seen? The version field says 4.2.2.1 while OP says at least v. 4.1. According to Comment 6, cross references to footnote number and footnote page, that didn't work in 4.2.3.3 seem to be fixed in 4.2.4.2. Can others confirm? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77050] Formatting of heading lost if inserted as cross-reference field
https://bugs.freedesktop.org/show_bug.cgi?id=77050 Kumāra kumaras...@gmail.com changed: What|Removed |Added Severity|normal |enhancement CC||kumaras...@gmail.com --- Comment #4 from Kumāra kumaras...@gmail.com --- This is not a bug, but an enhancement request. So, I've change the Importance field accordingly. I'm one who prefer it as it is (i.e., opposite behaviour of the request). Besides, I think formatting is not meant to be reproduced for cross-references. Isn't it odd if you cross-reference a heading that is bold and 24pt large and in your text that is regular and 12pt? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58407] Call inserted images Figure rather than Illustration by default in caption
https://bugs.freedesktop.org/show_bug.cgi?id=58407 --- Comment #3 from Owen Genat owen.ge...@gmail.com --- Also worth looking at what is possible, with respect to a similar term change, as documented in bug 70998 (Graphic/Picture - Image). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80750] FILESAVE: drawings are not saved
https://bugs.freedesktop.org/show_bug.cgi?id=80750 --- Comment #8 from Stefan stefan.herbe...@perq.de --- Created attachment 102109 -- https://bugs.freedesktop.org/attachment.cgi?id=102109action=edit Sample file -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80750] FILESAVE: drawings are not saved
https://bugs.freedesktop.org/show_bug.cgi?id=80750 --- Comment #10 from Stefan stefan.herbe...@perq.de --- Created attachment 102111 -- https://bugs.freedesktop.org/attachment.cgi?id=102111action=edit Screenshot -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80750] FILESAVE: drawings are not saved
https://bugs.freedesktop.org/show_bug.cgi?id=80750 --- Comment #9 from Stefan stefan.herbe...@perq.de --- Created attachment 102110 -- https://bugs.freedesktop.org/attachment.cgi?id=102110action=edit Screenshot -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80750] FILESAVE: drawings are not saved
https://bugs.freedesktop.org/show_bug.cgi?id=80750 --- Comment #11 from Stefan stefan.herbe...@perq.de --- (In reply to comment #7) Em..I still can't reproduce. Perhaps you could attach sample document for testing (with chart) explain how we should draw the line ? I have submitted 3 Files: a the ods-file and to Screenshots (wit and withot the Line and the square. Take the samplefile, double-click on the diagramm and paint somthing in the diagramm. Do not paint in the sheet across the Diagram, because then the lines will not move if you move the diagramm. I Hope, this will help to reproduce the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76794] EDITING: [Bug 76781] : Crossreference not working with endnotes
https://bugs.freedesktop.org/show_bug.cgi?id=76794 Kumāra kumaras...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||kumaras...@gmail.com Ever confirmed|0 |1 --- Comment #3 from Kumāra kumaras...@gmail.com --- Hey! I know what an endnote is and how to make a cross-reference (to an endnote at that). I've tested and find no problem with a cross-reference to an endnote (n.46) in a document with 33 pages. If you want help, it helps to be more helpful in telling us what you want. We're not being paid, you know? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 78989] LO in --headless mode cannot create odt documents from template
https://bugs.freedesktop.org/show_bug.cgi?id=78989 --- Comment #7 from ign_christian ign_christ...@yahoo.com --- Looks like I got same result with you Rai (tested with your file): $ libreoffice --version LibreOffice 4.2.5.2 420m0(Build:2) $ libreoffice --headless --convert-to odt BlankTemplate.ott convert /home/christian/Downloads/BlankTemplate.ott - /home/christian/Downloads/BlankTemplate.odt using OpenDocument Text Flat XML $ file BlankTemplate.odt BlankTemplate.odt: XML document text Tested on Ubuntu 12.04 x86 Same result with my own created file using 4.2.5.2. Perhaps related to Default file format and ODF settings in profile settings ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80788] Footnote resonds very slowly to typing
https://bugs.freedesktop.org/show_bug.cgi?id=80788 asty...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80786] Feature request: Function to remove field codes
https://bugs.freedesktop.org/show_bug.cgi?id=80786 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|normal |enhancement CC||c...@nouenoff.nl Ever confirmed|0 |1 --- Comment #1 from Cor Nouws c...@nouenoff.nl --- Thanks Stian for the request. What a whole lot of words for such a simple idea ;) Currently: Select/Copy/Paste special as text. Indeed, a bit more key strokes. Cheers, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80788] New: Footnote resonds very slowly to typing
https://bugs.freedesktop.org/show_bug.cgi?id=80788 Priority: medium Bug ID: 80788 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Footnote resonds very slowly to typing Severity: normal Classification: Unclassified OS: Linux (All) Reporter: asty...@gmail.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice Writer gets very slow when typing footnotes. I need to wait an average of one to two seconds for each letter to appear as I type. The situation gets worse when I type in Chinese and use Zotero to add citations. Typing in the main document section does not present the same problem. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80786] Feature request: Function to remove field codes
https://bugs.freedesktop.org/show_bug.cgi?id=80786 --- Comment #2 from Stian Øby Johansen stian@gmail.com --- Thanks for the prompt reply - and sorry if I wrote too much! Just wanted to state my case clearly, as I figured the chances of success would be better ;-) Just tested your suggested workaround, and it did not work much better than the suggestion on the Zotero forums, which was to save as a word document and then open again in Libreoffice and save back to an ODT. Both have the disadvantage of not perfectly preserving formatting. This was my experience with your suggested workaround, cut + paste special (Crtl+Shift+V): - Paste as Libreoffice Writer: Does not remove field codes at all (as should be expected) - Paste as Formatted text (RTF): Best variant. Removes field codes and perserves formatting for e.g. ciations, but does change up some of my heading styles. In other words, not perfect, but an OK workaround. - Paste as HTML: A bit worse than the RTF paste option, as it changes the spacing between paragraphs and footnotes in my test documents. Does remove field codes nicely, though. - Paste as unformatted text: Removes all formatting, including the footnotes themselves - therefore useless for these purposes. Thanks again for replying, and for your suggestion. It works as an barely sufficient(temporary) workaround, but we should also have the perfect solution: a Libreoffice feature :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80789] New: UI: Crash of loimpress freezes application without further information for user
https://bugs.freedesktop.org/show_bug.cgi?id=80789 Priority: medium Bug ID: 80789 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Crash of loimpress freezes application without further information for user Severity: normal Classification: Unclassified OS: Windows (All) Reporter: libreoff...@weilnetz.de Hardware: All Status: UNCONFIRMED Version: 4.2.5.2 release Component: Presentation Product: LibreOffice The current versions of LO have a bug which results in an application crash when certain files are opened. This was reported here: https://bugs.freedesktop.org/show_bug.cgi?id=80771. While Linux users can see that there was an application crash (SIGSEGV), Windows users only notice that LibreOffice freezes. It is no longer possible to close the application normally. Users have to kill it with the task manager. The test was done with 64 bit Windows 8.1. Bugs like the one which triggered this report (which will be fixed in the next releases) can also occur in future versions of LibreOffice. They should be handled in a better way: the user must be noticed that there is a problem with the software. Ideally it should be possible to file a crash report. A minimum solution could show a dialog box and allow termination of LibreOffice. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80790] New: EDITING: LibreOffice Calc crash
https://bugs.freedesktop.org/show_bug.cgi?id=80790 Priority: medium Bug ID: 80790 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: LibreOffice Calc crash Severity: normal Classification: Unclassified OS: Windows (All) Reporter: l-e-...@ya.ru Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.1.1 release Component: Spreadsheet Product: LibreOffice Created attachment 102113 -- https://bugs.freedesktop.org/attachment.cgi?id=102113action=edit test file Problem description: Steps to reproduce: 1. open file test.ods 2. select via Ctrl strings № 7,9,11,12 3. try to delete them Current behavior: crash :( Expected behavior: simpy delete strings :) Operating System: Windows 7 Version: 4.2.1.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80771] Crash when trying to open ms pptx file
https://bugs.freedesktop.org/show_bug.cgi?id=80771 --- Comment #5 from Stefan Weil libreoff...@weilnetz.de --- I submitted a new bug for LibreOffice on Windows, see https://bugs.freedesktop.org/show_bug.cgi?id=80789. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77654] Recovery Loop
https://bugs.freedesktop.org/show_bug.cgi?id=77654 Alex l-e-...@ya.ru changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80790] EDITING: LibreOffice Calc crash
https://bugs.freedesktop.org/show_bug.cgi?id=80790 Alex l-e-...@ya.ru changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80790] EDITING: LibreOffice Calc crash
https://bugs.freedesktop.org/show_bug.cgi?id=80790 Alex l-e-...@ya.ru changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) Severity|normal |critical Version|4.2.1.1 release |4.2.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77654] Recovery Loop
https://bugs.freedesktop.org/show_bug.cgi?id=77654 Alex l-e-...@ya.ru changed: What|Removed |Added Depends on||80790 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80790] EDITING: LibreOffice Calc crash
https://bugs.freedesktop.org/show_bug.cgi?id=80790 Alex l-e-...@ya.ru changed: What|Removed |Added Blocks||77654 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79905] EDITING: Crash wehen copy paste cell range as GDI Metafile to Draw or Writer
https://bugs.freedesktop.org/show_bug.cgi?id=79905 Bugcruncher libobugcrunc...@gmail.com changed: What|Removed |Added Status|RESOLVED|VERIFIED CC||libobugcrunc...@gmail.com --- Comment #2 from Bugcruncher libobugcrunc...@gmail.com --- Yes, no longer crashes with Version: 4.2.5.2 Build-ID: 61cb170a04bb1f12e77c884eab9192be736ec5f5 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80750] FILESAVE: Drawing inside chart lost in LO 4.2.x
https://bugs.freedesktop.org/show_bug.cgi?id=80750 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added OS|Windows (All) |All Status|UNCONFIRMED |NEW Whiteboard|BSA PossibleRegression |BSA Summary|FILESAVE: drawings are|FILESAVE: Drawing inside |not saved |chart lost in LO 4.2.x Version|4.2.5.2 release |4.2.0.0.beta1 Keywords||regression Ever confirmed|0 |1 --- Comment #12 from ign_christian ign_christ...@yahoo.com --- Ok I got it. Using chart in sheet '2014 Daten' and painting using simple line inside x-y chart area. Lost after saving reopening. Reproduced in 4.2.5.2, 4.2.0.0.beta1 Not reproduced in 4.1.6.2, 4.3.0.1 So the problem is in 4.2.x, I wonder how it works well in 4.2.4.2 as stated in comment 0 ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80789] UI: Crash of loimpress freezes application without further information for user
https://bugs.freedesktop.org/show_bug.cgi?id=80789 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||serval2...@yahoo.fr, ||tlillqv...@suse.com --- Comment #1 from Julien Nabet serval2...@yahoo.fr --- Tor: thought you might be interested in this one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70751] EPS image does not display in slideshow
https://bugs.freedesktop.org/show_bug.cgi?id=70751 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Summary|this image does not appear |EPS image does not display |in slideshow|in slideshow --- Comment #14 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #13) Tested on Linux Mint and this is a regression in 4.0.6, 4.1.6, and 4.2.4. It works fine in 3.3.0, 3.6.7, 4.2.5, 4.2.6 and 4.3 beta 2 in the slideshow. I can confirm this behaviour for Debian 7 x86_64 running v4.1.6.2 (no display in slide show mode) and Crunchbang 11 x86_64 running v4.2.5.2 (does display in slide show mode). Summary amended for clarity. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
