[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libabw
external/libabw/UnpackedTarball_libabw.mk |1 + external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 | 11 +++ 2 files changed, 12 insertions(+) New commits: commit 97269ea7b1a16bb0dd692307c903e63888545efa Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Jan 21 08:44:45 2014 +0100 Coverity: Potential crash (?) Change-Id: I819b0df446cf95d511d6a7a5a65c381a2a837d00 (cherry picked from commit 7989850e9fc5fb2fb757ecf388b51bc3e96a0267) Reviewed-on: https://gerrit.libreoffice.org/7562 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index c61f2d5..4f8b440 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,libabw,\ external/libabw/libabw-0.0.1-inttypes.patch.1 \ + external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 new file mode 100644 index 000..fccaa8e --- /dev/null +++ b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 @@ -0,0 +1,11 @@ +--- a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp +@@ -643,7 +643,7 @@ void libabw::ABWContentCollector::collectHeaderFooter(const char *id, const char + if (!type) + m_ps-m_currentHeaderFooterId = -1; + +- std::string sType(type); ++ std::string sType(type ? type : ); + boost::trim(sType); + std::vectorstd::string strVec; + boost::algorithm::split(strVec, sType, boost::is_any_of(-), boost::token_compress_on); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/xml/xmlexprt.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 70c61a549184cf8611f7890ac31b0ba4c460cdec
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 20 23:15:14 2014 +0100
resolved fdo#70275 write correct office:string-value if text format applied
Change-Id: I52e5135139fdf88abe380b6e5ae60e2afb582289
Reviewed-on: https://gerrit.libreoffice.org/7555
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 4f97260..fe0a33b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2882,13 +2882,15 @@ void ScXMLExport::WriteCell(ScMyCell aCell, sal_Int32
nEqualCellCount)
break;
case table::CellContentType_TEXT :
{
-GetCellText(aCell, aCellPos);
OUString sFormula(lcl_GetRawString(pDoc, aCellPos));
+if (aCell.maBaseCell.isEmpty())
+aCell.maBaseCell.assign( *pDoc, aCellPos);
+OUString sCellString = aCell.maBaseCell.getString(pDoc);
GetNumberFormatAttributesExportHelper()-SetNumberFormatAttributes(
-sFormula, aCell.sStringValue, true, true);
+sCellString, sFormula, true, true);
if( getDefaultVersion() SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()-SetNumberFormatAttributes(
-sFormula, aCell.sStringValue, false, true,
XML_NAMESPACE_CALC_EXT);
+sCellString, sFormula, false, true,
XML_NAMESPACE_CALC_EXT);
}
break;
case table::CellContentType_FORMULA :
___
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-0' - sc/source
sc/source/core/tool/cellform.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit a8de4627134ed8bf79a50c78a39f42fbc3be1051
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 20 19:21:55 2014 +0100
resolved fdo#73836 do not apply format twice to string
ScDocument::GetString() already returns the formatted string that then
was formatted through number formatter. Format raw string instead.
Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd
(cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9)
Reviewed-on: https://gerrit.libreoffice.org/7550
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 434043f..6a23ba2 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -144,14 +144,16 @@ OUString ScCellFormat::GetString(
{
case CELLTYPE_STRING:
{
-OUString aCellString = rDoc.GetString(rPos);
-rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor,
bUseStarFormat);
+ScRefCellValue aCell;
+aCell.assign(rDoc, rPos);
+rFormatter.GetOutputString(aCell.mpString-getString(), nFormat,
aString, ppColor, bUseStarFormat);
}
break;
case CELLTYPE_EDIT:
{
-OUString aCellString = rDoc.GetString(rPos);
-rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor);
+ScRefCellValue aCell;
+aCell.assign(rDoc, rPos);
+rFormatter.GetOutputString(aCell.getString(rDoc), nFormat,
aString, ppColor);
}
break;
case CELLTYPE_VALUE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 32 ++---
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 9d4a40f108e24422dc7aad60f4d17bff08449e90
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jan 21 10:00:48 2014 +0200
Use SAL_WARN instead of printing to stderr
Change-Id: I83f2b1d7fbe940917ef2c0b7be225c722fe9df05
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 5b5fadf..d4d92cd 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -66,7 +66,7 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
case AVAHI_ENTRY_GROUP_FAILURE :
-fprintf(stderr, Entry group failure: %s\n,
avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g;
+SAL_WARN(sdremote.wifi, Entry group failure:
avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g;
/* Some kind of failure happened while we were registering our
services */
avahi_threaded_poll_quit(threaded_poll);
@@ -86,7 +86,7 @@ static void create_services(AvahiClient *c) {
if (!group)
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
-fprintf(stderr, avahi_entry_group_new() failed: %s\n,
avahi_strerror(avahi_client_errno(c)));
+SAL_WARN(sdremote.wifi, avahi_entry_group_new() failed:
avahi_strerror(avahi_client_errno(c)));
avahiService-clear();
}
@@ -109,7 +109,7 @@ static void create_services(AvahiClient *c) {
char *n =
avahi_alternative_service_name(avahiService-getName().c_str());
avahiService-setName(n);
-fprintf(stderr, Service name collision, renaming service to
'%s'\n, avahiService-getName().c_str());
+SAL_WARN(sdremote.wifi, Service name collision, renaming
service to ' avahiService-getName() ');
avahi_entry_group_reset(group);
@@ -117,13 +117,13 @@ static void create_services(AvahiClient *c) {
return;
}
-fprintf(stderr, Failed to add _impressremote._tcp service: %s\n,
avahi_strerror(ret));
+SAL_WARN(sdremote.wifi, Failed to add _impressremote._tcp
service: avahi_strerror(ret));
avahiService-clear();
}
/* Tell the server to register the service */
if ((ret = avahi_entry_group_commit(group)) 0) {
-fprintf(stderr, Failed to commit entry group: %s\n,
avahi_strerror(ret));
+SAL_WARN(sdremote.wifi, Failed to commit entry group:
avahi_strerror(ret));
avahiService-clear();
}
}
@@ -141,7 +141,7 @@ static void client_callback(AvahiClient *c,
AvahiClientState state, AVAHI_GCC_UN
create_services(c);
break;
case AVAHI_CLIENT_FAILURE:
-fprintf(stderr, Client failure: %s\n,
avahi_strerror(avahi_client_errno(c)));
+SAL_WARN(sdremote.wifi, Client failure:
avahi_strerror(avahi_client_errno(c)));
avahiService-clear();
break;
case AVAHI_CLIENT_S_COLLISION:
@@ -165,27 +165,27 @@ void AvahiNetworkService::setup() {
int error = 0;
avahiService = this;
if (!(threaded_poll = avahi_threaded_poll_new())) {
- fprintf(stderr, avahi_threaded_poll_new '%s' failed.\n, avahi_strdup(
avahiService-getName().c_str() ));
- return;
+ SAL_WARN(sdremote.wifi, avahi_threaded_poll_new '
avahiService-getName() ' failed);
+ return;
}
if (!(client = avahi_client_new(avahi_threaded_poll_get(threaded_poll),
static_castAvahiClientFlags(0), client_callback, NULL, error))) {
- fprintf(stderr, avahi_client_new failed.\n);
- return;
+ SAL_WARN(sdremote.wifi, avahi_client_new failed);
+ return;
}
create_services(client);
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(threaded_poll) 0) {
- fprintf(stderr, avahi_threaded_poll_start failed.\n);
- return;
+ SAL_WARN(sdremote.wifi, avahi_threaded_poll_start failed);
+ return;
}
}
void AvahiNetworkService::clear() {
- /* Call this when the app shuts down */
- avahi_threaded_poll_stop(threaded_poll);
- avahi_client_free(client);
- avahi_threaded_poll_free(threaded_poll);
+/* Call this when the app shuts down */
+avahi_threaded_poll_stop(threaded_poll);
+avahi_client_free(client);
+avahi_threaded_poll_free(threaded_poll);
}
___
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' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo73389.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 23 +--
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 7e31667cd6d83d76b641462118ae05ec3c19f4b5
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jan 20 13:44:46 2014 +0100
fdo#73389 Writer does not show a docx-document with nested table correctly
The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
Reviewed-on: https://gerrit.libreoffice.org/7543
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6d44d45..e9c5ad0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1563,6 +1563,13 @@ DECLARE_OOXMLIMPORT_TEST(testRPrChangeClosed,
rprchange_closed.docx)
CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 1),
RedlineType));
}
+DECLARE_OOXMLIMPORT_TEST(testFdo73389,fdo73389.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// This was 9340, i.e. the width of the inner table was too large.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2842),
getPropertysal_Int32(xTables-getByIndex(0), Width));
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c4b24a7..cc7d119 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,24 +142,17 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
*/
bool bFixed = true;
sal_Int32 nRowFixedWidth = 0;
-if (!m_aCellWidths.empty())
+IntVectorPtr pCellWidths = getCurrentCellWidths();
+// Step 1. Check whether all cells have fixed
widths in the given row of table.
+for (std::vectorsal_Int32::const_iterator
aValIter = pCellWidths-begin(); aValIter != pCellWidths-end(); ++aValIter)
{
-// Step 1. Check whether all cells have fixed
widths in the given row of table.
-::std::vector IntVectorPtr ::iterator itr;
-for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); ++itr )
+if (*aValIter == -1)
{
-IntVectorPtr itrVal = (*itr);
-for
(std::vectorsal_Int32::const_iterator aValIter = itrVal-begin(); aValIter !=
itrVal-end(); ++aValIter)
-{
-if (*aValIter == -1)
-{
-bFixed = false;
-break;
-}
-// Sum the width of cells to find the
total width of given row
-nRowFixedWidth += (*aValIter);
-}
+bFixed = false;
+break;
}
+// Sum the width of cells to find the total
width of given row
+nRowFixedWidth += (*aValIter);
}
// Check whether the total width of given row is
compared with the maximum value of rows (m_nMaxFixedWidth).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/71f2a8da98fd1ef2ac40a18a2c104c3087b327
37/71f2a8da98fd1ef2ac40a18a2c104c3087b327 |1 + 1 file changed, 1 insertion(+) New commits: commit ebcee0f5d997d9a959e2cb030dadf4fdbfb74d2a Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 09:18:42 2014 + Notes added by 'git notes add' diff --git a/37/71f2a8da98fd1ef2ac40a18a2c104c3087b327 b/37/71f2a8da98fd1ef2ac40a18a2c104c3087b327 new file mode 100644 index 000..3c68f67 --- /dev/null +++ b/37/71f2a8da98fd1ef2ac40a18a2c104c3087b327 @@ -0,0 +1 @@ +prefer: 660d761bfeea81c0b76cf08b4c961a2ad8d09a06 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 33/d4279ad9ea0b51baa56430b5e4ba3a8a6ec70c
33/d4279ad9ea0b51baa56430b5e4ba3a8a6ec70c |1 + 1 file changed, 1 insertion(+) New commits: commit 1edb76154fd734ec71fdcea6b596b90211ea52b8 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 09:20:18 2014 + Notes added by 'git notes add' diff --git a/33/d4279ad9ea0b51baa56430b5e4ba3a8a6ec70c b/33/d4279ad9ea0b51baa56430b5e4ba3a8a6ec70c new file mode 100644 index 000..f2971b9 --- /dev/null +++ b/33/d4279ad9ea0b51baa56430b5e4ba3a8a6ec70c @@ -0,0 +1 @@ +prefer: c8e9038b13c64df430fb4e3fecac65a3c507e3e8 ___ 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-0' - drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1d2ef1adfbee6ac1fe1fa2ba369d2cbd28dd8246
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 17 15:17:55 2014 +0100
fdo#72530: drawinglayer: fix PDF export of lossless picture
Don't pass empty Rectangle to PDFExtOutDevData::EndGroup(), it will
result in early return from PDFWriterImpl::drawJPGBitmap() and no
picture in the PDF. Passing in the same Rectangle for the 3rd and 4th
parameter will avoid cropping in PDFExtOutDevData.
(regression from 677df250becd5cde71c6310f647e78ac3763347e)
Change-Id: Icf110fe3e635319419fcacc7bc684c792a34d6ad
(cherry picked from commit c8e9038b13c64df430fb4e3fecac65a3c507e3e8)
Reviewed-on: https://gerrit.libreoffice.org/7502
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 9c569b326c9d2d71132e722a1783e7e201c1bf3c)
Reviewed-on: https://gerrit.libreoffice.org/7503
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index f6aad73..94fc972 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -824,7 +824,8 @@ namespace drawinglayer
sal_Int32(floor(aCurrentRange.getMinX())),
sal_Int32(floor(aCurrentRange.getMinY())),
sal_Int32(ceil(aCurrentRange.getMaxX())),
sal_Int32(ceil(aCurrentRange.getMaxY(;
const GraphicAttr rAttr =
rGraphicPrimitive.getGraphicAttr();
-Rectangle aCropRect;
+// fdo#72530 don't pass empty Rectangle to EndGroup
+Rectangle aCropRect(aCurrentRect);
if(rAttr.IsCropped())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx sc/source svx/source sw/source
include/svx/fmgridcl.hxx |2 +-
include/svx/fmshell.hxx |2 +-
include/svx/gridctrl.hxx |2 +-
include/svx/svdmrkv.hxx |4 ++--
sc/source/ui/view/tabview5.cxx |2 +-
svx/source/fmcomp/fmgridcl.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx |2 +-
svx/source/form/fmshell.cxx |2 +-
svx/source/form/fmshimp.cxx |2 +-
svx/source/inc/fmshimp.hxx |2 +-
svx/source/svdraw/svdmrkv.cxx|2 +-
svx/source/svdraw/svdmrkv1.cxx |2 +-
svx/source/unodraw/unopage.cxx |4 ++--
sw/source/core/frmedt/fecopy.cxx |4 ++--
sw/source/ui/ribbar/conform.cxx |2 +-
sw/source/ui/shells/textdrw.cxx |2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7f9301e7eaff91cbe064d26e6b69b785dd9bb458
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 10:49:49 2014 +0100
warning C4805: '!=' : unsafe mix of type 'sal_Bool' and type 'bool'
Change-Id: I3d4f1ac0debf506e3c4f1ce9143cb8c1cf66925d
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 30d5892..80518cc 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -363,7 +363,7 @@ public:
sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
// Select that additional handles are displayed permanently.
-void SetPlusHandlesAlwaysVisible(sal_Bool bOn);
+void SetPlusHandlesAlwaysVisible(bool bOn);
sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
// Are Handles visible during TextEdit (in double size)?
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 00a2da7..ba06592 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -272,7 +272,7 @@ const Rectangle SdrMarkView::GetMarkedPointsRect() const
return aMarkedPointsRect;
}
-void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn)
+void SdrMarkView::SetPlusHandlesAlwaysVisible(bool bOn)
{ // TODO: Optimize HandlePaint!
ForceUndirtyMrkPnt();
if (bOn!=bPlusHdlAlways) {
commit 98fba37bb1e2c5fd10d57d20d6e139765eb69751
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 10:39:12 2014 +0100
Consistently let SetDesingMode functions take bool argument
...to avoid warning C4805: '!=' : unsafe mix of type 'bool' and type
'sal_Bool'
in opertaion style errors. Additionally, mark those functions that are
virtual
overrides as such.
Change-Id: I64f919f7e2d8f6224303f9bac67f6270d58de014
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 306023c..62ef3ae 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -159,7 +159,7 @@ protected:
virtual void ColumnResized(sal_uInt16 nId);
virtual void ColumnMoved(sal_uInt16 nId);
virtual void DeleteSelectedRows();
-virtual void SetDesignMode(sal_Bool bMode);
+virtual void SetDesignMode(bool bMode) SAL_OVERRIDE;
virtual void CellModified();
virtual void HideColumn(sal_uInt16 nId);
virtual void ShowColumn(sal_uInt16 nId);
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 42d204d..f0e7eb5 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -162,7 +162,7 @@ public:
) const;
sal_BoolIsDesignMode() const { return m_bDesignMode; }
-voidSetDesignMode( sal_Bool _bDesignMode );
+voidSetDesignMode( bool _bDesignMode );
protected:
void GetFormState(SfxItemSet rSet, sal_uInt16 nWhich);
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 673f604..9c457b8 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -419,7 +419,7 @@ public:
sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return
GetColumnId(nPos + 1); }
sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
-virtual void SetDesignMode(sal_Bool bMode);
+virtual void SetDesignMode(bool bMode);
sal_Bool IsDesignMode() const {return m_bDesignMode;}
sal_Bool IsOpen() const {return m_pSeekCursor != NULL;}
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index e53bf10..30d5892 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -222,7 +222,7 @@ public:
void SetGluePointEditMode(sal_Bool bOn=sal_True) {
SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
sal_Bool IsGluePointEditMode() const { return
eEditMode==SDREDITMODE_GLUEPOINTEDIT; }
-void SetDesignMode(sal_Bool bOn=sal_True);
+void SetDesignMode(bool bOn = true);
sal_Bool IsDesignMode() const { return bDesignMode; }
void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 681fcc6..87933b4 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -222,7 +222,7 @@ void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - solenv/gbuild
solenv/gbuild/UnoApi.mk |3 +++ solenv/gbuild/UnoApiTarget.mk | 13 + 2 files changed, 16 insertions(+) New commits: commit e7ba6ad7c597fa808265938dbcf40017b8b3e5e0 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 20 18:01:04 2014 +0100 gbuild: UnoApi: fix rebuilds after IDL changes There used to be a dependency between .urd file and .hpp/.hdl files but that was removed; introduce a dependency between .idl files and .hpp/.hdl files to replace it so headers and stuff depending on them get rebuilt. Change-Id: Ibf1fe1db08c36ce42c392d27b794c2bc2a33738c (cherry picked from commit 0190a70e79efa437e1516e635f4f670d7a35bb2d) Reviewed-on: https://gerrit.libreoffice.org/7547 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 5f40ee3..21ce4d6 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -68,6 +68,8 @@ endef define gb_UnoApi_add_idlfiles $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(call gb_UnoApiHeadersTarget_add_headerfiles,$(1),$(2),$(addsuffix .hpp,$(3))) +$(call gb_UnoApiHeadersTarget_add_headerfiles,$(1),$(2),$(addsuffix .hdl,$(3))) $(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl))) endef @@ -81,6 +83,7 @@ endef define gb_UnoApi_add_idlfiles_nohdl $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(call gb_UnoApiHeadersTarget_add_headerfiles,$(1),$(2),$(addsuffix .hpp,$(3))) $(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl))) endef diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 28695b8..dbce2d4 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -202,6 +202,19 @@ $(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp :| \ endef +# ensure that idl change triggers the dummy rule to rebuild the headers +# call gb_UnoApiHeadersTarget_add_headerfile,unoapi,headerfile +define gb_UnoApiHeadersTarget_add_headerfile +$(call gb_UnoApiHeadersTarget_get_dir,$(1))/$(2) : \ + $(SRCDIR)/$(basename $(gb_UnoApiTarget_REG_$(1))/$(2)).idl + +endef + +# call gb_UnoApiHeadersTarget_add_headerfiles,unoapi,directory,headerfilenames +define gb_UnoApiHeadersTarget_add_headerfiles +$(foreach hdr,$(3),$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2)/$(hdr))) +endef + define gb_UnoApiHeadersTarget__use_api_for_target $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnoApi.mk |1 + 1 file changed, 1 insertion(+) New commits: commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 21 10:56:08 2014 +0100 idl files need to be packaged relative to INSTDIR, not INSTROOT ...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 52028d5..d99195d 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -20,6 +20,7 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) endif $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo73389.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 23 +--
3 files changed, 19 insertions(+), 15 deletions(-)
New commits:
commit 90c19d92344879577b41098ecb5ce1b007600609
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jan 21 11:08:15 2014 +0100
fdo#73389 Writer does not show a docx-document with nested table correctly
The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e9be826..12e4c2e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -142,6 +142,7 @@ public:
void testBnc780044Spacing();
void testRPrChangeClosed();
void testFdo65090();
+void testFdo73389();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -248,6 +249,7 @@ void Test::run()
{bnc780044_spacing.docx, Test::testBnc780044Spacing},
{rprchange_closed.docx,Test::testRPrChangeClosed},
{fdo65090.docx, Test::testFdo65090},
+{fdo73389.docx, Test::testFdo73389},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1722,6 +1724,15 @@ void Test::testFdo65090()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators).getLength());
}
+void Test::testFdo73389()
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// This was 9340, i.e. the width of the inner table was too large.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2842),
getPropertysal_Int32(xTables-getByIndex(0), Width));
+}
+
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d2380a2..c2c0728 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,24 +142,17 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
*/
bool bFixed = true;
sal_Int32 nRowFixedWidth = 0;
-if (!m_aCellWidths.empty())
+IntVectorPtr pCellWidths = getCurrentCellWidths();
+// Step 1. Check whether all cells hava fixed
widths in the given row of table.
+for (std::vectorsal_Int32::const_iterator
aValIter = pCellWidths-begin(); aValIter != pCellWidths-end(); ++aValIter)
{
-// Step 1. Check whether all cells have fixed
widths in the given row of table.
-::std::vector IntVectorPtr ::iterator itr;
-for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); itr ++)
+if (*aValIter == -1)
{
-IntVectorPtr itrVal = (*itr);
-for
(std::vectorsal_Int32::const_iterator aValIter = itrVal-begin(); aValIter !=
itrVal-end(); ++aValIter)
-{
-if (*aValIter == -1)
-{
-bFixed = false;
-break;
-}
-// Sum the width of cells to find the
total width of given row
-nRowFixedWidth += (*aValIter);
-}
+bFixed = false;
+break;
}
+// Sum the width of cells to find the total
width of given row
+
Re: New Developer
Hi Manohar, On Mon, Jan 20, 2014 at 11:12:17PM +0530, Manohar Kh khmanoh...@gmail.com wrote: manohar@crazyHorse:~/Development$ git clone git:// anongit.freedesktop.org/libreoffice/core libreoffice Cloning into 'libreoffice'... fatal: unable to connect to anongit.freedesktop.org: anongit.freedesktop.org[0: 131.252.210.161]: errno=Connection timed out In case you're behind a proxy, try https: git clone https://gerrit.libreoffice.org/p/core.git Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sw/source
sw/source/core/crsr/findtxt.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 54a8a941c0c5f0a11c8c4fd40617bfdbb40c07ed
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 17 23:09:50 2014 +0100
fdo#73660: sw: fix Find of words containing soft-hyphen
Soft hyphen was not detected if there is no hint (-1).
(regression from ebeff3f074dd94dce4ce6cc55abd0495103684bd)
Change-Id: I09108796a32429a01eff93f797a6de521ab1d08a
(cherry picked from commit 156a0235bd8ff06840cecad1e70a57ffc5b8e7e1)
Reviewed-on: https://gerrit.libreoffice.org/7511
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 22183794b50d3d55094e1363755af74a10a4b555)
Reviewed-on: https://gerrit.libreoffice.org/7542
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 796da83..5567cfa 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -89,7 +89,9 @@ lcl_CleanStr(const SwTxtNode rNd, sal_Int32 const nStart,
sal_Int32 rEnd,
bNewHint = true;
}
// Check if next stop is a soft hyphen.
-else if (-1 != nSoftHyphen nSoftHyphen nHintStart nSoftHyphen
nEnd)
+else if ( -1 != nSoftHyphen
+ (-1 == nHintStart || nSoftHyphen nHintStart)
+ nSoftHyphen nEnd)
{
nStt = nSoftHyphen;
bNewSoftHyphen = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45168] Add Option to crop Images in PDF Export
https://bugs.freedesktop.org/show_bug.cgi?id=45168 --- Comment #6 from Jorendc jore...@libreoffice.org --- (In reply to comment #4) I am beginning work on this issue. @Arthur: any progression on this one? Still working on it? If not, please mind to reset the 'assigned to' field, so others can have a look. Kind regards, Joren -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtfly.cxx|6 +++--- sw/source/core/txtnode/fntcap.cxx |4 ++-- sw/source/core/txtnode/swfont.cxx |8 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d Author: Michael Stahl mst...@redhat.com Date: Tue Jan 21 11:16:20 2014 +0100 fdo#68959: sw: fix painting of tab fill characters in small caps text The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 928ee0b..ba51593 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) } Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() ); -const Point rOld = rInf.GetPos(); +const Point aOldPos(rInf.GetPos()); rInf.SetPos( aPos ); if( !bOpaque ) @@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawStretchText( rInf ); else rInf.GetFont()-_DrawText( rInf ); -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_False; } else if( !aRegion.empty() ) @@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawText( rInf ); } } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_True; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 8fd5775..b92c482 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -516,9 +516,9 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo rInf ) if( rInf.GetLen() == COMPLETE_STRING ) rInf.SetLen( rInf.GetText().getLength() ); -const Point rOldPos = rInf.GetPos(); +const Point aOldPos = rInf.GetPos(); const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); -rInf.SetPos( rOldPos ); +rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != UNDERLINE_NONE || GetOverline() != UNDERLINE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 7fdb145..8a58a50 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1195,12 +1195,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); @@ -1300,7 +1300,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) @@ -1325,13 +1325,13 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.ApplyAutoColor(); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); if( IsCapital() ) @@ -1382,7 +1382,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } sal_Int32 SwSubFont::_GetCrsrOfst( SwDrawTextInfo rInf ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63962] Remove LibreOffice icon themes hardcoding
https://bugs.freedesktop.org/show_bug.cgi?id=63962 --- Comment #9 from Michael Meeks michael.me...@collabora.com --- For translation we should re-use the code from the gallery that parses .desktop files - since we have code to generate translated theme names from that [ that is if we want to translate those :-]. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/text/txtfly.cxx|6 +++--- sw/source/core/txtnode/fntcap.cxx |4 ++-- sw/source/core/txtnode/swfont.cxx |8 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 7cdf5a6995a017e295e9b1099abc6dcb1987ae9e Author: Michael Stahl mst...@redhat.com Date: Tue Jan 21 11:16:20 2014 +0100 fdo#68959: sw: fix painting of tab fill characters in small caps text The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7568 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 54635d7..3a140b6 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) } Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() ); -const Point rOld = rInf.GetPos(); +const Point aOldPos(rInf.GetPos()); rInf.SetPos( aPos ); if( !bOpaque ) @@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawStretchText( rInf ); else rInf.GetFont()-_DrawText( rInf ); -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_False; } else if( !aRegion.empty() ) @@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawText( rInf ); } } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_True; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 9735b2c..3f827f2 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -536,9 +536,9 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo rInf ) if( rInf.GetLen() == STRING_LEN ) rInf.SetLen( rInf.GetText().getLength() ); -const Point rOldPos = rInf.GetPos(); +const Point aOldPos = rInf.GetPos(); const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); -rInf.SetPos( rOldPos ); +rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != UNDERLINE_NONE || GetOverline() != UNDERLINE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 977b6d2..8a4ed6d 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -849,12 +849,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); @@ -955,7 +955,7 @@ static sal_Char const sDoubleSpace[] = ; rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) @@ -980,13 +980,13 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.ApplyAutoColor(); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); if( IsCapital() ) @@ -1038,7 +1038,7 @@ static sal_Char const sDoubleSpace[] = ; rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } /* ___ 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' - sw/source
sw/source/core/text/txtfly.cxx|6 +++--- sw/source/core/txtnode/fntcap.cxx |4 ++-- sw/source/core/txtnode/swfont.cxx |8 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit b038679c550d2a0178c1beca368a86598dd0c80b Author: Michael Stahl mst...@redhat.com Date: Tue Jan 21 11:16:20 2014 +0100 fdo#68959: sw: fix painting of tab fill characters in small caps text The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7566 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 1e66412..9f7d970 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) } Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() ); -const Point rOld = rInf.GetPos(); +const Point aOldPos(rInf.GetPos()); rInf.SetPos( aPos ); if( !bOpaque ) @@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawStretchText( rInf ); else rInf.GetFont()-_DrawText( rInf ); -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_False; } else if( !aRegion.empty() ) @@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawText( rInf ); } } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_True; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 0c31695..c435eda 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -523,9 +523,9 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo rInf ) if( rInf.GetLen() == STRING_LEN ) rInf.SetLen( rInf.GetText().getLength() ); -const Point rOldPos = rInf.GetPos(); +const Point aOldPos = rInf.GetPos(); const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); -rInf.SetPos( rOldPos ); +rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != UNDERLINE_NONE || GetOverline() != UNDERLINE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 2269f24..21c6601 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1195,12 +1195,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); @@ -1300,7 +1300,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) @@ -1325,13 +1325,13 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.ApplyAutoColor(); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); if( IsCapital() ) @@ -1382,7 +1382,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo rInf ) ___ 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-0' - external/libabw
external/libabw/UnpackedTarball_libabw.mk |1 + external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 | 11 +++ 2 files changed, 12 insertions(+) New commits: commit f14eddb9c8ba5c83e6699ec3f2ce57ea80cc8e8f Author: Fridrich Štrba fridrich.st...@bluewin.ch Date: Tue Jan 21 08:44:45 2014 +0100 Coverity: Potential crash (?) Change-Id: I819b0df446cf95d511d6a7a5a65c381a2a837d00 (cherry picked from commit 7989850e9fc5fb2fb757ecf388b51bc3e96a0267) Reviewed-on: https://gerrit.libreoffice.org/7563 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index c61f2d5..4f8b440 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,libabw,\ external/libabw/libabw-0.0.1-inttypes.patch.1 \ + external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 new file mode 100644 index 000..fccaa8e --- /dev/null +++ b/external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 @@ -0,0 +1,11 @@ +--- a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp +@@ -643,7 +643,7 @@ void libabw::ABWContentCollector::collectHeaderFooter(const char *id, const char + if (!type) + m_ps-m_currentHeaderFooterId = -1; + +- std::string sType(type); ++ std::string sType(type ? type : ); + boost::trim(sType); + std::vectorstd::string strVec; + boost::algorithm::split(strVec, sType, boost::is_any_of(-), boost::token_compress_on); ___ 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-0' - sc/source
sc/source/core/data/column.cxx | 11 ++-
sc/source/core/data/table2.cxx |8
2 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 9f27edb1de3a7ef7499fc0e4c0bdc36e3ae20ada
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 15 23:09:20 2014 +0100
resolved fdo#72293 correctly split grouped formulas and regroup
Grouped formulas need to be split at both edges of the deleted area,
regroup _after_ rows have been deleted.
Change-Id: I840806f30cef592e17b4cd3a33c81fd2a8309055
(cherry picked from commit 42f551d524a1df46f6a311d5897ac30bd8fc1aaf)
Reviewed-on: https://gerrit.libreoffice.org/7453
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 145f61a..aafb314 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2444,7 +2444,16 @@ bool ScColumn::UpdateReference( sc::RefUpdateContext
rCxt, ScDocument* pUndoDoc
{
// Cells in this column is being shifted. Split formula grouping at
// the top and bottom boundaries before they get shifted.
-SCROW nSplitPos = rCxt.maRange.aStart.Row();
+// Also, for deleted rows split at the top of the deleted area to adapt
+// the affected group length.
+SCROW nSplitPos;
+if (rCxt.mnRowDelta 0)
+{
+nSplitPos = rCxt.maRange.aStart.Row() + rCxt.mnRowDelta;
+if (ValidRow(nSplitPos))
+aBounds.push_back(nSplitPos);
+}
+nSplitPos = rCxt.maRange.aStart.Row();
if (ValidRow(nSplitPos))
{
aBounds.push_back(nSplitPos);
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 30771ab..27233f7 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -239,16 +239,16 @@ void ScTable::DeleteRow(
}
}
-std::vectorSCCOL aRegroupCols;
-rRegroupCols.getColumns(nTab, aRegroupCols);
-std::for_each(aRegroupCols.begin(), aRegroupCols.end(),
ColumnRegroupFormulaCells(aCol));
-
{ // scope for bulk broadcast
ScBulkBroadcast aBulkBroadcast( pDocument-GetBASM());
for (SCCOL j=nStartCol; j=nEndCol; j++)
aCol[j].DeleteRow( nStartRow, nSize );
}
+std::vectorSCCOL aRegroupCols;
+rRegroupCols.getColumns(nTab, aRegroupCols);
+std::for_each(aRegroupCols.begin(), aRegroupCols.end(),
ColumnRegroupFormulaCells(aCol));
+
InvalidatePageBreaks();
if (IsStreamValid())
___
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-0' - sc/source
sc/source/core/data/formulacell.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 41b9f71f6717e9e4a6395227406c73b73c2d3a35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jan 16 12:49:14 2014 -0500
fdo#73655: Don't adjust formula tokens on non-top shared formula cells.
Only adjust tokens for non-shared formula cells and shared formuls cells
that are the top of their respective shared groups.
Change-Id: I9cd57653602c97504a802001947a28c4d03368a5
(cherry picked from commit 982a03d4e2baf4ca7e78c79014389d9b23e200d1)
Reviewed-on: https://gerrit.libreoffice.org/7483
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 721f268..66ef732 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2799,6 +2799,8 @@ bool ScFormulaCell::UpdateReference(
void ScFormulaCell::UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt )
{
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
bool bPosChanged = (rCxt.mnInsertPos = aPos.Tab());
pCode-Reset();
if (pDocument-IsClipOrUndo() || !pCode-GetNextReferenceRPN())
@@ -2815,6 +2817,9 @@ void ScFormulaCell::UpdateInsertTab(
sc::RefUpdateInsertTabContext rCxt )
if (bPosChanged)
aPos.IncTab(rCxt.mnSheets);
+if (!bAdjustCode)
+return;
+
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnInsertedTab(rCxt,
aOldPos);
if (aRes.mbNameModified)
// Re-compile after new sheet(s) have been inserted.
@@ -2825,6 +2830,8 @@ void ScFormulaCell::UpdateInsertTab(
sc::RefUpdateInsertTabContext rCxt )
bool ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt )
{
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
bool bPosChanged = (aPos.Tab() = rCxt.mnDeletePos + rCxt.mnSheets);
pCode-Reset();
if (pDocument-IsClipOrUndo() || !pCode-GetNextReferenceRPN())
@@ -2840,6 +2847,9 @@ bool ScFormulaCell::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext rCxt )
if (bPosChanged)
aPos.IncTab(-1*rCxt.mnSheets);
+if (!bAdjustCode)
+return false;
+
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnDeletedTab(rCxt,
aOldPos);
if (aRes.mbNameModified)
// Re-compile after sheet(s) have been deleted.
@@ -2850,6 +2860,9 @@ bool ScFormulaCell::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext rCxt )
void ScFormulaCell::UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB
nTabNo )
{
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
+
pCode-Reset();
if (!pCode-GetNextReferenceRPN() || pDocument-IsClipOrUndo())
{
@@ -2863,6 +2876,10 @@ void ScFormulaCell::UpdateMoveTab(
sc::RefUpdateMoveTabContext rCxt, SCTAB nTab
aPos.SetTab(nTabNo);
// no StartListeningTo because pTab[nTab] not yet correct!
+
+if (!bAdjustCode)
+return;
+
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnMovedTab(rCxt, aOldPos);
if (aRes.mbNameModified)
// Re-compile after sheet(s) have been deleted.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-5' - sc/source
sc/source/core/tool/cellform.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit b00aee5aa776c99940d858a8b73557612a558d01
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 20 19:21:55 2014 +0100
resolved fdo#73836 do not apply format twice to string
ScDocument::GetString() already returns the formatted string that then
was formatted through number formatter. Format raw string instead.
(cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9)
Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd
Reviewed-on: https://gerrit.libreoffice.org/7554
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: David Tardon dtar...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index bc65f91..0893149 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -143,14 +143,16 @@ OUString ScCellFormat::GetString(
{
case CELLTYPE_STRING:
{
-OUString aCellString = rDoc.GetString(rPos);
-rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor,
bUseStarFormat);
+ScRefCellValue aCell;
+aCell.assign(rDoc, rPos);
+rFormatter.GetOutputString(aCell.getString(rDoc), nFormat,
aString, ppColor, bUseStarFormat);
}
break;
case CELLTYPE_EDIT:
{
-OUString aCellString = rDoc.GetString(rPos);
-rFormatter.GetOutputString(aCellString, nFormat, aString, ppColor);
+ScRefCellValue aCell;
+aCell.assign(rDoc, rPos);
+rFormatter.GetOutputString(aCell.getString(rDoc), nFormat,
aString, ppColor);
}
break;
case CELLTYPE_VALUE:
___
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-0' - sc/source
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |3 ++-
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx|3 ++-
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx |3 ++-
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx |3 ++-
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx|3 ++-
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |9
++---
sc/source/ui/inc/TableFillingAndNavigationTools.hxx |8
+---
7 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit 7b6dc462bbacd858df6a2defebd1fd1caa4d1b64
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 13 18:02:21 2014 +0100
resolved fdo#73555 compile statistics templates using English grammar
The statistics templates' formula expressions are setup using English
function names, so compile the resulting expressions using an English
grammar merged with the current address conventions.
(cherry picked from commit 9570a27d3e2f56e9046a8bfacaafe9e3c9744ac5)
Conflicts:
sc/source/ui/StatisticsDialogs/TTestDialog.cxx
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
Change-Id: I7c782a42d007daeaaf99463beb8aa580c05c7363
Reviewed-on: https://gerrit.libreoffice.org/7413
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index cc35630..0dc9971 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -104,7 +104,8 @@ sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId()
ScRange ScAnalysisOfVarianceDialog::ApplyOutput(ScDocShell* pDocShell)
{
-AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument);
+AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument,
+formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument, mAddressDetails);
output.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS,
STR_ANOVA_SINGLE_FACTOR_LABEL));
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index d4601ff..1687773 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -83,7 +83,8 @@ sal_Int16 ScDescriptiveStatisticsDialog::GetUndoNameId()
ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
{
-AddressWalkerWriter aOutput(mOutputAddress, pDocShell, mDocument);
+AddressWalkerWriter aOutput(mOutputAddress, pDocShell, mDocument,
+formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument, mAddressDetails);
boost::scoped_ptrDataRangeIterator pIterator;
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index be6de68..6b20afd 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -52,7 +52,8 @@ sal_Int16 ScExponentialSmoothingDialog::GetUndoNameId()
ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
{
-AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument);
+AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument,
+formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument, mAddressDetails);
// Smoothing factor
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index e797b0c..a5e5001 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -74,7 +74,8 @@ sal_Int16 ScMatrixComparisonGenerator::GetUndoNameId()
ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
{
-AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument);
+AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument,
+formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument, mAddressDetails);
SCTAB inTab = mInputRange.aStart.Tab();
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.1.0|target:4.1.0 target:4.3.0 --- Comment #34 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=15913f9ae1b8753a1fab894667b7543e08210b04 fdo#63154 Removed unused solar.h reference in oox The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/inc oox/source
oox/inc/pch/precompiled_oox.hxx |1 -
oox/source/drawingml/shape.cxx |5 -
2 files changed, 6 deletions(-)
New commits:
commit 15913f9ae1b8753a1fab894667b7543e08210b04
Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com
Date: Mon Jan 20 23:03:01 2014 -0200
fdo#63154 Removed unused solar.h reference in oox
Change-Id: I224bc31af9ecb77ad42357550e016b000ebf4837
Reviewed-on: https://gerrit.libreoffice.org/7519
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index f997388..d2dae89 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -388,7 +388,6 @@
#include tools/globname.hxx
#include tools/mapunit.hxx
#include tools/multisel.hxx
-#include tools/solar.h
#include tools/stream.hxx
#include tools/time.hxx
#include unotools/fltrcfg.hxx
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c9889db..78b3f35 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -36,7 +36,6 @@
#include oox/helper/graphichelper.hxx
#include oox/helper/propertyset.hxx
-#include tools/solar.h
#include tools/gen.hxx
#include tools/mapunit.hxx
#include editeng/unoprnms.hxx
@@ -80,8 +79,6 @@ using namespace ::com::sun::star::style;
namespace oox { namespace drawingml {
-//
-
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
: mbIsChild( false )
, mpLinePropertiesPtr( new LineProperties )
@@ -,8 +1108,6 @@ void Shape::putPropertiesToGrabBag( const Sequence
PropertyValue aProperties
}
}
-//
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - odk/examples
odk/examples/DevelopersGuide/OfficeBean/Makefile |5 +
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile |5 +
odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx |2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 6f2fbc381de2c12f4ca9c2fc515c4f6860d07095
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 12:24:54 2014 +0100
DesktopEnvironment example does not work on OS X
...as nativelib/unix/nativeview.c uses X11.
Change-Id: Ifdc0206b77085db909155fb61c4a345f2813849d
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
index b4e69cf..4227108 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
@@ -81,8 +81,13 @@ endif
# Targets
.PHONY: ALL
+ifeq $(OS) MACOSX
+ALL :
+ @printf 'This example does not work on Mac OS X\n'
+else
ALL : $(SUBDIR) \
$(EXAMPLE_NAME)
+endif
include $(SETTINGS)/stdtarget.mk
commit 3034b144d0062e9c4394b901aded43fec117ed11
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 12:22:35 2014 +0100
OfficeBean example does not work on OS X (where officebean.jar is not built)
Change-Id: I18c9d0fa0a74cbbdad43bd99d87dc6414a0264d2
diff --git a/odk/examples/DevelopersGuide/OfficeBean/Makefile
b/odk/examples/DevelopersGuide/OfficeBean/Makefile
index 3326244..2dfc678 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -59,8 +59,13 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING)
$(PATH_SEPARATOR),$(PATH_SEPARATOR),$(URE
# Targets
.PHONY: ALL
+ifeq $(OS) MACOSX
+ALL :
+ @printf 'This example does not work on Mac OS X\n'
+else
ALL : \
OOoBeanViewer
+endif
include $(SETTINGS)/stdtarget.mk
commit fd95c8950c674ad0935f2583f8fb209d873a73b7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 12:21:51 2014 +0100
Fix signature of main function
Change-Id: Id6a4968b15445f04e788eaa6ca950707d5311e66
diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
index c24e4e3..f92731d 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
@@ -62,7 +62,7 @@ void simple_object_creation_and_destruction()
}
-int main( char * argv[] )
+int main()
{
simple_object_creation_and_destruction();
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/ilstbox.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1424b5c1de7806566297a74ac1d8611058c77f8e Author: Luc Castermans luc.casterm...@gmail.com Date: Sat Jan 18 21:19:02 2014 +0100 Translated German comments Change-Id: I63ca99a57a84a0c066a2abb1e65d8c04ae9cabfc Reviewed-on: https://gerrit.libreoffice.org/7522 Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 7f6a8df..af7910c 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -415,7 +415,7 @@ private: bool mbAutoHScroll : 1; // AutoHScroll an oder aus bool mbEdgeBlending : 1; -LinkmaScrollHdl;// Weil der vom ImplListBoxWindow selbst benoetigt wird. +LinkmaScrollHdl;// because it is needed by ImplListBoxWindow itself ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface mxDNDListenerContainer; protected: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |2 -
vcl/source/filter/igif/decode.cxx |4 +-
vcl/source/filter/ixbm/xbmread.cxx| 26 ++---
vcl/source/filter/ixpm/xpmread.cxx| 66 +-
vcl/source/filter/jpeg/JpegReader.cxx |4 +-
vcl/source/filter/sgfbram.hxx | 66 +-
vcl/source/filter/sgffilt.hxx | 16
7 files changed, 92 insertions(+), 92 deletions(-)
New commits:
commit 3007e015310c4a46e1249f69aa26e53dad9aafe2
Author: Luc Castermans luc.casterm...@gmail.com
Date: Sun Jan 19 10:51:39 2014 +0100
Translated German comments vcl/source
Change-Id: I1143996ef86e35caa72cf2e60ae586940a10ce81
Reviewed-on: https://gerrit.libreoffice.org/7527
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 3a5e579..2a17a04 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2107,7 +2107,7 @@ void Edit::Command( const CommandEvent rCEvt )
}
else
{
-// Paste nur, wenn Text im Clipboard
+// only paste if text available in clipboard
sal_Bool bData = sal_False;
uno::Reference datatransfer::clipboard::XClipboard xClipboard =
GetClipboard();
if ( xClipboard.is() )
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index bf29328..fd92fba 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -153,7 +153,7 @@ bool GIFLZWDecompressor::ProcessOneCode()
if ( !bEndOfBlock )
{
-// Einen Code aus dem Eingabe-Buffer holen:
+// fetch code from input buffer
nCode = sal::static_int_cast sal_uInt16 (
( (sal_uInt16) nInputBitsBuf ) ( ~( 0x nCodeSize ) ));
nInputBitsBuf = nCodeSize;
@@ -188,7 +188,7 @@ bool GIFLZWDecompressor::ProcessOneCode()
nOldCode = nCode;
-// Zeichen(/-folge) des Codes nCode in den Ausgabe-Buffer schreiben:
+// write character(/-sequence) of code nCode in the output buffer:
pE = pTable + nCode;
do
{
diff --git a/vcl/source/filter/ixbm/xbmread.cxx
b/vcl/source/filter/ixbm/xbmread.cxx
index 7dfc333..e7c1ed1 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -80,7 +80,7 @@ void XBMReader::InitTable()
pHexTable[(int)'e'] = 14;
pHexTable[(int)'f'] = 15;
pHexTable[(int)'x'] = 0;
-pHexTable[(int)' '] = -1;
+pHexTable[(int)' '] = -1;
pHexTable[(int)','] = -1;
pHexTable[(int)'}'] = -1;
pHexTable[(int)'\n'] = -1;
@@ -143,22 +143,22 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
char* pTmp = (char*) pDefine;
unsigned char cTmp;
-// bis zum Ende gehen
+// move to end
pTmp += ( strlen( pDefine ) - 1 );
cTmp = *pTmp--;
-// letzte Ziffer suchen
+// search last digit
while( pHexTable[ cTmp ] == -1 )
cTmp = *pTmp--;
-// bis vor die Zahl laufen
+// move before number
while( pHexTable[ cTmp ] != -1 )
cTmp = *pTmp--;
-// auf Anfang der Zahl gehen
+// move to start of number
pTmp += 2;
-// Hex lesen
+// read Hex
if( ( pTmp[0] == '0' ) ( ( pTmp[1] == 'X' ) || ( pTmp[1] == 'x' ) ) )
{
pTmp += 2;
@@ -170,7 +170,7 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
cTmp = *pTmp++;
}
}
-// Dezimal lesen
+// read decimal
else
{
cTmp = *pTmp++;
@@ -203,7 +203,7 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString
aLastLine, XBMFormat
{
sal_Int32 nPos;
-// einfuehrende geschweifte Klammer loeschen
+// delete opening curly bracket
if( (nPos = ( aLine = aLastLine ).indexOf('{') ) != -1 )
aLine = aLine.copy(nPos + 1);
@@ -264,12 +264,12 @@ ReadState XBMReader::ReadXBM( Graphic rGraphic )
ReadState eReadState;
sal_uInt8 cDummy;
-// sehen, ob wir _alles_ lesen koennen
+// check if we can read ALL
rIStm.Seek( STREAM_SEEK_TO_END );
rIStm cDummy;
-// falls wir nicht alles lesen koennen
-// kehren wir zurueck und warten auf neue Daten
+// if we cannot read all
+// we returnn and wait for new data
if ( rIStm.GetError() != ERRCODE_IO_PENDING )
{
rIStm.Seek( nLastPos );
@@ -284,8 +284,8 @@ ReadState XBMReader::ReadXBM( Graphic rGraphic )
nWidth = nValue;
aLine = FindTokenLine( rIStm, #define, _height );
-// Falls die Hoehe nicht folgt, suchen wir noch
-// einmal vom Anfang der Datei an
+// if height was not received, we search again
+// from start of
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/svtools svtools/source
include/svtools/colorcfg.hxx |1
svtools/source/config/accessibilityoptions.cxx |4 ++
svtools/source/config/colorcfg.cxx | 36 -
3 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 23221e48495262d0384c9169a0d8a01db8a5dab5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Jan 16 21:42:47 2014 +0100
fdo#71511: in autodetected a11y HC mode, pull background color from theme
- ... and reload ColorConfig after tweaking relevant a11y settings
- dark theme default to high contrast
- as per fdo#35365, having a dark document background is inconvenient
for non-a11y endusers
- a11y standard require the (rather ugly) background for a11y
- thus, when automatically detect high contract mode of operating
system
in Tools-Options-a11y is enabled, use the dark document
backgroundby default, otherwise use a white default
note that the autodetect HC option is somewhat broken anyway:
it resets the icon theme hard, so there are not simple roundtrips
enableing/disabling it for that, but those havent been there before
either.
(includes: Ia35a41717224dfb7437054bb885c61d7e0b189d7)
Change-Id: Id8ad1eb3d57b3708ac5a241092208e3a8d98ade0
Reviewed-on: https://gerrit.libreoffice.org/7484
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx
index 2872f4c..ddc8485 100644
--- a/include/svtools/colorcfg.hxx
+++ b/include/svtools/colorcfg.hxx
@@ -105,6 +105,7 @@ public:
// instead of the automatic color
ColorConfigValueGetColorValue(ColorConfigEntry eEntry, sal_Bool
bSmart = sal_True)const;
static ColorGetDefaultColor(ColorConfigEntry eEntry);
+void Reload();
};
class SVT_DLLPUBLIC EditableColorConfig
diff --git a/svtools/source/config/accessibilityoptions.cxx
b/svtools/source/config/accessibilityoptions.cxx
index 4294e7c..84f0e1c 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -31,6 +31,8 @@
#include svl/smplhint.hxx
+#include svtools/colorcfg.hxx
+
#include vcl/settings.hxx
#include vcl/svapp.hxx
#include rtl/instance.hxx
@@ -386,7 +388,7 @@ void
SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
{
xNode-setPropertyValue(s_sAutoDetectSystemHC,
css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
-
+svtools::ColorConfig().Reload();
bIsModified = sal_True;
}
}
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index 850bd93..a8e5ba8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -23,7 +23,9 @@
#include com/sun/star/uno/Sequence.hxx
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/beans/PropertyValue.hpp
+#include comphelper/processfactory.hxx
#include unotools/configitem.hxx
+#include unotools/confignode.hxx
#include unotools/configpaths.hxx
#include com/sun/star/uno/Sequence.h
#include svl/poolitem.hxx
@@ -64,6 +66,7 @@ class ColorConfig_Impl : public utl::ConfigItem
sal_Boolm_bEditMode;
OUString m_sIsVisible;
OUString m_sLoadedScheme;
+bool m_bAutoDetectSystemHC;
uno::Sequence OUString GetPropertyNames(const OUString rScheme);
public:
@@ -91,6 +94,7 @@ public:
voidSetModified(){ConfigItem::SetModified();}
void
ClearModified(){ConfigItem::ClearModified();}
voidSettingsChanged();
+bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;}
// #100822#
DECL_LINK( DataChangedEventListener, VclWindowEvent* );
@@ -183,7 +187,8 @@ uno::Sequence OUString
ColorConfig_Impl::GetPropertyNames(const OUString rSch
ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
ConfigItem(Office.UI/ColorScheme),
m_bEditMode(bEditMode),
-m_sIsVisible(/IsVisible)
+m_sIsVisible(/IsVisible),
+m_bAutoDetectSystemHC(true)
{
if(!m_bEditMode)
{
@@ -237,6 +242,15 @@ void ColorConfig_Impl::Load(const OUString rScheme)
if(pColorNames[nIndex].match(m_sIsVisible,
pColorNames[nIndex].getLength() - m_sIsVisible.getLength()))
m_aConfigValues[i / 2].bIsVisible = Any2Bool(pColors[nIndex++]);
}
+// fdo#71511: check if we are running in a11y autodetect
+{
+utl::OConfigurationNode aNode =
utl::OConfigurationTreeRoot::tryCreateWithComponentContext(comphelper::getProcessComponentContext(),OUString(org.openoffice.Office.Common/Accessibility)
);
+if(aNode.isValid())
+{
+uno::Any aValue =
aNode.getNodeValue(OUString(AutoDetectSystemHC));
+
space between values and units in spinners, fdo#71688
For 4.3 we are now, in the normal case, putting space between values and units in spinners. e.g. now 10 mm instead of 10mm. (http://en.wikipedia.org/wiki/ISO_31-0) For the degree symbol we are not putting space between value and unit, i.e. it remains 10° I think those are hopefully uncontroversial. The tricky case is the % symbol, because, while ISO-31-0 implies that 10 % is the preferred scientific format, English style guides prefer 10% and 10 % looks just plain wrong. It's a locale-dependent formatting rule (http://en.wikipedia.org/wiki/Percent_sign) So to resolve this we now have a function formatPercent which takes the number and the locale and runs it through icu's PercentInstance to format it according to that locale's formatting rule. Which gives e.g. 10 % for de and 10% for en. (http://site.icu-project.org/) What this means is that: a) In the English strings in .src files the source text should not have a space between number and %. I think these are all fixed now. b) You should check that the icu percent formatting rule is considered correct for your language in the context of a office suite UI e.g. in the spinner of view-zoom-zoom-variable c) If you agree with icu's % formatting for your language then update the translations for X% to be consistent with that formatting. Otherwise we can fix icu or make a blacklist of languages which should be excluded from the default icu percent formatting. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 15 ++---
dbaccess/source/ui/inc/TablesSingleDlg.hxx |2
dbaccess/source/ui/inc/dbu_resource.hrc|1
dbaccess/uiconfig/ui/tablesfilterdialog.ui | 82 +
5 files changed, 92 insertions(+), 9 deletions(-)
New commits:
commit 9eebbbcbf7a022e252c5f34f091f3e4b398271cc
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 21 09:33:35 2014 +
convert OTableSubscriptionDialog to SfxSingleTabDialog
Change-Id: I8335012139ccaf58bc18d0779e63a5bc388c9fb4
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 702b9a2..7148268 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/rowheightdialog \
dbaccess/uiconfig/ui/sortdialog \
+dbaccess/uiconfig/ui/tablesfilterdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index f470a54..f19080e 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -42,10 +42,11 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window*
pParent
,SfxItemSet* _pItems
,const Reference XComponentContext _rxORB
,const ::com::sun::star::uno::Any _aDataSourceName)
-:SfxNoLayoutSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
-,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
-,m_bStopExecution(sal_False)
-,m_pOutSet(_pItems)
+: SfxSingleTabDialog(pParent, _pItems, TablesFilterDialog,
+dbaccess/ui/tablesfilterdialog.ui)
+, m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
+, m_bStopExecution(sal_False)
+, m_pOutSet(_pItems)
{
DBG_CTOR(OTableSubscriptionDialog,NULL);
m_pImpl-setDataSourceOrName(_aDataSourceName);
@@ -55,9 +56,9 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window*
pParent
m_pImpl-translateProperties(xDatasource, *m_pOutSet);
SetInputSet(m_pOutSet);
-OTableSubscriptionPage* pTabPage = new
OTableSubscriptionPage(this,*m_pOutSet,this);
+OTableSubscriptionPage* pTabPage = new
OTableSubscriptionPage(get_content_area(), *m_pOutSet, this);
pTabPage-SetServiceFactory(_rxORB);
-SetTabPage(pTabPage);
+setTabPage(pTabPage);
}
OTableSubscriptionDialog::~OTableSubscriptionDialog()
@@ -71,7 +72,7 @@ short OTableSubscriptionDialog::Execute()
short nRet = RET_CANCEL;
if ( !m_bStopExecution )
{
-nRet = SfxNoLayoutSingleTabDialog::Execute();
+nRet = SfxSingleTabDialog::Execute();
if ( nRet == RET_OK )
{
m_pOutSet-Put(*GetOutputItemSet());
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 14c4ec6..ba11843 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -40,7 +40,7 @@ namespace dbaui
{
class ODbDataSourceAdministrationHelper;
// OTableSubscriptionDialog
-class OTableSubscriptionDialog : public SfxNoLayoutSingleTabDialog, public
IItemSetHelper
+class OTableSubscriptionDialog : public SfxSingleTabDialog, public
IItemSetHelper
{
::std::auto_ptrODbDataSourceAdministrationHelper m_pImpl;
sal_Bool m_bStopExecution; // set when the dialog should not be
executed
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 2905821..bbe093e 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -98,7 +98,6 @@
#define DLG_DATABASE_TYPE_CHANGERID_DIALOG_START + 28
#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
#define DLG_TEXT_CONNECTION_SETTINGSRID_DIALOG_START + 31
-#define DLG_TABLE_FILTERRID_DIALOG_START + 32
//
// tab pages
diff --git a/dbaccess/uiconfig/ui/tablesfilterdialog.ui
b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
new file mode 100644
index 000..b311189
--- /dev/null
+++ b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
@@ -0,0 +1,82 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.0 on Tue Jan 21 09:32:06 2014 --
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkDialog id=TablesFilterDialog
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesTables Filter/property
+property name=type_hintdialog/property
+child internal-child=vbox
+ object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property
Re: Mac OS X 64-bit, libstdc++ vs. libc++
On 01/17/2014 10:02 AM, Stephan Bergmann wrote: Now, the good news appears to be that Libc++ is specifically designed so that you can use it in the same process as libstdc++. [http://clang-developers.42468.n3.nabble.com/Adopting-libc-hitting-problems-on-Mac-OS-X-td4027011.html] That means that it hopefully works to stick with libstdc++ for LO 4.2 (and avoid any trouble switching this late in the release schedule), switch to libc++ for LO 4.3 say, and expect any native extensions using either of the two libraries to work with both flavors of LO. (And, given the assumption that Apple will eventually discontinue the support of libstdc++, recommend that native extensions---which there are none yet for Mac OS X 64-bit---use libc++.) So I built an extension (the SDK's examples/cpp/complextoolbarcontrols) containing a native UNO component using libc++, and installed that into http://donate.libreoffice.org/home/dl/mac-x86_64/4.2.0/en-US/LibreOffice_4.2.0.2_MacOS_x86-64.dmg (using libstdc++), and everything works fine. So I still think we are safe to keep LO 4.2.0 at libstdc++ and recommend libc++ for extensions. Apropos SDK, doing the above made me aware that the SDK for Mac OS X 64-bit is broken, in that its settings/settings.mk assumes building for a 32-bit LO. http://cgit.freedesktop.org/libreoffice/core/commit/?id=e5ad31e2f784856506c28092166dc8704c84e868 Fix Mac OS X 64 bit SDK settings.mk fixes that on master, but it depdns on http://cgit.freedesktop.org/libreoffice/core/commit/?id=dea0398ee24eb278cdb14999efbf34d634454eaa SDK settings.mk: Don't guess PLATFORM/PROCTYPE, which I would feel uneasy to backport to libreoffice-4-2-0 at this stage. (I haven't even been able to test that master change on Windows yet.) Therefore, I would suggest to stay with a broken Mac OS X 64-bit SDK for LO 4.2.0 and only backport those fixes to libreoffice-4-2 towards LO 4.2.1. Other opinions? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
long paras + tools/string.hxx
The 16 bit length limitation in writer is now removed towards 4.3. The 16 bit paragraph length limit in editeng still remains, editeng mixes freely sal_uInt16 with xub_StrLen and has a pile of hard-coded 0x here and there which makes it tricky to see at a glance which values are string lengths and offsets and which are not. Sigh. Also, note there is a hidden limit in tools/stream.hxx of 0xFFFE in things like ReadLine and ReadByteStringLine and their callers. sc is now the only module that includes tools/string.hxx and uses STRING_MAXLEN. It would be great if some calc hackers could have a look there to see if those limits still make sense (e.g. nArbitraryLineLengthLimit) especially considering the ReadLine, etc. issue. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/app/AppDetailPageHelper.cxx |5 ++---
dbaccess/source/ui/control/tabletree.cxx | 20
dbaccess/source/ui/inc/tabletree.hxx | 21 -
3 files changed, 18 insertions(+), 28 deletions(-)
New commits:
commit d2c2ab1cb6e974195ccbd7f96234f8660621b06f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 21 12:17:38 2014 +
tidy up OTableTreeListBox to make it easier to .ui-ify
Change-Id: I2463d665c857425bc4cf9df89338a0aab89f0a90
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 6c2777e..c8a7dda 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -589,9 +589,8 @@ void OAppDetailPageHelper::createTablesPage(const
Reference XConnection _xCon
if ( !m_pLists[E_TABLE] )
{
-OTableTreeListBox* pTreeView = new OTableTreeListBox(this
-,WB_HASLINES |
WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP
-,sal_False);
+OTableTreeListBox* pTreeView = new OTableTreeListBox(this,
+WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL
|WB_HASBUTTONSATROOT | WB_TABSTOP);
pTreeView-SetHelpId(HID_APP_TABLE_TREE);
m_pLists[E_TABLE] = pTreeView;
diff --git a/dbaccess/source/ui/control/tabletree.cxx
b/dbaccess/source/ui/control/tabletree.cxx
index 57aae83..e1f8333 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -64,10 +64,10 @@ namespace DatabaseObject =
::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer =
::com::sun::star::sdb::application::DatabaseObjectContainer;
// OTableTreeListBox
-OTableTreeListBox::OTableTreeListBox( Window* pParent, WinBits nWinStyle,
sal_Bool _bVirtualRoot )
+OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
:OMarkableTreeListBox(pParent, nWinStyle)
-,m_pImageProvider( new ImageProvider )
-,m_bVirtualRoot(_bVirtualRoot)
+,m_xImageProvider( new ImageProvider )
+,m_bVirtualRoot(false)
,m_bNoEmptyFolders( false )
{
implSetDefaultImages();
@@ -75,17 +75,13 @@ OTableTreeListBox::OTableTreeListBox( Window* pParent,
WinBits nWinStyle, sal_Bo
OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId rResId,
sal_Bool _bVirtualRoot)
:OMarkableTreeListBox(pParent, rResId)
-,m_pImageProvider( new ImageProvider )
+,m_xImageProvider( new ImageProvider )
,m_bVirtualRoot(_bVirtualRoot)
,m_bNoEmptyFolders( false )
{
implSetDefaultImages();
}
-OTableTreeListBox::~OTableTreeListBox()
-{
-}
-
void OTableTreeListBox::implSetDefaultImages()
{
ImageProvider aImageProvider;
@@ -122,12 +118,12 @@ void OTableTreeListBox::notifyHiContrastChanged()
Image aImage;
if ( isFolderEntry( pEntryLoop ) )
{
-aImage = m_pImageProvider-getFolderImage(
DatabaseObject::TABLE );
+aImage = m_xImageProvider-getFolderImage(
DatabaseObject::TABLE );
}
else
{
OUString sCompleteName( getQualifiedTableName( pEntryLoop
) );
-m_pImageProvider-getImages( sCompleteName,
DatabaseObject::TABLE, aImage );
+m_xImageProvider-getImages( sCompleteName,
DatabaseObject::TABLE, aImage );
}
pContextBitmapItem-SetBitmap1( aImage );
@@ -142,7 +138,7 @@ void OTableTreeListBox::notifyHiContrastChanged()
void OTableTreeListBox::implOnNewConnection( const Reference XConnection
_rxConnection )
{
m_xConnection = _rxConnection;
-m_pImageProvider.reset( new ImageProvider( m_xConnection ) );
+m_xImageProvider.reset( new ImageProvider( m_xConnection ) );
}
void OTableTreeListBox::UpdateTableList( const Reference XConnection
_rxConnection ) throw(SQLException)
@@ -469,7 +465,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry(
pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND );
Image aImage;
-m_pImageProvider-getImages( _rTableName, DatabaseObject::TABLE,
aImage );
+m_xImageProvider-getImages( _rTableName, DatabaseObject::TABLE,
aImage );
SetExpandedEntryBmp( pRet, aImage );
SetCollapsedEntryBmp( pRet, aImage );
diff --git a/dbaccess/source/ui/inc/tabletree.hxx
b/dbaccess/source/ui/inc/tabletree.hxx
index 10f2959..2972867 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
+#include imageprovider.hxx
#include marktree.hxx
#include
Re: long paras + tools/string.hxx
Hi Caolán Em 21-01-2014 10:10, Caolán McNamara escreveu: Also, note there is a hidden limit in tools/stream.hxx of 0xFFFE in things like ReadLine and ReadByteStringLine and their callers. Is this the reason for the memory leak that I get while saving a longpara file? It crashes my Linux. -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - jvmfwk/plugins jvmfwk/source stoc/source svl/source tools/source unotools/source
jvmfwk/plugins/sunmajor/pluginlib/util.cxx |2 +-
jvmfwk/source/framework.cxx|4 ++--
stoc/source/security/permissions.cxx |2 +-
svl/source/config/ctloptions.cxx |2 +-
tools/source/fsys/urlobj.cxx |2 +-
unotools/source/config/cmdoptions.cxx |2 +-
unotools/source/config/compatibility.cxx |2 +-
unotools/source/config/dynamicmenuoptions.cxx |2 +-
unotools/source/config/eventcfg.cxx|2 +-
unotools/source/config/extendedsecurityoptions.cxx |2 +-
unotools/source/config/fontoptions.cxx |2 +-
unotools/source/config/localisationoptions.cxx |2 +-
unotools/source/config/moduleoptions.cxx |2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 891ffcb141239cb0c51b37f7cc9be0957915ec31
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 21 12:07:55 2014 +0100
bool improvements
Change-Id: I2733b729fe516c0e857490369d493bb7d8fb7c77
diff --git a/unotools/source/config/cmdoptions.cxx
b/unotools/source/config/cmdoptions.cxx
index e2da7df..1bfb2f6 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -236,7 +236,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
SvtCommandOptions_Impl::~SvtCommandOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/compatibility.cxx
b/unotools/source/config/compatibility.cxx
index 5d09386..78f280a 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -420,7 +420,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/dynamicmenuoptions.cxx
b/unotools/source/config/dynamicmenuoptions.cxx
index 990c2b5..964cf50 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -456,7 +456,7 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/eventcfg.cxx
b/unotools/source/config/eventcfg.cxx
index 3fcfc8f..a052613 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -126,7 +126,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl()
GlobalEventConfig_Impl::~GlobalEventConfig_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/extendedsecurityoptions.cxx
b/unotools/source/config/extendedsecurityoptions.cxx
index ec6f5cc..2b3674e 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -191,7 +191,7 @@
SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/fontoptions.cxx
b/unotools/source/config/fontoptions.cxx
index c661fd5..e823087 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -184,7 +184,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
SvtFontOptions_Impl::~SvtFontOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/localisationoptions.cxx
b/unotools/source/config/localisationoptions.cxx
index 1d67f9a..4fac21c 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -173,7 +173,7 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl()
{
// We must save our current values .. if user forget it!
-if( IsModified() == sal_True )
+if( IsModified() )
{
Commit();
}
diff --git a/unotools/source/config/moduleoptions.cxx
b/unotools/source/config/moduleoptions.cxx
index c72fff8..aa3ce5a 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -403,7 +403,7 @@
Re: space between values and units in spinners, fdo#71688
On 01/21/2014 12:59 PM, Caolán McNamara wrote: So to resolve this we now have a function formatPercent which takes the number and the locale and runs it through icu's PercentInstance to format it according to that locale's formatting rule. Which gives e.g. 10 % for de and 10% for en. (http://site.icu-project.org/) But at least my copy of Duden Satz- und Korrekturanweisungen asks for a thin instead of a full space in front of percent (and per-mille) signs in German. Could we handle that, too, or is that beyond the state of the art in UI typography? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New Developer
I tried doing the above step mentioned but it is still not working for me... manohar@crazyHorse:~/Development$ git clone https://gerrit.libreoffice.org/p/core.git Cloning into 'core'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://gerrit.libreoffice.org/p/core.git/info/refs fatal: HTTP request failed On Tue, Jan 21, 2014 at 3:41 PM, Miklos Vajna vmik...@collabora.co.ukwrote: Hi Manohar, On Mon, Jan 20, 2014 at 11:12:17PM +0530, Manohar Kh khmanoh...@gmail.com wrote: manohar@crazyHorse:~/Development$ git clone git:// anongit.freedesktop.org/libreoffice/core libreoffice Cloning into 'libreoffice'... fatal: unable to connect to anongit.freedesktop.org: anongit.freedesktop.org[0: 131.252.210.161]: errno=Connection timed out In case you're behind a proxy, try https: git clone https://gerrit.libreoffice.org/p/core.git Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: space between values and units in spinners, fdo#71688
On Tue, Jan 21, 2014 at 01:27:37PM +0100, Stephan Bergmann wrote: On 01/21/2014 12:59 PM, Caolán McNamara wrote: So to resolve this we now have a function formatPercent which takes the number and the locale and runs it through icu's PercentInstance to format it according to that locale's formatting rule. Which gives e.g. 10 % for de and 10% for en. (http://site.icu-project.org/) But at least my copy of Duden Satz- und Korrekturanweisungen asks for a thin instead of a full space in front of percent (and per-mille) signs in German. Could we handle that, too, or is that beyond the state of the art in UI typography? Unicode has a thin space character (U+2009), so if translators used it it should just work. The tricky part would be ICU. Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New Developer
On Tue, Jan 21, 2014 at 06:32:09PM +0530, Manohar Kh khmanoh...@gmail.com wrote: manohar@crazyHorse:~/Development$ git clone https://gerrit.libreoffice.org/p/core.git Cloning into 'core'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://gerrit.libreoffice.org/p/core.git/info/refs fatal: HTTP request failed Seems you have a problematic /etc/ssl/certs/ca-certificates.crt. Did you try http insetad of https? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: long paras + tools/string.hxx
On Tue, 2014-01-21 at 10:21 -0200, Olivier Hallot wrote: Hi Caolán Em 21-01-2014 10:10, Caolán McNamara escreveu: Also, note there is a hidden limit in tools/stream.hxx of 0xFFFE in things like ReadLine and ReadByteStringLine and their callers. Is this the reason for the memory leak that I get while saving a longpara file? It crashes my Linux. Dunno. Rather doubt it though. How to reproduce ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - solenv/bin
solenv/bin/native-code.py | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit 4917be8a6f0bd650d9259b14af844f9bc081d2fd Author: Tor Lillqvist t...@collabora.com Date: Tue Jan 21 15:11:24 2014 +0200 Sort the sections of core_constructor_list for clarity Change-Id: I845c26d0b69c08e07fb7159fb2bd6862ad9e5603 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 7bbee8a..2c91640 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -51,22 +51,22 @@ core_factory_list = [ core_constructor_list = [ # framework/util/fwk.component -com_sun_star_comp_framework_ModuleManager_get_implementation, -com_sun_star_comp_framework_URLTransformer_get_implementation, -com_sun_star_comp_framework_Frame_get_implementation, -com_sun_star_comp_framework_LayoutManager_get_implementation, com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation, com_sun_star_comp_framework_AutoRecovery_get_implementation, +com_sun_star_comp_framework_Frame_get_implementation, com_sun_star_comp_framework_JobExecutor_get_implementation, +com_sun_star_comp_framework_LayoutManager_get_implementation, +com_sun_star_comp_framework_ModuleManager_get_implementation, com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation, +com_sun_star_comp_framework_URLTransformer_get_implementation, # sax/source/expatwrap/expwrap.component -com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation, com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation, +com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation, # sfx2/util/sfx.component +SfxDocumentMetaData_get_implementation, +com_sun_star_comp_office_FrameLoader_get_implementation, com_sun_star_comp_sfx2_DocumentTemplates_get_implementation, com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation, -com_sun_star_comp_office_FrameLoader_get_implementation, -SfxDocumentMetaData_get_implementation, # svtools/util/svt.component com_sun_star_comp_graphic_GraphicProvider_get_implementation, # svx/util/svx.component commit e683bb91915ac52743659bc0434a73ab8eab05b9 Author: Tor Lillqvist t...@collabora.com Date: Tue Jan 21 15:08:26 2014 +0200 Add fwk AutoRecovery, JobExecutor and StatusIndicatorFactory ctors to core Seem to be needed by TiledLibreOffice at least, so possibly by any app. Change-Id: I52d4e6f4ce66e2a79b67e1f17ba926defd4ac8eb diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 9e8f1a2..7bbee8a 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -56,6 +56,9 @@ core_constructor_list = [ com_sun_star_comp_framework_Frame_get_implementation, com_sun_star_comp_framework_LayoutManager_get_implementation, com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation, +com_sun_star_comp_framework_AutoRecovery_get_implementation, +com_sun_star_comp_framework_JobExecutor_get_implementation, +com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation, # sax/source/expatwrap/expwrap.component com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation, com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: long paras + tools/string.hxx
Hi Caolán Em 21-01-2014 11:12, Caolán McNamara escreveu: On Tue, 2014-01-21 at 10:21 -0200, Olivier Hallot wrote: Hi Caolán Em 21-01-2014 10:10, Caolán McNamara escreveu: Also, note there is a hidden limit in tools/stream.hxx of 0xFFFE in things like ReadLine and ReadByteStringLine and their callers. Is this the reason for the memory leak that I get while saving a longpara file? It crashes my Linux. Dunno. Rather doubt it though. How to reproduce ? Just save a file with one longpara (master as old as last friday). -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - solenv/gbuild
solenv/gbuild/UnoApi.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 460f5cab4105451d86451c63be7891be41974911 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 21 10:56:08 2014 +0100 idl files need to be packaged relative to INSTDIR, not INSTROOT ...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb (cherry picked from commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74) Reviewed-on: https://gerrit.libreoffice.org/7569 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 21ce4d6..6e39b3d 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -20,6 +20,7 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) endif $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: long paras + tools/string.hxx
Hi all, On Tue, 21 Jan 2014 12:10:40 + Caolán McNamara caol...@redhat.com wrote: The 16 bit length limitation in writer is now removed towards 4.3. The 16 bit paragraph length limit in editeng still remains, editeng mixes freely sal_uInt16 with xub_StrLen and has a pile of hard-coded 0x here and there which makes it tricky to see at a glance which values are string lengths and offsets and which are not. Sigh. I'l (very) slowly working on this. Indeed there are some obscure (to me) points in which I don't know how to proceed. I will push to gerrit for review, just to have some cross checks, and the first bunch of patches should be ready in the next few days. BTW: is there any chance that some use of sal_uInt16 is left behind in the already converted code? I'm asking just to know what to focus on after this task is finally done. Thanks Matteo Also, note there is a hidden limit in tools/stream.hxx of 0xFFFE in things like ReadLine and ReadByteStringLine and their callers. sc is now the only module that includes tools/string.hxx and uses STRING_MAXLEN. It would be great if some calc hackers could have a look there to see if those limits still make sense (e.g. nArbitraryLineLengthLimit) especially considering the ReadLine, etc. issue. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New Developer
Yes , but still it is the same problem . On Tue, Jan 21, 2014 at 6:36 PM, Miklos Vajna vmik...@collabora.co.ukwrote: On Tue, Jan 21, 2014 at 06:32:09PM +0530, Manohar Kh khmanoh...@gmail.com wrote: manohar@crazyHorse:~/Development$ git clone https://gerrit.libreoffice.org/p/core.git Cloning into 'core'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://gerrit.libreoffice.org/p/core.git/info/refs fatal: HTTP request failed Seems you have a problematic /etc/ssl/certs/ca-certificates.crt. Did you try http insetad of https? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pdfwriter_impl2.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit cdfebf30946307998eb3965ad30bbcd34ce82b02
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Jan 21 01:48:30 2014 -0600
coverity#707581
Change-Id: I9e9ed9b83d830b1ebe2aae35036f49a649837765
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 121f23d..b045659 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1370,6 +1370,10 @@ bool PDFWriterImpl::computeEncryptionKey(
EncHashTransporter* i_pTransporter, vc
}
}
}
+else
+{
+bSuccess = false;
+}
}
else
bSuccess = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/drawingml.cxx | 10 +-
sw/qa/extras/ooxmlexport/data/drawinglayer-pic-pos.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +++
3 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 3aef7b3b3dba2d898f3a278e916166e7c3d87321
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jan 21 12:08:00 2014 +0100
drawingML export: fix position of wrapped shapes in DOCX
In case of DOCX, the DOCX wrapper around the drawingML fragment already
contains the real position of the shape (which talks about paragraphs
and other concepts which are unavailable in a spreadsheet /
presentation), and the inner position should be 0, otherwise the shape
is shifted towards the bottom right corner.
Note that this only affects drawinglayer shapes in DOCX, Writer pictures
are handled in sw, and those always had a 0,0 position in the inner
drawingML fragment.
Change-Id: I582b1ae64387b50ffb051e1f5017eab0e5d5ab34
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2cddbf5..f81cd91 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -714,7 +714,15 @@ void DrawingML::WriteTransformation( const Rectangle
rRect,
XML_rot, (nRotation % 2160) ? I32S( nRotation )
: NULL,
FSEND );
-mpFS-singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( rRect.Left()
) ), XML_y, IS( MM100toEMU( rRect.Top() ) ), FSEND );
+sal_Int32 nLeft = rRect.Left();
+sal_Int32 nTop = rRect.Top();
+if (GetDocumentType() == DOCUMENT_DOCX !m_xParent.is())
+{
+nLeft = 0;
+nTop = 0;
+}
+
+mpFS-singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( nLeft ) ),
XML_y, IS( MM100toEMU( nTop ) ), FSEND );
mpFS-singleElementNS( XML_a, XML_ext, XML_cx, IS( MM100toEMU(
rRect.GetWidth() ) ), XML_cy, IS( MM100toEMU( rRect.GetHeight() ) ), FSEND );
mpFS-endElementNS( nXmlNamespace, XML_xfrm );
diff --git a/sw/qa/extras/ooxmlexport/data/drawinglayer-pic-pos.docx
b/sw/qa/extras/ooxmlexport/data/drawinglayer-pic-pos.docx
new file mode 100644
index 000..bb18ab3
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/drawinglayer-pic-pos.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ae4ab8c..8bfc251 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -147,6 +147,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const
OString rXPath)
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wpg),
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordprocessingGroup;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(wp),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(a),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/main;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(pic),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/picture;));
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
return pXmlXpathObj-nodesetval;
}
@@ -2493,6 +2494,20 @@ DECLARE_OOXMLEXPORT_TEST(testDmlTextshape,
dml-textshape.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1256), xShape-getPosition().Y);
}
+DECLARE_OOXMLEXPORT_TEST(testDrawinglayerPicPos, drawinglayer-pic-pos.docx)
+{
+// The problem was that the position of the picture was incorrect, it was
shifted towards the bottom right corner.
+xmlDocPtr pXmlDocument = parseExport(word/document.xml);
+if (!pXmlDocument)
+return;
+
+OString
aXPath(/w:document/w:body/w:p[1]/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:spPr/a:xfrm/a:off);
+// This was 720.
+assertXPath(pXmlDocument, aXPath, x, 0);
+// This was 1828800.
+assertXPath(pXmlDocument, aXPath, y, 0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testShapeThemePreservation,
shape-theme-preservation.docx)
{
xmlDocPtr pXmlDocument = parseExport(word/document.xml);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basctl/source dbaccess/source filter/source sc/source sd/source svtools/source svx/source sw/source vcl/aqua
basctl/source/dlged/dlged.cxx |2 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx |2 +-
filter/source/msfilter/svdfppt.cxx |2 +-
sc/source/filter/excel/tokstack.cxx|2 +-
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |2 +-
sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +-
sd/source/filter/xml/sdxmlwrp.cxx |2 +-
svtools/source/edit/syntaxhighlight.cxx|2 +-
svx/source/table/cell.cxx |2 +-
svx/source/unodraw/unoshape.cxx|2 +-
sw/source/ui/app/appopt.cxx|2 +-
vcl/aqua/source/app/salinst.cxx|2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 275a1d7a011e79a7f9c44c51e947d2cb50197051
Author: Herbert Dürr h...@apache.org
Date: Tue Jan 21 13:56:09 2014 +
get rid of an extraneous parentheses in if((A==B))
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 0623039..296a3f3 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -514,7 +514,7 @@ void DlgEditor::MouseButtonUp( const MouseEvent rMEvt )
{
sal_Bool bRet = pFunc-MouseButtonUp( rMEvt );
-if( (eMode == DLGED_INSERT) )
+if( eMode == DLGED_INSERT )
bCreateOK = bRet;
}
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 6f57917..27c560e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1462,7 +1462,7 @@ long OJoinTableView::PreNotify(NotifyEvent rNEvt)
// no conn for any reason - select the next
or previous tab win
if(bForward)
{
-if ((aIter-second ==
m_aTableMap.rbegin()-second))
+if( aIter-second ==
m_aTableMap.rbegin()-second)
pNextWin = m_aTableMap.begin()-second;
else
{
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 51af756..692e3d0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1089,7 +1089,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream rSt,
DffObjData rObjData, voi
}
sal_uInt32 nDestinationInstance = aTextObj.GetInstance();
-if ( ( rPersistEntry.ePageKind == PPT_MASTERPAGE ) )
+if ( rPersistEntry.ePageKind == PPT_MASTERPAGE )
{
if ( !rPersistEntry.pPresentationObjects )
{
diff --git a/sc/source/filter/excel/tokstack.cxx
b/sc/source/filter/excel/tokstack.cxx
index 5701f71..5be7dbe 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -939,7 +939,7 @@ const String* TokenPool::GetExternal( const TokenId rId )
const
if( n n = nElementAkt )
{
n--;
-if( (pType[ n ] == T_Ext) )
+if( pType[ n ] == T_Ext )
{
sal_uInt16 nExt = pElement[ n ];
if ( nExt nP_Ext ppP_Ext[ nExt ] )
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index c4929fd..2173c9d 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -558,7 +558,7 @@ void
ScXMLChangeTrackingImportHelper::CreateGeneratedActions(ScMyGeneratedList
ScMyGeneratedList::iterator aEndItr(rList.end());
while (aItr != aEndItr)
{
-if (((*aItr)-nID == 0))
+if( (*aItr)-nID == 0)
{
ScBaseCell* pCell = NULL;
if ((*aItr)-pCellInfo)
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5faea3e..ad58ffd 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -331,7 +331,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport
rExport,
sal_Bool bPrevCharWasSpace(sal_True);
while(i sText.getLength())
{
-if ((sText[i] == '\n'))
+if( sText[i] == '\n')
{
SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P,
sal_True, sal_False);
rExport.GetTextParagraphExport()-exportText(sTemp.makeStringAndClear(),
bPrevCharWasSpace);
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index 99250db..c0e404b 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++
Re: Mac OS X 64-bit, libstdc++ vs. libc++
On Tue, Jan 21, 2014 at 6:10 AM, Stephan Bergmann sberg...@redhat.com wrote: On 01/17/2014 10:02 AM, Stephan Bergmann wrote: Therefore, I would suggest to stay with a broken Mac OS X 64-bit SDK for LO 4.2.0 and only backport those fixes to libreoffice-4-2 towards LO 4.2.1. Other opinions? Fine Norbert PS: upgrading xcode indeed solved the build problems. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: space between values and units in spinners, fdo#71688
On Tue, 2014-01-21 at 15:01 +0200, Khaled Hosny wrote: On Tue, Jan 21, 2014 at 01:27:37PM +0100, Stephan Bergmann wrote: On 01/21/2014 12:59 PM, Caolán McNamara wrote: So to resolve this we now have a function formatPercent which takes the number and the locale and runs it through icu's PercentInstance to format it according to that locale's formatting rule. Which gives e.g. 10 % for de and 10% for en. (http://site.icu-project.org/) But at least my copy of Duden Satz- und Korrekturanweisungen asks for a thin instead of a full space in front of percent (and per-mille) signs in German. Could we handle that, too, or is that beyond the state of the art in UI typography? Unicode has a thin space character (U+2009), so if translators used it it should just work. The tricky part would be ICU. Yeah it should just work in the UI to use a narrow space. Though because icu is currently using 0x00A0 no-break space presumably 0x202F narrow no-break space is desirable given its similar properties. I can easily special case replacing 0x00A0 with 0x202F from the icu result for de. FWIW, the percent pattern formats for the various locales can be seen at http://www.unicode.org/cldr/charts/24/by_type/numbers.number_formatting_patterns.html under standard-percent C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: long paras + tools/string.hxx
On Tue, 2014-01-21 at 14:20 +0100, Matteo Casalin wrote: I'm (very) slowly working on this. Indeed there are some obscure (to me) points in which I don't know how to proceed. I will push to gerrit for review, just to have some cross checks, and the first bunch of patches should be ready in the next few days. BTW: is there any chance that some use of sal_uInt16 is left behind in the already converted code? I'm asking just to know what to focus on after this task is finally done. There is a chance alright. But in writer at least I made an effort in the first round to find all the sal_uInt16s which were really xub_StrLens and rename them as xub_StrLen before going on later to convert them to sal_Int32. Which doesn't mean I'm sure I got them all of course. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - svx/source
svx/source/fmcomp/fmgridcl.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx |2 +-
svx/source/svdraw/svdview.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0a4abbda7c08ecc52712e356371a415137137929
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jan 21 16:27:37 2014 +0200
WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
Change-Id: Ia622d25a454eb2fe1928e095c635ad4655032f15
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 07a41be..69398e8 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2539,7 +2539,7 @@ void DbGridControl::AppendNew()
void DbGridControl::SetDesignMode(bool bMode)
{
-if (IsDesignMode() != bMode)
+if ((bool) IsDesignMode() != bMode)
{
// adjust Enable/Disable for design mode so that the headerbar remains
configurable
if (bMode)
commit 2e4157369a7b5127e4a3b312c944a3044b36845a
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jan 21 16:26:44 2014 +0200
WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
Change-Id: Ibfd666d4c7b2d92a65a01a84fe83319f056b1e7b
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 27b657c..2a7f49d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1070,7 +1070,7 @@ void FmGridControl::propertyChange(const
::com::sun::star::beans::PropertyChange
void FmGridControl::SetDesignMode(bool bMode)
{
-sal_Bool bOldMode = IsDesignMode();
+bool bOldMode = IsDesignMode();
DbGridControl::SetDesignMode(bMode);
if (bOldMode != bMode)
{
commit eb1b3360e641aaf5c9c8e142473c6e88128bc766
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jan 21 16:23:52 2014 +0200
WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
Change-Id: I3dfa4495ca7eeba3b3f4f6d81a2ef90fe60ca2d5
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index e8ef1ce..8b5f70a 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1442,7 +1442,7 @@ void SdrView::onAccessibilityOptionsChanged()
void SdrView::SetMasterPagePaintCaching(sal_Bool bOn)
{
-if(mbMasterPagePaintCaching != bOn)
+if(mbMasterPagePaintCaching != (bool) bOn)
{
mbMasterPagePaintCaching = bOn;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 35539318cecddc9ccb2904573a894ea05adc432c
Author: Tor Lillqvist t...@collabora.com
Date: Tue Jan 21 16:50:58 2014 +0200
WaE: C4701: potentially uninitialized local variable 'nIdx' used
Change-Id: If05dd971ad62b059499c50bfc0b82b28e19fee4a
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f81cd91..2fde292 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1722,7 +1722,7 @@ void DrawingML::WriteShapeStyle( Reference XPropertySet
xPropSet )
if( aFillRefProperties.getLength() 0 )
{
OUString sSchemeClr;
-sal_uInt32 nIdx;
+sal_uInt32 nIdx = 0;
for( sal_Int32 i=0; i aFillRefProperties.getLength(); ++i)
if( aFillRefProperties[i].Name == SchemeClr )
aFillRefProperties[i].Value = sSchemeClr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source i18nutil/source include/tools sc/uiconfig
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/inc/dbaccess_helpid.hrc|3
dbaccess/source/ui/control/tabletree.cxx| 10 +
dbaccess/source/ui/dlg/dbadmin.hrc |3
dbaccess/source/ui/dlg/dbadmin2.src | 48
dbaccess/source/ui/dlg/tablespage.cxx | 135
dbaccess/source/ui/dlg/tablespage.hxx |7 -
dbaccess/uiconfig/ui/tablesfilterpage.ui| 74 +
extras/source/glade/libreoffice-catalog.xml.in |6 -
i18nutil/source/utility/unicode.cxx |8 +
include/tools/string.hxx|3
sc/uiconfig/scalc/ui/conditionalformatdialog.ui |2
12 files changed, 169 insertions(+), 131 deletions(-)
New commits:
commit 5c72a213c7c4b588d0c1e0884ff2c46c22425faf
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 21 14:41:16 2014 +
convert table filter page to .ui
Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 7148268..a493107 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/rowheightdialog \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \
+dbaccess/uiconfig/ui/tablesfilterpage \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 2f0e3b4..e1b407f 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -39,7 +39,6 @@
#define HID_DSADMIN_PAGE_JDBC
DBACCESS_HID_DSADMIN_PAGE_JDBC
#define HID_DSADMIN_PAGE_ODBC
DBACCESS_HID_DSADMIN_PAGE_ODBC
#define HID_DSADMIN_PAGE_TEXT
DBACCESS_HID_DSADMIN_PAGE_TEXT
-#define HID_DSADMIN_TABLE_SUBSCRIPTION
DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION
#define HID_DSADMIN_DSACTIONS_NEWDS
DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS
#define HID_DSADMIN_DSACTIONS_DELETEDS
DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS
#define HID_DSADMIN_DSACTIONS_RESTOREDS
DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS
@@ -63,7 +62,6 @@
#define HID_DSADMIN_ALL_TABLES
DBACCESS_HID_DSADMIN_ALL_TABLES
#define HID_DSADMIN_NO_TABLES
DBACCESS_HID_DSADMIN_NO_TABLES
#define HID_DSADMIN_SELECT_TABLES
DBACCESS_HID_DSADMIN_SELECT_TABLES
-#define HID_DSADMIN_TABLE_SELECTOR
DBACCESS_HID_DSADMIN_TABLE_SELECTOR
#define HID_DSADMIN_SUPPRESS_VERSIONCL
DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL
#define HID_GENERIC_SQL_ERROR
DBACCESS_HID_GENERIC_SQL_ERROR
@@ -178,7 +176,6 @@
#define HID_BROWSER_VIEW_CREATE_DESIGN
DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN
#define HID_DSADMIN_DOCUMENTS
DBACCESS_HID_DSADMIN_DOCUMENTS
#define HID_DSADMIN_DOCUMENTLINKS
DBACCESS_HID_DSADMIN_DOCUMENTLINKS
-#define HID_DSADMIN_FILTER_EXPLANATION
DBACCESS_HID_DSADMIN_FILTER_EXPLANATION
#define HID_CONFIRM_DROP_BUTTON_ALL
DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL
#define HID_DSBROWSER_BOOKMARK_SELECTED
DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED
#define HID_DSADMIN_TABLE_TOOLBOX
DBACCESS_HID_DSADMIN_TABLE_TOOLBOX
diff --git a/dbaccess/source/ui/control/tabletree.cxx
b/dbaccess/source/ui/control/tabletree.cxx
index e1f8333..d410b29 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -21,6 +21,7 @@
#include imageprovider.hxx
#include moduledbu.hxx
#include dbu_control.hrc
+#include vcl/layout.hxx
#include vcl/menu.hxx
#include connectivity/dbtools.hxx
#include comphelper/types.hxx
@@ -73,6 +74,15 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent,
WinBits nWinStyle)
implSetDefaultImages();
}
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window
*pParent, VclBuilder::stringmap rMap)
+{
+WinBits nWinStyle = 0;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
+return new OTableTreeListBox(pParent, nWinStyle);
+}
+
OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId rResId,
sal_Bool _bVirtualRoot)
:OMarkableTreeListBox(pParent, rResId)
,m_xImageProvider( new ImageProvider )
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 99fe79c..f2f1cbc 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -31,7 +31,6 @@
// FREE
#define FT_JDBCDRIVERCLASS 7
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/explorer/database/menutools.xhp |4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 23bdde918a84d61f7162980ee9356363c3393202 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 14:54:10 2014 + update help ids for tables filter dialog .ui conversion Change-Id: I818dd5af4e86ed9e49901f9b7655dd03109b7201 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a1168c6..4c24754 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1498,7 +1498,6 @@ HID_DSADMIN_DSTYPE,38807, HID_DSADMIN_ENABLEOUTERJOIN,39052, HID_DSADMIN_EXTENSION,38822, HID_DSADMIN_FIELD_SEPARATOR,38818, -HID_DSADMIN_FILTER_EXPLANATION,38936, HID_DSADMIN_FLAT_PATH,39014, HID_DSADMIN_HOSTNAME,39034, HID_DSADMIN_IGNORECURRENCY,39151, @@ -1546,8 +1545,6 @@ HID_DSADMIN_SHOWDELETED,38812, HID_DSADMIN_SPECIAL_MESSAGE,38840, HID_DSADMIN_SQL92CHECK,38993, HID_DSADMIN_SUPPRESS_VERSIONCL,38827, -HID_DSADMIN_TABLE_SELECTOR,38826, -HID_DSADMIN_TABLE_SUBSCRIPTION,38802, HID_DSADMIN_TABLE_TOOLBOX,38939, HID_DSADMIN_TEXT_HEADER,38817, HID_DSADMIN_TEXT_SEPARATOR,38819, diff --git a/source/text/shared/explorer/database/menutools.xhp b/source/text/shared/explorer/database/menutools.xhp index 127cc20..a6cee12 100644 --- a/source/text/shared/explorer/database/menutools.xhp +++ b/source/text/shared/explorer/database/menutools.xhp @@ -41,10 +41,10 @@ bookmark xml-lang=en-US branch=hid/.uno:DBUserAdmin id=bm_id2447279 localize=false/ paragraph role=heading id=par_idN1058A xml-lang=en-US level=2 l10n=NEWUser Administration/paragraph paragraph role=paragraph id=par_idN1058E xml-lang=en-US l10n=NEWahelp hid=.Opens the User Administration dialog if the database supports this feature./ahelpcommentUFI: where is this specced?/comment/paragraph -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DSADMIN_TABLE_SELECTOR id=bm_id3153087 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/tablesfilterpage/TablesFilterpage id=bm_id3153087 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:DBTableFilter id=bm_id4928739 localize=false/ paragraph role=heading id=hd_id3153880 xml-lang=en-US level=2 l10n=U oldref=13Table Filter/paragraph -paragraph role=paragraph id=par_id3153252 xml-lang=en-US l10n=U oldref=14ahelp hid=HID_DSADMIN_TABLE_SELECTOROpens the Table Filter dialog where you can specify which tables of the database to show or to hide./ahelpcommentsee text in shared\explorer\database\1109.xhp/comment/paragraph +paragraph role=paragraph id=par_id3153252 xml-lang=en-US l10n=U oldref=14ahelp hid=dbaccess/ui/tablesfilterpage/TablesFilterpageOpens the Table Filter dialog where you can specify which tables of the database to show or to hide./ahelpcommentsee text in shared\explorer\database\1109.xhp/comment/paragraph paragraph role=paragraph id=par_id3150670 xml-lang=en-US l10n=U oldref=20Select the tables that you want to filter in the emphFilter/emph list./paragraph paragraph role=paragraph id=par_id3150985 xml-lang=en-US l10n=U oldref=23If you select the topmost table in a hierarchy, all of the tables in the hierarchy are selected./paragraph paragraph role=paragraph id=par_id3152349 xml-lang=en-US l10n=U oldref=24If you select a table that is at a lower level in the hierarchy, the tables that occur above it in the hierarchy are not selected./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx|2 -
sfx2/source/control/thumbnailviewacc.cxx | 47 +--
sfx2/source/control/thumbnailviewacc.hxx |6 +++
3 files changed, 52 insertions(+), 3 deletions(-)
New commits:
commit 01a9f7b2fb6b3445ba9a93a4278ffa3821f7d04b
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Mon Jan 20 20:22:32 2014 +0100
fdo#72639: send proper ACTIVE_DESCENDANT_CHANGED events
At ThumbnailView::SelectItem the piece of code in charge of the
accessible events related to selection change was mistakenly using
the accessibility helper class ThumbnailViewAcc instead of
ThumbnailViewItemAcc which is the proper one for managing the events
related to ThumbnailViewItem objects.
The methods FireAccessibleEvent and static getImplementation had to
be added to ThumbnailViewItemAcc to provide the full functionality
required.
Change-Id: Ia5ffb24c920f3c48854021700819be683c979411
Reviewed-on: https://gerrit.libreoffice.org/7551
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 5c8522e..06f5800 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1139,7 +1139,7 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if( ImplHasAccessibleListeners() )
{
// focus event (select)
-ThumbnailViewAcc* pItemAcc = ThumbnailViewAcc::getImplementation(
pItem-GetAccessible( mbIsTransientChildrenDisabled ) );
+ThumbnailViewItemAcc* pItemAcc =
ThumbnailViewItemAcc::getImplementation( pItem-GetAccessible(
mbIsTransientChildrenDisabled ) );
if( pItemAcc )
{
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 3f61244..cd4a6d2 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -97,7 +97,7 @@ void ThumbnailViewAcc::GetFocus (void)
{
mbIsFocused = true;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aNewState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -109,7 +109,7 @@ void ThumbnailViewAcc::LoseFocus (void)
{
mbIsFocused = false;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aOldState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -612,6 +612,32 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc()
{
}
+void ThumbnailViewItemAcc::FireAccessibleEvent( short nEventId, const
uno::Any rOldValue, const uno::Any rNewValue )
+{
+if( nEventId )
+{
+::std::vector uno::Reference accessibility::XAccessibleEventListener
aTmpListeners( mxEventListeners );
+accessibility::AccessibleEventObject aEvtObject;
+
+aEvtObject.EventId = nEventId;
+aEvtObject.Source = static_castuno::XWeak*(this);
+aEvtObject.NewValue = rNewValue;
+aEvtObject.OldValue = rOldValue;
+
+for (::std::vector uno::Reference
accessibility::XAccessibleEventListener ::const_iterator aIter(
aTmpListeners.begin() ), aEnd( aTmpListeners.end() );
+aIter != aEnd ; ++aIter)
+{
+try
+{
+(*aIter)-notifyEvent( aEvtObject );
+}
+catch(const uno::Exception)
+{
+}
+}
+}
+}
+
void ThumbnailViewItemAcc::ParentDestroyed()
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -628,6 +654,23 @@ const uno::Sequence sal_Int8
ThumbnailViewItemAcc::getUnoTunnelId()
return theValueItemAccUnoTunnelId::get().getSeq();
}
+ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const
uno::Reference uno::XInterface rxData )
+throw()
+{
+try
+{
+uno::Reference lang::XUnoTunnel xUnoTunnel( rxData, uno::UNO_QUERY
);
+return( xUnoTunnel.is() ?
+
reinterpret_castThumbnailViewItemAcc*(sal::static_int_castsal_IntPtr(
+xUnoTunnel-getSomething(
ThumbnailViewItemAcc::getUnoTunnelId() ))) :
+NULL );
+}
+catch(const ::com::sun::star::uno::Exception)
+{
+return NULL;
+}
+}
+
uno::Reference accessibility::XAccessibleContext SAL_CALL
ThumbnailViewItemAcc::getAccessibleContext()
throw (uno::RuntimeException)
{
diff --git a/sfx2/source/control/thumbnailviewacc.hxx
b/sfx2/source/control/thumbnailviewacc.hxx
index 1e4f582..74f9f14 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -187,10 +187,16 @@ public:
ThumbnailViewItemAcc( ThumbnailViewItem* pParent, bool
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 27/5a1d7a011e79a7f9c44c51e947d2cb50197051
27/5a1d7a011e79a7f9c44c51e947d2cb50197051 |1 + 1 file changed, 1 insertion(+) New commits: commit 73013204d592a50f5940c952661ce5bacfd1a33f Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 15:09:21 2014 + Notes added by 'git notes add' diff --git a/27/5a1d7a011e79a7f9c44c51e947d2cb50197051 b/27/5a1d7a011e79a7f9c44c51e947d2cb50197051 new file mode 100644 index 000..e7128c3 --- /dev/null +++ b/27/5a1d7a011e79a7f9c44c51e947d2cb50197051 @@ -0,0 +1 @@ +merged as: 2cb1a05e867c17328ef24bd3489f3c18d80dfcf4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/uiconfig sc/source
dbaccess/uiconfig/ui/tablesfilterpage.ui |5 -
sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2cb1a05e867c17328ef24bd3489f3c18d80dfcf4
Author: Herbert Dürr h...@apache.org
Date: Tue Jan 21 13:56:09 2014 +
get rid of an extraneous parentheses in if((A==B))
(cherry picked from commit 275a1d7a011e79a7f9c44c51e947d2cb50197051)
Conflicts:
basctl/source/dlged/dlged.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
svtools/source/edit/syntaxhighlight.cxx
svx/source/unodraw/unoshape.cxx
sw/source/ui/app/appopt.cxx
vcl/osx/salinst.cxx
Change-Id: If4ddf4ab23dbcfc4ba280948c73664b9794aecc7
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index c3d862d..6a50503 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -320,7 +320,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport
rExport,
bool bPrevCharWasSpace(true);
while(i sText.getLength())
{
-if ((sText[i] == '\n'))
+if( sText[i] == '\n')
{
SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P,
true, false);
rExport.GetTextParagraphExport()-exportText(sTemp.makeStringAndClear(),
bPrevCharWasSpace);
commit 656babddbc862d0d2498c79f616db839577a80ae
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 21 15:08:36 2014 +
wrap long text in tables filter dialog
Change-Id: I64f513969ff8eae48da4b55449439ea61b828645
diff --git a/dbaccess/uiconfig/ui/tablesfilterpage.ui
b/dbaccess/uiconfig/ui/tablesfilterpage.ui
index 70ab9ee..cee902e 100644
--- a/dbaccess/uiconfig/ui/tablesfilterpage.ui
+++ b/dbaccess/uiconfig/ui/tablesfilterpage.ui
@@ -1,7 +1,8 @@
?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.0 on Tue Jan 21 09:48:38 2014 --
+!-- Generated with glade 3.16.0 on Tue Jan 21 15:00:47 2014 --
interface
!-- interface-requires gtk+ 3.0 --
+ !-- interface-requires LibreOffice 1.0 --
object class=GtkFrame id=TablesFilterPage
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -31,6 +32,8 @@
property name=can_focusFalse/property
property name=xalign0/property
property name=label translatable=yesMark the tables that
should be visible for the applications./property
+property name=wrapTrue/property
+property name=max_width_chars56/property
/object
packing
property name=left_attach0/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc svtools/source
sd/inc/stlsheet.hxx |2 +-
svtools/source/control/valueacc.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2e10f314d0d3c3d159f8140fc9073fc86fbcfa17
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 21 15:15:57 2014 +
boradcast-broadcast
Change-Id: I96720843f815bf6d499eb424c3e4ff579c2bbe23
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 561ce52..53ffab0 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -135,7 +135,7 @@ protected:
OUString msApiName;
rtl::Reference SfxStyleSheetBasePool mxPool;
-/** boradcast helper for events */
+/** broadcast helper for events */
::cppu::OBroadcastHelper mrBHelper;
boost::scoped_ptr ModifyListenerForewarder mpModifyListenerForewarder;
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index a669d25..1306c96 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -144,7 +144,7 @@ void ValueSetAcc::GetFocus (void)
{
mbIsFocused = true;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aNewState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -158,7 +158,7 @@ void ValueSetAcc::LoseFocus (void)
{
mbIsFocused = false;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aOldState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
___
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-0' - solenv/gbuild
solenv/gbuild/UnoApi.mk |1 + 1 file changed, 1 insertion(+) New commits: commit b45983f1bb86b316861b7cbcca500bb1ca894ca5 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 21 10:56:08 2014 +0100 idl files need to be packaged relative to INSTDIR, not INSTROOT ...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb (cherry picked from commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74) Reviewed-on: https://gerrit.libreoffice.org/7570 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 5f40ee3..69ae8a9 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -20,6 +20,7 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) endif $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir ___ 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-0' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo73389.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 23 +--
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f18d3a8f842713de10ecda161b74ef25e21aa14f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Jan 20 13:44:46 2014 +0100
fdo#73389 Writer does not show a docx-document with nested table correctly
The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
Reviewed-on: https://gerrit.libreoffice.org/7544
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6d44d45..e9c5ad0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1563,6 +1563,13 @@ DECLARE_OOXMLIMPORT_TEST(testRPrChangeClosed,
rprchange_closed.docx)
CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 1),
RedlineType));
}
+DECLARE_OOXMLIMPORT_TEST(testFdo73389,fdo73389.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// This was 9340, i.e. the width of the inner table was too large.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2842),
getPropertysal_Int32(xTables-getByIndex(0), Width));
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c4b24a7..cc7d119 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,24 +142,17 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
*/
bool bFixed = true;
sal_Int32 nRowFixedWidth = 0;
-if (!m_aCellWidths.empty())
+IntVectorPtr pCellWidths = getCurrentCellWidths();
+// Step 1. Check whether all cells have fixed
widths in the given row of table.
+for (std::vectorsal_Int32::const_iterator
aValIter = pCellWidths-begin(); aValIter != pCellWidths-end(); ++aValIter)
{
-// Step 1. Check whether all cells have fixed
widths in the given row of table.
-::std::vector IntVectorPtr ::iterator itr;
-for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); ++itr )
+if (*aValIter == -1)
{
-IntVectorPtr itrVal = (*itr);
-for
(std::vectorsal_Int32::const_iterator aValIter = itrVal-begin(); aValIter !=
itrVal-end(); ++aValIter)
-{
-if (*aValIter == -1)
-{
-bFixed = false;
-break;
-}
-// Sum the width of cells to find the
total width of given row
-nRowFixedWidth += (*aValIter);
-}
+bFixed = false;
+break;
}
+// Sum the width of cells to find the total
width of given row
+nRowFixedWidth += (*aValIter);
}
// Check whether the total width of given row is
compared with the maximum value of rows (m_nMaxFixedWidth).
___
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' - vcl/source
vcl/source/filter/wmf/winmtf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ade704ea4ac7317f2ad300c8321c64ba54d0e692
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Jan 19 19:13:57 2014 +0100
fdo#73764 partially revert 3998d1abb291
Change-Id: Ie9b6d6a318fad256f3f0999fe9c0810a4323f10d
Reviewed-on: https://gerrit.libreoffice.org/7537
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 160416b..38e79a8 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -317,7 +317,7 @@ Point WinMtfOutput::ImplScale( const Point rPt) // Hack to
set varying defaults
{
if (mbIsMapDevSet mbIsMapWinSet)
{
-return
Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+return rPt; //fdo#73764
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72639, which changed state. Bug 72639 Summary: ACCESSIBILITY: Recent documents in the new start center don't send the proper a11y events https://bugs.freedesktop.org/show_bug.cgi?id=72639 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: fwk: Use constructor feature for ModuleUIConfigurationManager
On 01/17/2014 12:28 PM, Matúš Kukan wrote: commit 72b5343bd16deec540d8cd148cd7aebd74e92c16 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Jan 9 20:18:49 2014 +0100 fwk: Use constructor feature for ModuleUIConfigurationManager. And avoid css::uno::XInitialization protocol. Removing XInitialization from a service implementation is always a delicate move regarding compatibility. Even though the new-style service css.ui.ModuleUIConfigurationManager does not mention XInitialization, the old-style variant (prior to http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c41a60c0d802c618ac414822615a5c9e9e92f9f fdo#46808, Convert ui::ModuleUIConfigurationManager service to new style) did, and there is always a chance that (external) code obtains the service implementation via a non-argument queryInstance call and then explicitly queries for XInitialization. So although this change is most probably justified, it is nevertheless incompatible. Matúš, can you please manually list your relevant past changes at https://wiki.documentfoundation.org/ReleaseNotes/4.3#API_changes and add [API CHANGE] to the commit messages of relevant future changes (to allow for semi-automatic tracking)? Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/control/thumbnailview.cxx|2 -
sfx2/source/control/thumbnailviewacc.cxx | 47 +--
sfx2/source/control/thumbnailviewacc.hxx |6 +++
3 files changed, 52 insertions(+), 3 deletions(-)
New commits:
commit cdc6d32d9062b1c143b094910bc913cb8f183afa
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Mon Jan 20 20:22:32 2014 +0100
fdo#72639: send proper ACTIVE_DESCENDANT_CHANGED events
At ThumbnailView::SelectItem the piece of code in charge of the
accessible events related to selection change was mistakenly using
the accessibility helper class ThumbnailViewAcc instead of
ThumbnailViewItemAcc which is the proper one for managing the events
related to ThumbnailViewItem objects.
The methods FireAccessibleEvent and static getImplementation had to
be added to ThumbnailViewItemAcc to provide the full functionality
required.
Change-Id: Ia5ffb24c920f3c48854021700819be683c979411
Reviewed-on: https://gerrit.libreoffice.org/7551
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 01a9f7b2fb6b3445ba9a93a4278ffa3821f7d04b)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 1fe98f1..35380a8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1140,7 +1140,7 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if( ImplHasAccessibleListeners() )
{
// focus event (select)
-ThumbnailViewAcc* pItemAcc = ThumbnailViewAcc::getImplementation(
pItem-GetAccessible( mbIsTransientChildrenDisabled ) );
+ThumbnailViewItemAcc* pItemAcc =
ThumbnailViewItemAcc::getImplementation( pItem-GetAccessible(
mbIsTransientChildrenDisabled ) );
if( pItemAcc )
{
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 3f61244..cd4a6d2 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -97,7 +97,7 @@ void ThumbnailViewAcc::GetFocus (void)
{
mbIsFocused = true;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aNewState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -109,7 +109,7 @@ void ThumbnailViewAcc::LoseFocus (void)
{
mbIsFocused = false;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aOldState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -612,6 +612,32 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc()
{
}
+void ThumbnailViewItemAcc::FireAccessibleEvent( short nEventId, const
uno::Any rOldValue, const uno::Any rNewValue )
+{
+if( nEventId )
+{
+::std::vector uno::Reference accessibility::XAccessibleEventListener
aTmpListeners( mxEventListeners );
+accessibility::AccessibleEventObject aEvtObject;
+
+aEvtObject.EventId = nEventId;
+aEvtObject.Source = static_castuno::XWeak*(this);
+aEvtObject.NewValue = rNewValue;
+aEvtObject.OldValue = rOldValue;
+
+for (::std::vector uno::Reference
accessibility::XAccessibleEventListener ::const_iterator aIter(
aTmpListeners.begin() ), aEnd( aTmpListeners.end() );
+aIter != aEnd ; ++aIter)
+{
+try
+{
+(*aIter)-notifyEvent( aEvtObject );
+}
+catch(const uno::Exception)
+{
+}
+}
+}
+}
+
void ThumbnailViewItemAcc::ParentDestroyed()
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -628,6 +654,23 @@ const uno::Sequence sal_Int8
ThumbnailViewItemAcc::getUnoTunnelId()
return theValueItemAccUnoTunnelId::get().getSeq();
}
+ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const
uno::Reference uno::XInterface rxData )
+throw()
+{
+try
+{
+uno::Reference lang::XUnoTunnel xUnoTunnel( rxData, uno::UNO_QUERY
);
+return( xUnoTunnel.is() ?
+
reinterpret_castThumbnailViewItemAcc*(sal::static_int_castsal_IntPtr(
+xUnoTunnel-getSomething(
ThumbnailViewItemAcc::getUnoTunnelId() ))) :
+NULL );
+}
+catch(const ::com::sun::star::uno::Exception)
+{
+return NULL;
+}
+}
+
uno::Reference accessibility::XAccessibleContext SAL_CALL
ThumbnailViewItemAcc::getAccessibleContext()
throw (uno::RuntimeException)
{
diff --git a/sfx2/source/control/thumbnailviewacc.hxx
b/sfx2/source/control/thumbnailviewacc.hxx
index 1e4f582..74f9f14 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -187,10 +187,16 @@
[Libreoffice-commits] core.git: include/vcl sd/source vcl/source
include/vcl/svapp.hxx| 21 +++--
sd/source/ui/slideshow/slideshowimpl.cxx |8
vcl/source/app/svapp.cxx | 10 --
3 files changed, 27 insertions(+), 12 deletions(-)
New commits:
commit 1d621d363cf966648fc5ed551dbc95de3e70e89c
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Jan 19 13:13:07 2014 +1100
Change EnableNoYieldMode(bool) to better names
It makes no sense to disable something via an Enable function.
I have split the function into Enable and Disable functions, and
update the code accordingly.
Conflicts:
include/vcl/svapp.hxx
Change-Id: Ic05d69796f43e802a4a2a16aaca44433b6eaa018
Reviewed-on: https://gerrit.libreoffice.org/7525
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 0432a17..8e7b053 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -469,17 +469,26 @@ public:
No yield mode prevents @Yield from waiting for events.
@remarks This was originally implemented in OOo bug 98792 to improve
-Impress slideshows. For some reason, to \em disable no yield mode, you
-call on EnableNoYieldMode
+Impress slideshows.
- @param i_bNoYield If set to false, then no yield mode is turned
off.
-If set to true, then no yield mode is turned on.
+ @see DisableNoYieldMode, Execute, Quit, Reschedule, Yield, EndYield,
GetSolarMutex,
+ GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
+ AddPostYieldListener, RemovePostYieldListener
+*/
+static void EnableNoYieldMode();
- @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,
+/** @Brief Disables no yield mode
+
+ No yield mode prevents @Yield from waiting for events.
+
+ @remarks This was originally implemented in OOo bug 98792 to improve
+Impress slideshows.
+
+ @see EnableNoYieldMode, Execute, Quit, Reschedule, Yield, EndYield,
GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
AddPostYieldListener, RemovePostYieldListener
*/
-static void EnableNoYieldMode( bool i_bNoYield );
+static void DisableNoYieldMode();
/** Add a listener for yield events
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 87e6435..2bc4d72 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -760,7 +760,7 @@ void SAL_CALL SlideshowImpl::disposing()
setActiveXToolbarsVisible( sal_True );
-Application::EnableNoYieldMode(false);
+Application::DisableNoYieldMode();
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
mbDisposed = true;
@@ -1855,7 +1855,7 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener)
// prevent me from deletion when recursing (App::Reschedule does)
const rtl::ReferenceSlideshowImpl this_(this);
-Application::EnableNoYieldMode(false);
+Application::DisableNoYieldMode();
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
Application::Reschedule(true); // fix for fdo#32861 - process
// *all* outstanding events after
@@ -1896,7 +1896,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
if (::basegfx::fTools::equalZero(fUpdate))
{
// Use post yield listener for short update intervalls.
-Application::EnableNoYieldMode(true);
+Application::EnableNoYieldMode();
Application::AddPostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
}
else
@@ -1917,7 +1917,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
// integer may lead to zero value.)
OSL_ASSERT(static_castsal_uLong(fUpdate * 1000.0) 0);
-Application::EnableNoYieldMode(false);
+Application::DisableNoYieldMode();
Application::RemovePostYieldListener(LINK(this, SlideshowImpl,
PostYieldListener));
// Use a timer for the asynchronous callback.
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 6d345f3..a754856 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -986,10 +986,16 @@ void Application::RemoveIdleHdl( const Link rLink )
pSVData-maAppData.mpIdleMgr-RemoveIdleHdl( rLink );
}
-void Application::EnableNoYieldMode( bool i_bNoYield )
+void Application::EnableNoYieldMode()
{
ImplSVData* pSVData = ImplGetSVData();
-pSVData-maAppData.mbNoYield = i_bNoYield;
+pSVData-maAppData.mbNoYield = true;
+}
+
+void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sd/uiconfig
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 110 +++ 1 file changed, 55 insertions(+), 55 deletions(-) New commits: commit a4a6fa38cebf6182769495c74af5f59588056e0b Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 16 15:16:40 2014 + place some elements side by side to regain a line Change-Id: I9b838b6c00bc6e456adcf5d63c9936c08bf0d1aa (cherry picked from commit 5eaa0135c3ffc46ce601ea4cbaaa17eabe44e6ee) (cherry picked from commit 0d5397234b7589617970bb20d8fb3ad07a4587a1) Reviewed-on: https://gerrit.libreoffice.org/7475 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 750c9f9..595f8f0 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -183,60 +183,8 @@ /object packing property name=left_attach0/property -property name=top_attach1/property -property name=width2/property -property name=height1/property - /packing -/child -child - object class=GtkCheckButton id=objalwymov -property name=label translatable=yesObjects always moveable/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=receives_defaultFalse/property -property name=use_underlineTrue/property -property name=xalign0/property -property name=draw_indicatorTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach2/property -property name=width2/property -property name=height1/property - /packing -/child -child - object class=GtkCheckButton id=backgroundback -property name=label translatable=yesUse background cache/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=receives_defaultFalse/property -property name=use_underlineTrue/property -property name=xalign0/property -property name=draw_indicatorTrue/property - /object - packing -property name=left_attach0/property property name=top_attach0/property -property name=width2/property -property name=height1/property - /packing -/child -child - object class=GtkCheckButton id=distrotcb -property name=label translatable=yesDo not distort objects in curve/property -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultFalse/property -property name=double_bufferedFalse/property -property name=use_underlineTrue/property -property name=xalign0/property -property name=draw_indicatorTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach3/property -property name=width2/property +property name=width1/property property name=height1/property /packing /child @@ -277,7 +225,7 @@ /object packing property name=left_attach0/property -property name=top_attach4/property +property name=top_attach2/property property name=width1/property property name=height1/property /packing @@ -324,7 +272,59 @@ /object packing property name=left_attach1/property -property name=top_attach4/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkCheckButton id=objalwymov +property name=label
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sfx2/source
sfx2/source/control/thumbnailview.cxx|2 -
sfx2/source/control/thumbnailviewacc.cxx | 47 +--
sfx2/source/control/thumbnailviewacc.hxx |6 +++
3 files changed, 52 insertions(+), 3 deletions(-)
New commits:
commit eed45184ff542a713d28928b50c5a8ce8efd3a92
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Mon Jan 20 20:22:32 2014 +0100
fdo#72639: send proper ACTIVE_DESCENDANT_CHANGED events
At ThumbnailView::SelectItem the piece of code in charge of the
accessible events related to selection change was mistakenly using
the accessibility helper class ThumbnailViewAcc instead of
ThumbnailViewItemAcc which is the proper one for managing the events
related to ThumbnailViewItem objects.
The methods FireAccessibleEvent and static getImplementation had to
be added to ThumbnailViewItemAcc to provide the full functionality
required.
Change-Id: Ia5ffb24c920f3c48854021700819be683c979411
Reviewed-on: https://gerrit.libreoffice.org/7551
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 01a9f7b2fb6b3445ba9a93a4278ffa3821f7d04b)
(cherry picked from commit cdc6d32d9062b1c143b094910bc913cb8f183afa)
Reviewed-on: https://gerrit.libreoffice.org/7573
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 1fe98f1..35380a8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1140,7 +1140,7 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if( ImplHasAccessibleListeners() )
{
// focus event (select)
-ThumbnailViewAcc* pItemAcc = ThumbnailViewAcc::getImplementation(
pItem-GetAccessible( mbIsTransientChildrenDisabled ) );
+ThumbnailViewItemAcc* pItemAcc =
ThumbnailViewItemAcc::getImplementation( pItem-GetAccessible(
mbIsTransientChildrenDisabled ) );
if( pItemAcc )
{
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 3f61244..cd4a6d2 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -97,7 +97,7 @@ void ThumbnailViewAcc::GetFocus (void)
{
mbIsFocused = true;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aNewState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -109,7 +109,7 @@ void ThumbnailViewAcc::LoseFocus (void)
{
mbIsFocused = false;
-// Boradcast the state change.
+// Broadcast the state change.
::com::sun::star::uno::Any aOldState, aNewState;
aOldState =
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
@@ -612,6 +612,32 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc()
{
}
+void ThumbnailViewItemAcc::FireAccessibleEvent( short nEventId, const
uno::Any rOldValue, const uno::Any rNewValue )
+{
+if( nEventId )
+{
+::std::vector uno::Reference accessibility::XAccessibleEventListener
aTmpListeners( mxEventListeners );
+accessibility::AccessibleEventObject aEvtObject;
+
+aEvtObject.EventId = nEventId;
+aEvtObject.Source = static_castuno::XWeak*(this);
+aEvtObject.NewValue = rNewValue;
+aEvtObject.OldValue = rOldValue;
+
+for (::std::vector uno::Reference
accessibility::XAccessibleEventListener ::const_iterator aIter(
aTmpListeners.begin() ), aEnd( aTmpListeners.end() );
+aIter != aEnd ; ++aIter)
+{
+try
+{
+(*aIter)-notifyEvent( aEvtObject );
+}
+catch(const uno::Exception)
+{
+}
+}
+}
+}
+
void ThumbnailViewItemAcc::ParentDestroyed()
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -628,6 +654,23 @@ const uno::Sequence sal_Int8
ThumbnailViewItemAcc::getUnoTunnelId()
return theValueItemAccUnoTunnelId::get().getSeq();
}
+ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const
uno::Reference uno::XInterface rxData )
+throw()
+{
+try
+{
+uno::Reference lang::XUnoTunnel xUnoTunnel( rxData, uno::UNO_QUERY
);
+return( xUnoTunnel.is() ?
+
reinterpret_castThumbnailViewItemAcc*(sal::static_int_castsal_IntPtr(
+xUnoTunnel-getSomething(
ThumbnailViewItemAcc::getUnoTunnelId() ))) :
+NULL );
+}
+catch(const ::com::sun::star::uno::Exception)
+{
+return NULL;
+}
+}
+
uno::Reference accessibility::XAccessibleContext SAL_CALL
ThumbnailViewItemAcc::getAccessibleContext()
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsview.cxx |8
sfx2/source/dialog/backingcomp.cxx | 14 ++
sfx2/source/dialog/backingwindow.cxx |4 +++-
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 840e7f004354ebe1239b9271dd758839c477ca7c
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Jan 17 20:10:06 2014 +0100
fdo#65826 and fdo#73605: set a minimum size to start center
This minimum size calculated like this:
width: sidebar optimal width + width of text appearing in
the thumbnail view when no recent document is available.
height: menu width + optimal width of GtkBox containing
buttons.
Change-Id: Ic1fd6e33a1ec93e61318af02c09ee88909a76cf4
Reviewed-on: https://gerrit.libreoffice.org/7505
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index e1b1c0c..69b6059 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -54,6 +54,14 @@ RecentDocsView::RecentDocsView( Window* pParent )
SetStyle(GetStyle() | WB_VSCROLL);
setItemMaxTextLength( mnItemMaxTextLength );
setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight,
mnItemPadding );
+
+// Set prefered width so text lines will not be cut off
+Font aOldFont(GetFont());
+Font aNewFont(aOldFont);
+aNewFont.SetHeight(20);
+SetFont(aNewFont);
+
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+SetFont(aOldFont);
}
extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRecentDocsView(Window
*pParent, VclBuilder::stringmap )
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index fa5cfa8..cadf4c3 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -448,6 +448,20 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference css::f
if( pBack )
pBack-setOwningFrame( m_xFrame );
+// Set a minimum size for Start Center
+if( pParent pBack )
+{
+long nMenuHeight = 0;
+Window* pMenu = pParent-GetWindow(WINDOW_NEXT);
+if( pMenu )
+nMenuHeight = pMenu-GetSizePixel().Height();
+
+pParent-SetMinOutputSizePixel(
+Size(
+pBack-get_width_request(),
+pBack-get_height_request() + nMenuHeight));
+}
+
/* } SAFE */
}
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 988a4a3..bf128f0 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -265,6 +265,9 @@ void BackingWindow::initControls()
mpThinBox2-SetBackground(aButtonsText);
Resize();
+
+set_width_request(mpAllRecentThumbnails-get_width_request() +
mpAllButtonsBox-GetOptimalSize().Width());
+set_height_request(mpAllButtonsBox-GetOptimalSize().Height());
}
void BackingWindow::setupButton( PushButton* pButton )
@@ -555,5 +558,4 @@ void BackingWindow::clearRecentFileList()
{
mpAllRecentThumbnails-Clear();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab:*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 19 21:56:40 2014 +0100
Resolves: fdo#73771 Non-standard behaviour for Function Mid
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2
Reviewed-on: https://gerrit.libreoffice.org/7539
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 36d7c3c..efa3ea9 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1302,7 +1302,8 @@ RTLFUNC(Mid)
{
nLen = aArgStr.getLength() - nStartPos;
}
-aResultStr = aArgStr.copy( nStartPos, nLen );
+if (nLen 0)
+aResultStr = aArgStr.copy( nStartPos, nLen );
}
rPar.Get(0)-PutString( aResultStr );
}
___
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' - basic/source
basic/source/runtime/methods.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7713dfc9b50b88cf2548d49e65b099a6a81e9d65
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 19 21:56:40 2014 +0100
Resolves: fdo#73771 Non-standard behaviour for Function Mid
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2
Reviewed-on: https://gerrit.libreoffice.org/7539
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5351606..ac4b9c4 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1302,7 +1302,8 @@ RTLFUNC(Mid)
{
nLen = aArgStr.getLength() - nStartPos;
}
-aResultStr = aArgStr.copy( nStartPos, nLen );
+if (nLen 0)
+aResultStr = aArgStr.copy( nStartPos, nLen );
}
rPar.Get(0)-PutString( aResultStr );
}
___
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-0' - sw/source
sw/source/core/text/txtfly.cxx|6 +++--- sw/source/core/txtnode/fntcap.cxx |4 ++-- sw/source/core/txtnode/swfont.cxx |8 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 98176bc2078d4ce18d4eb41b54b4ad1c72a2774d Author: Michael Stahl mst...@redhat.com Date: Tue Jan 21 11:16:20 2014 +0100 fdo#68959: sw: fix painting of tab fill characters in small caps text The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7567 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 1e66412..9f7d970 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) } Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() ); -const Point rOld = rInf.GetPos(); +const Point aOldPos(rInf.GetPos()); rInf.SetPos( aPos ); if( !bOpaque ) @@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawStretchText( rInf ); else rInf.GetFont()-_DrawText( rInf ); -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_False; } else if( !aRegion.empty() ) @@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf ) rInf.GetFont()-_DrawText( rInf ); } } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); return sal_True; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 0c31695..c435eda 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -523,9 +523,9 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo rInf ) if( rInf.GetLen() == STRING_LEN ) rInf.SetLen( rInf.GetText().getLength() ); -const Point rOldPos = rInf.GetPos(); +const Point aOldPos = rInf.GetPos(); const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); -rInf.SetPos( rOldPos ); +rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != UNDERLINE_NONE || GetOverline() != UNDERLINE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 2269f24..21c6601 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1195,12 +1195,12 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()-GetLanguage() ); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); @@ -1300,7 +1300,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo rInf, const sal_Bool bGrey ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) @@ -1325,13 +1325,13 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.ApplyAutoColor(); +const Point aOldPos(rInf.GetPos()); Point aPos( rInf.GetPos() ); if( GetEscapement() ) CalcEsc( rInf, aPos ); rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR ); -const Point rOld = rInf.GetPos(); rInf.SetPos( aPos ); if( IsCapital() ) @@ -1382,7 +1382,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo rInf ) rInf.SetLen( nOldLen ); } -rInf.SetPos( rOld ); +rInf.SetPos(aOldPos); } xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo rInf ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MABs and priority (was: minutes of ESC call ...)
Hi, On Fri, Jan 17, 2014 at 12:01:21PM +0100, Bjoern Michaelsen wrote: == short term == To keep the highest=MAB equivalence clean, some regular (weekly?) checking for bugs that are priority:highest and not a MAB would be needed. Such bugs could be seen as proposed MABs and either be: - promoted to a MAB with the usual procedure (rationale etc.) - or respectfully rejected and bumped to priority:high Someone volunteering for this task? If so, it would be interesting: - how many such bugs there are each week - what is their quality (as in: how many are good MABs? how many are well triaged?) So to ease this work, I created two stored queries: https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=mab-not-highest https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=highest-not-mab QA volunteers concerned with bug priorization are encouraged to check these and either move them in a consistent highest and MAB or a consistent not-highest and not-MAB state. Note that usual workflow is still in place, so if you mark something as a MAB you should provide a good rationale. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source slideshow/source solenv/bin sw/source writerfilter/source
sd/source/ui/slidesorter/view/SlsButtonBar.cxx |2 +-
slideshow/source/engine/animatedsprite.cxx |2 +-
slideshow/source/engine/shapes/viewshape.cxx |2 +-
slideshow/source/engine/shapesubset.cxx|2 +-
slideshow/source/engine/slide/slideanimations.cxx |2 +-
slideshow/source/inc/shapeattributelayer.hxx |2 +-
slideshow/source/inc/shapeattributelayerholder.hxx |2 +-
solenv/bin/patch_tool.pl |9 -
sw/source/core/inc/bookmrk.hxx |2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx|2 +-
10 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 821f66510a7851e6e6835e0f6c86dc443482caf0
Author: Andre Fischer a...@apache.org
Date: Tue Jan 21 14:21:45 2014 +
123531: Changed name of MSP to contain product name and source and target
version.
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index f7cc82d..7f2d4de 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -1549,7 +1549,14 @@ sub CreatePcp ($$%)
# Create filenames.
my $pcp_filename = File::Spec-catfile($msp_path, openoffice.pcp);
-my $msp_filename = File::Spec-catfile($msp_path, openoffice.msp);
+# Create basename to include product name and source and target version.
+# Hard code platform because that is the only platform supported at the
moment.
+my $msp_basename = sprintf(%s_%s-%s_Win_x86_patch_%s.msp,
+$context-{'product-name'},
+$source_msi-{'version'},
+$target_msi-{'version'},
+$context-{'language'});
+my $msp_filename = File::Spec-catfile($msp_path, $msp_basename);
# Setup msp path and filename.
unlink($pcp_filename) if -f $pcp_filename;
commit 1ceda390389a3e7bf4b7bb72b533a355a0fa060d
Author: Herbert Dürr h...@apache.org
Date: Tue Jan 21 14:09:37 2014 +
#i123817# boost::shared_ptr doesn't have an implicit conversion to bool
Constructs that expect it fail at least in XCode4's clang in C++11 mode.
An implicit conversion from pointer to bool is already suspicious enough
and a shared_ptr-pointer-bool conversion is even worse. Cleaning up
the code fixes the build breaker seen in boost/libc++/clang environments.
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index ff088bf..003e3b6 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -469,7 +469,7 @@ void ButtonBar::Paint (
bool ButtonBar::IsMouseOverButton (void) const
{
-return mpButtonUnderMouse;
+return (mpButtonUnderMouse.get() != NULL);
}
diff --git a/slideshow/source/engine/animatedsprite.cxx
b/slideshow/source/engine/animatedsprite.cxx
index 22b2cc1..0b6e612 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -157,7 +157,7 @@ namespace slideshow
}
}
-return mpSprite;
+return (mpSprite.get() != NULL);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize
rPixelOffset )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx
b/slideshow/source/engine/shapes/viewshape.cxx
index 46f0f2e..0265acb 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -184,7 +184,7 @@ namespace slideshow
}
}
-return io_rCacheEntry.mpRenderer;
+return (io_rCacheEntry.mpRenderer.get() != NULL);
}
bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr
rDestinationCanvas,
diff --git a/slideshow/source/engine/shapesubset.cxx
b/slideshow/source/engine/shapesubset.cxx
index 77e76a4..f6783a8 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -110,7 +110,7 @@ namespace slideshow
maTreeNode );
}
-return mpSubsetShape;
+return (mpSubsetShape.get() != NULL);
}
void ShapeSubset::disableSubsetShape()
diff --git a/slideshow/source/engine/slide/slideanimations.cxx
b/slideshow/source/engine/slide/slideanimations.cxx
index 55db7e5..16e16a0 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -80,7 +80,7 @@ namespace slideshow
SHOW_NODE_TREE( mpRootNode );
-return mpRootNode;
+return (mpRootNode.get() != NULL);
}
bool SlideAnimations::isAnimated() const
diff --git a/slideshow/source/inc/shapeattributelayer.hxx
b/slideshow/source/inc/shapeattributelayer.hxx
index ede31f9..a41ab35 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -471,7 +471,7 @@ namespace slideshow
//
Re: A stack trace for BZ bug 73464 - 4.2.0.2 RC2 QA Blocker -- crash when IA2 bridge is active and ENTER key is pressed
With the pending 4.2.0 RC3 spin, I can't say I'm comfortable with current state of resolving fdo#73464 https://bugs.freedesktop.org/show_bug.cgi?id=73464 . Hey, I'd even be happy if someone else can report reproducing the crash on the 4.2.0.2 RC2 build, ;-) I've posted up a set of the DrMemory logs for the IAccessible2 related crasher, or can continue with WinDbg based logging. Have not tested on a 32-bit Windows, but could do that if requested. Can say with reasonable certainty that the 4.2.0.2 RC2 release build configuration was trouble, but all TB 42 builds since have been free of the issue. Conceivable that it was related to fdo#72397 https://bugs.freedesktop.org/show_bug.cgi?id=72397 but would hate to run another release build and have this problem still there. Stuart -- View this message in context: http://nabble.documentfoundation.org/A-stack-trace-for-BZ-bug-73464-4-2-0-2-RC2-QA-Blocker-crash-when-IA2-bridge-is-active-and-ENTER-key-d-tp4091751p4093314.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
[Libreoffice-commits] core.git: tools/source
tools/source/generic/poly.cxx | 51 -
tools/source/generic/poly2.cxx | 42 -
tools/source/stream/stream.cxx |6
3 files changed, 99 deletions(-)
New commits:
commit de2d5d9abb7f625269cd4ee54c983c6dfde33767
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sun Jan 19 15:49:55 2014 +0100
TOOLS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: Id75ca6991af0bf75e979c7bc2da452f323f389ea
Reviewed-on: https://gerrit.libreoffice.org/7531
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 2e55994..43b19e6 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -41,8 +41,6 @@
#include limits.h
#include cmath
-DBG_NAME( Polygon )
-
#define EDGE_LEFT 1
#define EDGE_TOP2
#define EDGE_RIGHT 4
@@ -300,13 +298,11 @@ inline double ImplGetParameter( const Point rCenter,
const Point rPt, double f
Polygon::Polygon()
{
-DBG_CTOR( Polygon, NULL );
mpImplPolygon = (ImplPolygon*)(aStaticImplPolygon);
}
Polygon::Polygon( sal_uInt16 nSize )
{
-DBG_CTOR( Polygon, NULL );
if ( nSize )
mpImplPolygon = new ImplPolygon( nSize );
@@ -316,7 +312,6 @@ Polygon::Polygon( sal_uInt16 nSize )
Polygon::Polygon( sal_uInt16 nPoints, const Point* pPtAry, const sal_uInt8*
pFlagAry )
{
-DBG_CTOR( Polygon, NULL );
if( nPoints )
mpImplPolygon = new ImplPolygon( nPoints, pPtAry, pFlagAry );
@@ -326,8 +321,6 @@ Polygon::Polygon( sal_uInt16 nPoints, const Point* pPtAry,
const sal_uInt8* pFla
Polygon::Polygon( const Polygon rPoly )
{
-DBG_CTOR( Polygon, NULL );
-DBG_CHKOBJ( rPoly, Polygon, NULL );
DBG_ASSERT( rPoly.mpImplPolygon-mnRefCount 0xFFFE, Polygon:
RefCount overflow );
mpImplPolygon = rPoly.mpImplPolygon;
@@ -337,7 +330,6 @@ Polygon::Polygon( const Polygon rPoly )
Polygon::Polygon( const Rectangle rRect )
{
-DBG_CTOR( Polygon, NULL );
if ( rRect.IsEmpty() )
mpImplPolygon = (ImplPolygon*)(aStaticImplPolygon);
@@ -354,8 +346,6 @@ Polygon::Polygon( const Rectangle rRect )
Polygon::Polygon( const Rectangle rRect, sal_uIntPtr nHorzRound, sal_uIntPtr
nVertRound )
{
-DBG_CTOR( Polygon, NULL );
-
if ( rRect.IsEmpty() )
mpImplPolygon = (ImplPolygon*)(aStaticImplPolygon);
else
@@ -409,8 +399,6 @@ Polygon::Polygon( const Rectangle rRect, sal_uIntPtr
nHorzRound, sal_uIntPtr nV
Polygon::Polygon( const Point rCenter, long nRadX, long nRadY, sal_uInt16
nPoints )
{
-DBG_CTOR( Polygon, NULL );
-
if( nRadX nRadY )
{
// Compute default (depends on size)
@@ -461,8 +449,6 @@ Polygon::Polygon( const Point rCenter, long nRadX, long
nRadY, sal_uInt16 nPoin
Polygon::Polygon( const Rectangle rBound, const Point rStart, const Point
rEnd,
PolyStyle eStyle, bool bFullCircle )
{
-DBG_CTOR( Polygon, NULL );
-
const long nWidth = rBound.GetWidth();
const long nHeight = rBound.GetHeight();
@@ -539,8 +525,6 @@ Polygon::Polygon( const Point rBezPt1, const Point
rCtrlPt1,
const Point rBezPt2, const Point rCtrlPt2,
sal_uInt16 nPoints )
{
-DBG_CTOR( Polygon, NULL );
-
nPoints = ( 0 == nPoints ) ? 25 : ( ( nPoints 2 ) ? 2 : nPoints );
const doublefInc = 1.0 / ( nPoints - 1 );
@@ -572,7 +556,6 @@ Polygon::Polygon( const Point rBezPt1, const Point
rCtrlPt1,
Polygon::~Polygon()
{
-DBG_DTOR( Polygon, NULL );
// Remove if refcount == 0, otherwise decrement refcount
if ( mpImplPolygon-mnRefCount )
@@ -586,19 +569,16 @@ Polygon::~Polygon()
const Point* Polygon::GetConstPointAry() const
{
-DBG_CHKTHIS( Polygon, NULL );
return (Point*)mpImplPolygon-mpPointAry;
}
const sal_uInt8* Polygon::GetConstFlagAry() const
{
-DBG_CHKTHIS( Polygon, NULL );
return mpImplPolygon-mpFlagAry;
}
void Polygon::SetPoint( const Point rPt, sal_uInt16 nPos )
{
-DBG_CHKTHIS( Polygon, NULL );
DBG_ASSERT( nPos mpImplPolygon-mnPoints,
Polygon::SetPoint(): nPos = nPoints );
@@ -608,7 +588,6 @@ void Polygon::SetPoint( const Point rPt, sal_uInt16 nPos )
void Polygon::SetFlags( sal_uInt16 nPos, PolyFlags eFlags )
{
-DBG_CHKTHIS( Polygon, NULL );
DBG_ASSERT( nPos mpImplPolygon-mnPoints,
Polygon::SetFlags(): nPos = nPoints );
@@ -624,7 +603,6 @@ void Polygon::SetFlags( sal_uInt16 nPos, PolyFlags eFlags )
const Point Polygon::GetPoint( sal_uInt16 nPos ) const
{
-DBG_CHKTHIS( Polygon, NULL );
DBG_ASSERT( nPos mpImplPolygon-mnPoints,
Polygon::GetPoint(): nPos = nPoints );
@@ -633,7 +611,6 @@ const Point Polygon::GetPoint( sal_uInt16 nPos )
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 82/1f66510a7851e6e6835e0f6c86dc443482caf0
82/1f66510a7851e6e6835e0f6c86dc443482caf0 |1 + 1 file changed, 1 insertion(+) New commits: commit c3a6ff4164767bc857878d58da87e211d2ecfd68 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 16:11:51 2014 + Notes added by 'git notes add' diff --git a/82/1f66510a7851e6e6835e0f6c86dc443482caf0 b/82/1f66510a7851e6e6835e0f6c86dc443482caf0 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/82/1f66510a7851e6e6835e0f6c86dc443482caf0 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basic/source
basic/source/runtime/methods.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b703da40bb052809ff94a714fb8da7aadf2d7d6b
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 19 21:56:40 2014 +0100
Resolves: fdo#73771 Non-standard behaviour for Function Mid
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2
Reviewed-on: https://gerrit.libreoffice.org/7539
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 200b7b7..31825c8 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1308,7 +1308,8 @@ RTLFUNC(Mid)
{
nLen = aArgStr.getLength() - nStartPos;
}
-aResultStr = aArgStr.copy( nStartPos, nLen );
+if (nLen 0)
+aResultStr = aArgStr.copy( nStartPos, nLen );
}
rPar.Get(0)-PutString( aResultStr );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/eda390389a3e7bf4b7bb72b533a355a0fa060d
1c/eda390389a3e7bf4b7bb72b533a355a0fa060d |1 + 1 file changed, 1 insertion(+) New commits: commit 6f27dc99bbb11d4a9348c5781ece52e231e3835d Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 21 16:13:37 2014 + Notes added by 'git notes add' diff --git a/1c/eda390389a3e7bf4b7bb72b533a355a0fa060d b/1c/eda390389a3e7bf4b7bb72b533a355a0fa060d new file mode 100644 index 000..aac2217 --- /dev/null +++ b/1c/eda390389a3e7bf4b7bb72b533a355a0fa060d @@ -0,0 +1 @@ +prefer: d4bab97023e3569571a92551040574b20aceca7c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/tango officecfg/registry
icon-themes/tango/cmd/sc_colorscaleformatdialog.png |binary icon-themes/tango/cmd/sc_colorscaleformatdialog.svg | 125 ++ icon-themes/tango/cmd/sc_conddateformatdialog.png |binary icon-themes/tango/cmd/sc_conditionalformatdialog.png |binary icon-themes/tango/cmd/sc_conditionalformatmenu-conditionalformatdialog-conddateformatdialog.svg | 122 ++ icon-themes/tango/cmd/sc_conditionalformatmenu.png |binary icon-themes/tango/cmd/sc_databarformatdialog.png |binary icon-themes/tango/cmd/sc_databarformatdialog.svg | 158 icon-themes/tango/cmd/sc_iconsetformatdialog.png |binary icon-themes/tango/cmd/sc_iconsetformatdialog.svg | 185 ++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 18 11 files changed, 608 insertions(+) New commits: commit f44116909d356fdc9c9ec8658be6cc465cb46686 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Wed Jan 1 18:59:42 2014 +0100 Added icons for conditional formatting Change-Id: If2dd67ad08d93e020e0e68043f9270d387bd41d3 Reviewed-on: https://gerrit.libreoffice.org/7246 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/tango/cmd/sc_colorscaleformatdialog.png b/icon-themes/tango/cmd/sc_colorscaleformatdialog.png new file mode 100644 index 000..07554ba Binary files /dev/null and b/icon-themes/tango/cmd/sc_colorscaleformatdialog.png differ diff --git a/icon-themes/tango/cmd/sc_colorscaleformatdialog.svg b/icon-themes/tango/cmd/sc_colorscaleformatdialog.svg new file mode 100644 index 000..0a9e53c --- /dev/null +++ b/icon-themes/tango/cmd/sc_colorscaleformatdialog.svg @@ -0,0 +1,125 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + id=svg2 + version=1.1 + inkscape:version=0.48.4 r9939 + width=16 + height=16 + sodipodi:docname=sc_conditionalformatdialog.svg + inkscape:export-filename=/home/alexander/sc_conditionalformatdialog.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + metadata + id=metadata8 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + defs + id=defs6 / + sodipodi:namedview + pagecolor=#ff + bordercolor=#66 + borderopacity=1 + objecttolerance=10 + gridtolerance=10 + guidetolerance=10 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:window-width=1920 + inkscape:window-height=918 + id=namedview4 + showgrid=true + inkscape:zoom=45.254834 + inkscape:cx=8.1355932 + inkscape:cy=8 + inkscape:window-x=0 + inkscape:window-y=27 + inkscape:window-maximized=1 + inkscape:current-layer=svg2 +inkscape:grid + type=xygrid + id=grid3010 + empspacing=5 + visible=true + enabled=true + snapvisiblegridlinesonly=true / + /sodipodi:namedview + g + id=g3825 + transform=translate(-349.98874,-512.34897) +rect + ry=1 + rx=1 + y=512.36218 + x=350 + height=15 + width=16 + id=rect3805 + style=fill:#99;fill-opacity:1;stroke:none / +rect + y=513.36218 + x=351 + height=13 + width=14 + id=rect3807 + style=fill:#ff;fill-opacity:1;stroke:none / +rect + y=514.36218 + x=352 + height=3 + width=12 + id=rect3809 + style=fill:#fab132;fill-opacity:1;stroke:none / +rect + style=fill:#ee3e3e;fill-opacity:1;stroke:none + id=rect3811 + width=12 + height=3.0625 + x=352 + y=518.36218 / +rect + y=522.36218 + x=352 + height=3 + width=12 + id=rect3813 + style=fill:#95e24a;fill-opacity:1;stroke:none / +rect + y=523.36218 + x=353 + height=1 + width=10 + id=rect3819 + style=opacity:0.3;fill:#ff;fill-opacity:1;stroke:none / +rect + y=519.36218 +
Re: New Developer
On Tue, Jan 21, 2014 at 06:53:06PM +0530, Manohar Kh khmanoh...@gmail.com wrote: Yes , but still it is the same problem . Ah yes, I see; gerrit redirects http to https. Could you try http://anongit.freedesktop.org/git/libreoffice/core? (But fixing your local certificate store is a good idea anyway.) signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - vcl/source
vcl/source/filter/wmf/winmtf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 22818d9fb7551d8f2a7d9389d28dd96b794a1e89
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Jan 19 19:13:57 2014 +0100
fdo#73764 partially revert 3998d1abb291
Change-Id: Ie9b6d6a318fad256f3f0999fe9c0810a4323f10d
Reviewed-on: https://gerrit.libreoffice.org/7537
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ade704ea4ac7317f2ad300c8321c64ba54d0e692)
Reviewed-on: https://gerrit.libreoffice.org/7575
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Jan Holesovsky ke...@collabora.com
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 160416b..38e79a8 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -317,7 +317,7 @@ Point WinMtfOutput::ImplScale( const Point rPt) // Hack to
set varying defaults
{
if (mbIsMapDevSet mbIsMapWinSet)
{
-return
Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+return rPt; //fdo#73764
}
else
{
___
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-0' - basic/source
basic/source/runtime/methods.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit de19819871a5ce1faabb9dced0e40df97d18e168
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 19 21:56:40 2014 +0100
Resolves: fdo#73771 Non-standard behaviour for Function Mid
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2
Reviewed-on: https://gerrit.libreoffice.org/7539
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd)
(cherry picked from commit 7713dfc9b50b88cf2548d49e65b099a6a81e9d65)
Reviewed-on: https://gerrit.libreoffice.org/7577
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Jan Holesovsky ke...@collabora.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5351606..ac4b9c4 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1302,7 +1302,8 @@ RTLFUNC(Mid)
{
nLen = aArgStr.getLength() - nStartPos;
}
-aResultStr = aArgStr.copy( nStartPos, nLen );
+if (nLen 0)
+aResultStr = aArgStr.copy( nStartPos, nLen );
}
rPar.Get(0)-PutString( aResultStr );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-l10n] space between values and units in spinners, fdo#71688
On Tue, Jan 21, 2014 at 5:59 AM, Caolán McNamara caol...@redhat.com wrote: [...] c) If you agree with icu's % formatting for your language then update the translations for X% to be consistent with that formatting. Otherwise we can fix icu or make a blacklist of languages which should be excluded from the default icu percent formatting. Caolán, how can we submit a fix for ICU? For instance, Spanish formatting should be exactly the same as German, i.e. “#,##0 %”. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: Get bundled openssl to be used on OS X too, at least on OS X 10.7
On 01/20/2014 04:05 PM, Douglas Mencken wrote: commit 8ae8d5165c29cb899e6a8a57d1021a844ac30b30 Author: Douglas Mencken dougmenc...@gmail.com Date: Mon Dec 30 10:55:47 2013 -0500 Get bundled openssl to be used on OS X too, at least on OS X 10.7 So looking at the context of the below configure.ac change, MAC_OS_X_VERSION_MIN_REQUIRED = 1070 (thus incl. the official Mac OS X 64-bit builds, for a baseline of OS X 10.8) already used LO's own bundled openssl, while other builds for Mac OS X (thus incl. the official Mac OS X 32-bit builds, for a baseline of OS X 10.6) used to use the OS X openssl. What is the rationale for switching the latter to use LO's own bundled openssl instead? Also note that OpenSSL is incompatible with -fvisibility=hidden on OS X Why? What exactly did not work? (For my local --enable-64-bit build I see that e.g. libpostgresql-sdbc-impllo.dylib now exports lots of _SSL_* symbols that it used to not export, which seemingly used to work fine.) Change-Id: I1fc3cf4d515ef210f996cb04ba9c1b3216109137 Reviewed-on: https://gerrit.libreoffice.org/7233 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 9e5f7de..eb024d7 100644 --- a/configure.ac +++ b/configure.ac @@ -9375,19 +9375,11 @@ if test $enable_openssl = yes; then # # http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion # http://stackoverflow.com/questions/7475914/libcrypto-deprecated-on-mac-os-x-10-7-lion -# -# They apparently got fed up with the unstable ABI of -# OpenSSL, or something, and recommend you either move to -# their Common Crypto Architecture, or, if you have to stay -# with OpenSSL, just build it yourself statically and bundle -# with your application. with_system_openssl=no libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) -elif test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \ -$_os = DragonFly test $with_system_openssl != no; then -# Mac OS builds should get out without extra stuff is the Mac porters' -# wish. And pkg-config is although Xcode ships a .pc for openssl +elif test $_os = NetBSD -o $_os = OpenBSD -o $_os = DragonFly \ + test $with_system_openssl != no; then with_system_openssl=yes SYSTEM_OPENSSL=YES OPENSSL_CFLAGS= diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 919e354..d04c186 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(MAKE) build_libs \ - CC=$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\ + CC=$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden)) \ ) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New Developer
This is working . Thanks for the help . On Tue, Jan 21, 2014 at 10:19 PM, Miklos Vajna vmik...@collabora.co.ukwrote: On Tue, Jan 21, 2014 at 06:53:06PM +0530, Manohar Kh khmanoh...@gmail.com wrote: Yes , but still it is the same problem . Ah yes, I see; gerrit redirects http to https. Could you try http://anongit.freedesktop.org/git/libreoffice/core? (But fixing your local certificate store is a good idea anyway.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - basegfx/inc extras/source framework/inc sw/source ucb/source uui/source
basegfx/inc/basegfx/tools/b2dclipstate.hxx |2
extras/source/autotext/lang/en-US/acor_en-US.dat |binary
framework/inc/uielement/genericstatusbarcontroller.hxx |2
sw/source/core/access/accpara.hxx |2
ucb/source/ucp/webdav/SerfSession.cxx | 44 +++--
ucb/source/ucp/webdav/SerfTypes.hxx|2
ucb/source/ucp/webdav/SerfUri.hxx |2
uui/source/iahndl-ssl.cxx |5 +
8 files changed, 48 insertions(+), 11 deletions(-)
New commits:
commit 17e2f9c3d2eb0d3b7f559055327d37171db01c2f
Author: Tsutomu Uchino ha...@apache.org
Date: Tue Jan 21 16:36:08 2014 +
#i124067# remove naive entry from auto correct list for en-US
diff --git a/extras/source/autotext/lang/en-US/acor_en-US.dat
b/extras/source/autotext/lang/en-US/acor_en-US.dat
index d4e9a3d..681f362 100644
Binary files a/extras/source/autotext/lang/en-US/acor_en-US.dat and
b/extras/source/autotext/lang/en-US/acor_en-US.dat differ
commit 226085ad2004319c5142b392bb4b48ab79c3b747
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jan 21 16:32:58 2014 +
123744: method SerfSession::verifySerfCertificateChain(..) - consider
certificate's Subject Alternative Name field when searching for matching
certificate host name
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index dc08678..a5354eb 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -30,7 +30,7 @@
#include ucbhelper/simplecertificatevalidationrequest.hxx
#include AprEnv.hxx
-#include apr_strings.h
+#include apr/apr_strings.h
#include DAVAuthListener.hxx
#include SerfTypes.hxx
@@ -47,6 +47,10 @@
#include com/sun/star/security/CertificateContainerStatus.hpp
#include com/sun/star/security/CertificateContainer.hpp
#include com/sun/star/security/XCertificateContainer.hpp
+#include com/sun/star/security/CertAltNameEntry.hpp
+#include com/sun/star/security/XSanExtension.hpp
+#define OID_SUBJECT_ALTERNATIVE_NAME 2.5.29.17
+
#include com/sun/star/ucb/Lock.hpp
#include com/sun/star/xml/crypto/XSEInitializer.hpp
@@ -479,7 +483,40 @@ apr_status_t SerfSession::verifySerfCertificateChain (
// When the certificate matches the host name then we can use the
// result of the verification.
-if (isDomainMatch(sServerCertificateSubject))
+bool bHostnameMatchesCertHostnames = false;
+{
+uno::Sequence uno::Reference security::XCertificateExtension
extensions = xServerCertificate-getExtensions();
+uno::Sequence security::CertAltNameEntry altNames;
+for (sal_Int32 i = 0 ; i extensions.getLength(); ++i)
+{
+uno::Reference security::XCertificateExtension element =
extensions[i];
+
+const rtl::OString aId ( (const sal_Char
*)element-getExtensionId().getArray(), element-getExtensionId().getLength());
+if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
+{
+uno::Reference security::XSanExtension sanExtension (
element, uno::UNO_QUERY );
+altNames = sanExtension-getAlternativeNames();
+break;
+}
+}
+
+uno::Sequence ::rtl::OUString certHostNames(altNames.getLength() +
1);
+certHostNames[0] = sServerCertificateSubject;
+for( int n = 0; n altNames.getLength(); ++n )
+{
+if (altNames[n].Type == security::ExtAltNameType_DNS_NAME)
+{
+altNames[n].Value = certHostNames[n+1];
+}
+}
+
+for ( int i = 0; i certHostNames.getLength()
!bHostnameMatchesCertHostnames; ++i )
+{
+bHostnameMatchesCertHostnames = isDomainMatch( certHostNames[i] );
+}
+
+}
+if ( bHostnameMatchesCertHostnames )
{
if (nVerificationResult == 0)
@@ -526,8 +563,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
if ( xSelection.is() )
{
-uno::Reference task::XInteractionApprove xApprove(
-xSelection.get(), uno::UNO_QUERY );
+uno::Reference task::XInteractionApprove xApprove(
xSelection.get(), uno::UNO_QUERY );
if ( xApprove.is() )
{
xCertificateContainer-addCertificate( getHostName(),
sServerCertificateSubject, sal_True );
diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx
b/ucb/source/ucp/webdav/SerfTypes.hxx
index d525d6b..23d8bee 100644
--- a/ucb/source/ucp/webdav/SerfTypes.hxx
+++ b/ucb/source/ucp/webdav/SerfTypes.hxx
@@ -24,7 +24,7 @@
#ifndef INCLUDED_SERFTYPES_HXX
#define INCLUDED_SERFTYPES_HXX
-#include serf.h
+#include serf/serf.h
typedef serf_connection_t SerfConnection;
diff --git a/ucb/source/ucp/webdav/SerfUri.hxx
b/ucb/source/ucp/webdav/SerfUri.hxx
index d6844a1..8bd45de 100644
---
Error doing make kdevelop-ide-integration in Windows + Cygwin.
Hello all! I'm developing a integration with MSVS, like the one with KDevelop and XCode. But, when I try to run a make kdevelop-ide-integration to use the project files as example and to point some infos, I got this error: Makefile:29: *** target pattern contains no '%'. Stop. Anyone knows what this mean and what I need to do to solve this error? Thanks for help since now! Anderson Roberto de Oliveira Skype: andersonn_roberto LinkedIn: http://br.linkedin.com/in/andersonroberto/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73618, which changed state. Bug 73618 Summary: Presenter console: Don't see the active slide after launch https://bugs.freedesktop.org/show_bug.cgi?id=73618 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - ucb/source vcl/source
ucb/source/ucp/webdav/webdavcontent.cxx |2 +-
vcl/source/filter/wmf/winmtf.cxx|5 -
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3780738154b8c3b3f9d85c64cccf621d97574886
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 21 20:14:46 2014 +0100
ucb: fix inverted condition in webdav lcl_sendPartialGETRequest
(regression from a3f32769fc4bb23c64168b412dd10ec769a3854d)
Change-Id: Ic72b0e874ebf19e25e43af1f8750c63c04ed8a8e
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index aea2a5a..1fce24b 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -163,7 +163,7 @@ static void lcl_sendPartialGETRequest( bool bError,
for ( std::vector DAVPropertyValue ::iterator it =
aResponseProps.begin();
it != aResponseProps.end(); ++it )
{
-if ( it-Name != Content-Length )
+if (it-Name == Content-Length)
{
it-Value = aSize;
break;
commit 54a370753cd1affd8c47cf171ef4a0f3bc76ba90
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 21 16:34:41 2014 +0100
vcl: stylistic cleanup
Change-Id: Iaab13bd37b85128c9cf83b114a155f198b628587
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 20bbbfa..df47935 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -518,7 +518,10 @@ Polygon WinMtfOutput::ImplScale( Polygon rPolygon )
PolyPolygon WinMtfOutput::ImplScale( PolyPolygon rPolyPolygon )
{
sal_uInt16 nPolys = rPolyPolygon.Count();
-for ( sal_uInt16 i = 0; i nPolys; ImplScale( rPolyPolygon[ i++ ] ) ) ;
+for (sal_uInt16 i = 0; i nPolys; ++i)
+{
+ImplScale(rPolyPolygon[i]);
+}
return rPolyPolygon;
}
___
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' - ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bd121d45f847ff353e3796510fac3181b88a87b1
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 21 20:14:46 2014 +0100
ucb: fix inverted condition in webdav lcl_sendPartialGETRequest
(regression from a3f32769fc4bb23c64168b412dd10ec769a3854d)
Change-Id: Ic72b0e874ebf19e25e43af1f8750c63c04ed8a8e
(cherry picked from commit 3780738154b8c3b3f9d85c64cccf621d97574886)
Reviewed-on: https://gerrit.libreoffice.org/7581
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 9bd49f3..d98c39b 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -163,7 +163,7 @@ static void lcl_sendPartialGETRequest( bool bError,
for ( std::vector DAVPropertyValue ::iterator it =
aResponseProps.begin();
it != aResponseProps.end(); ++it )
{
-if ( it-Name != Content-Length )
+if (it-Name == Content-Length)
{
it-Value = aSize;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error doing make kdevelop-ide-integration in Windows + Cygwin.
On 21/01/14 19:51, Anderson Roberto wrote: Hello all! I'm developing a integration with MSVS, like the one with KDevelop and XCode. But, when I try to run a make kdevelop-ide-integration to use the project files as example and to point some infos, I got this error: Makefile:29: *** target pattern contains no '%'. Stop. Anyone knows what this mean and what I need to do to solve this error? most likely it means make does not understand Win32 file names with drive letters. try /opt/lo/bin/make instead, if you don't have that read: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_make_an_optional_ccache_binaries ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] space between values and units in spinners, fdo#71688
Hi, for Slovenian I already asked to include space in front of % and it was done. I also changed all translated strings accordingly. It was done for 4.2 or even before, can't remember. Hopefully those settings for Slovenian were inherited by 4.3. Lp, m. 2014/1/21 Caolán McNamara caol...@redhat.com For 4.3 we are now, in the normal case, putting space between values and units in spinners. e.g. now 10 mm instead of 10mm. (http://en.wikipedia.org/wiki/ISO_31-0) For the degree symbol we are not putting space between value and unit, i.e. it remains 10° I think those are hopefully uncontroversial. The tricky case is the % symbol, because, while ISO-31-0 implies that 10 % is the preferred scientific format, English style guides prefer 10% and 10 % looks just plain wrong. It's a locale-dependent formatting rule (http://en.wikipedia.org/wiki/Percent_sign) So to resolve this we now have a function formatPercent which takes the number and the locale and runs it through icu's PercentInstance to format it according to that locale's formatting rule. Which gives e.g. 10 % for de and 10% for en. (http://site.icu-project.org/) What this means is that: a) In the English strings in .src files the source text should not have a space between number and %. I think these are all fixed now. b) You should check that the icu percent formatting rule is considered correct for your language in the context of a office suite UI e.g. in the spinner of view-zoom-zoom-variable c) If you agree with icu's % formatting for your language then update the translations for X% to be consistent with that formatting. Otherwise we can fix icu or make a blacklist of languages which should be excluded from the default icu percent formatting. C. -- To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/l10n/ All messages sent to this list will be publicly archived and cannot be deleted ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 66822] refactor HTML export of image bullet list
https://bugs.freedesktop.org/show_bug.cgi?id=66822 Tejas Nikumbh tejasniku...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |tejasniku...@gmail.com |desktop.org | --- Comment #2 from Tejas Nikumbh tejasniku...@gmail.com --- Created attachment 92542 -- https://bugs.freedesktop.org/attachment.cgi?id=92542action=edit This is a patch for the current bug. #66822 submitted by Tejas Nikumbh This is one of my first patches for an easy programming hack enlisted on the LibreOffice Gsoc page. My name is Tejas Nikumbh and I'm a senior undergrad at IIT Bombay. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63962] Remove LibreOffice icon themes hardcoding
https://bugs.freedesktop.org/show_bug.cgi?id=63962 --- Comment #10 from Tobias Lippert d...@fastmail.fm --- Hello Michael, In the first version, I will derive the name from the file name of the archive that contains the icons, i.e. images_crystal.zip -- crystal icon theme. I think that this is a sensible approach and should suffice for now. The implementation takes much longer than I anticipated because I have long feedback cycles. The involved headers are included everywhere, and almost everything is recompiled if I change something. But I have finished the implementation and am currently working on tests, i.e. I expect to be finished in 2-3 weeks. Tobias -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error doing make kdevelop-ide-integration in Windows + Cygwin.
Thanks for the fast reply Michael! You're right, I didn't pay attention to this. But after run: /opt/lo/bin/make kdevelop-ide-integration I got this error: To build, issue: /opt/lo/bin/make For details, run: /opt/lo/bin/make help * * WARNING : If a build created with VS 2012 should run on Windows XP, * WARNING : use --with-windows-sdk=7.1A (requires VS 2012 Update 1 or newer) cd G:/sources/libo-core (make cmd=make -npf Makefile.gbuild all cmd || true) | G:/sources/libo-core/bin/gbuild-to-ide --ide kdevelop Makefile:29: *** target pattern contains no '%'. Stop. The complete run output can be viewed here http://pastebin.com/2KUPWuD1. Anderson Roberto de Oliveira Skype: andersonn_roberto LinkedIn: http://br.linkedin.com/in/andersonroberto/ On Tue, Jan 21, 2014 at 5:55 PM, Michael Stahl mst...@redhat.com wrote: On 21/01/14 19:51, Anderson Roberto wrote: Hello all! I'm developing a integration with MSVS, like the one with KDevelop and XCode. But, when I try to run a make kdevelop-ide-integration to use the project files as example and to point some infos, I got this error: Makefile:29: *** target pattern contains no '%'. Stop. Anyone knows what this mean and what I need to do to solve this error? most likely it means make does not understand Win32 file names with drive letters. try /opt/lo/bin/make instead, if you don't have that read: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_make_an_optional_ccache_binaries ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error doing make kdevelop-ide-integration in Windows + Cygwin.
On 21/01/14 22:24, Anderson Roberto wrote: Thanks for the fast reply Michael! You're right, I didn't pay attention to this. But after run: /opt/lo/bin/make kdevelop-ide-integration I got this error: To build, issue: /opt/lo/bin/make cd G:/sources/libo-core (make cmd=make -npf Makefile.gbuild all cmd || true) | G:/sources/libo-core/bin/gbuild-to-ide --ide kdevelop this should not run a plain make but /opt/lo/bin/make, not sure why that happens... ah i see, the developer who added that ide-integration stuff perhaps wasn't too familiar with our build system and forgot to use $(GNUMAKE) variable... fixed on master in commit e20439a1251de36efdd3dfe252b88f33cc94a0b7 (please pull and try again) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e20439a1251de36efdd3dfe252b88f33cc94a0b7 Author: Michael Stahl mst...@redhat.com Date: Tue Jan 21 22:31:15 2014 +0100 Makefile.in: hardcoded make - $(GNUMAKE) Change-Id: I2ec31816562e55f6f95cac38dab4a17a393c0f9a diff --git a/Makefile.in b/Makefile.in index 4ac5c46..ec45b51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -330,7 +330,7 @@ dump-deps-png: define gb_Top_GbuildToIdeIntegration $(1)-ide-integration: - cd $(SRCDIR) (make cmd=make -npf Makefile.gbuild all cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) + cd $(SRCDIR) ($(GNUMAKE) cmd=$(GNUMAKE) -npf Makefile.gbuild all cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
