Re: starmath, ObjectReplacements, export, word2003
On Wed, May 20, 2015 at 07:50:09AM +, Yury wrote: > (...) exporting a text with formulas (starmath equations) to > word2003 .DOC format. > Anyone using LO to prepare scientific papers, esp. in physics, > mathematics etc., would be inherently interested in such export > going right. Lots of publishers accept manuscripts in word2003 .DOC > format only (...). Quite incidentally to the main issue at point (which is get a good MathType export from LibreOffice Writer), I'm quite surprised by that statement. My experience, in the little corners of academia I used to interact with, was that "esp. in physics, mathematics etc" use of (La)TeX was ubiquitous, although I've met some older people that wrote their (PhD) thesis in troff. It is only in fields like biology that I've seen people belabour with Microsoft Word. Quite strongly, in the university where I did my first and second undergraduate degrees, the possibility to open a (remote / Cytrix / Terminal Server) Microsoft Windows session from the student labs' workstations was informally known as the biologists' work tool. Mathematics, physics, computer/ing science, geology, ... were all working on Unix and (La)TeX. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 82661, which changed state. Bug 82661 Summary: Paragraph background fills all space above paragraph https://bugs.documentfoundation.org/show_bug.cgi?id=82661 What|Removed |Added Status|VERIFIED|REOPENED 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: filter/source
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 13 -- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 0cd2895e70eb96083ea78b1350583fe791b4237a Author: Robert Antoni Buj Gelonch Date: Wed May 20 02:46:21 2015 +0200 tdf#90999: Import spreadsheetML cells with inline formatting tags Change-Id: I5a723d5ecc4a075be64ba9766e574d9a9df50eb1 Reviewed-on: https://gerrit.libreoffice.org/15821 Tested-by: Jenkins Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index fa09a05..f48a7a5 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -479,7 +479,7 @@ - http://www.w3.org/TR/REC-html40']]"/> + @@ -6920,13 +6920,12 @@ - - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"/> - - + + + - + @@ -7170,7 +7169,7 @@ - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"> + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: starmath, ObjectReplacements, export, word2003
Lionel Elie Mamane mamane.lu> writes: > On Wed, May 20, 2015 at 07:50:09AM +, Yury wrote: > > > (...) exporting a text with formulas (starmath equations) to > > word2003 .DOC format. > > > Anyone using LO to prepare scientific papers, esp. in physics, > > mathematics etc., would be inherently interested in such export > > going right. Lots of publishers accept manuscripts in word2003 .DOC > > format only (...). > > Quite incidentally to the main issue at point (which is get a good > MathType export from LibreOffice Writer), I'm quite surprised by that > statement. My experience, in the little corners of academia I used to ... This is getting really off topic, but I've used to think in the similar vein: we noble physicists (mathematicians, what have you) don't have to touch that word abomination. We do our precious work in pure and noble latex. Well, d'oh! In Russia, you'd be hard pressed to find a journal on physics accepting latex. But the West isn't much better on this account, mind you. The world changed, or it never was like this. We talk major journals, of course, not obscure universities' heralds. Anyway, good interoperability in mixed environment is a must. -Yury ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 90222] replace ScaList in scaddins with a std container
https://bugs.documentfoundation.org/show_bug.cgi?id=90222 David Tardon changed: What|Removed |Added Assignee|pieter...@gmail.com |libreoffice-b...@lists.free ||desktop.org -- 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] libcdr.git: src/lib
src/lib/CDRCollector.cpp|1 +
src/lib/CDRContentCollector.cpp |6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a6cf808851bfcca527011ec45e3b3f6ba4960e49
Author: Fridrich Å trba
Date: Thu May 21 10:39:24 2015 +0200
RVNGBinaryData is a valid type for RVNGPropertyList value
Change-Id: Icbc4c13c589dc21eac16bee83041444a6916e8d7
diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index ae5a744..a2f2edd 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -9,6 +9,7 @@
#include
#include
+#include
#include "CDRCollector.h"
#include "libcdr_utils.h"
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index af26ad7..06df33b 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -740,7 +740,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
fclose(f);
}
#endif
- propList.insert("draw:fill-image", image.getBase64Data());
+ propList.insert("draw:fill-image", image);
propList.insert("librevenge:mime-type", "image/bmp");
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
@@ -807,7 +807,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
{
propList.insert("librevenge:mime-type", "image/bmp");
propList.insert("draw:fill", "bitmap");
- propList.insert("draw:fill-image", iterBmp->second.getBase64Data());
+ propList.insert("draw:fill-image", iterBmp->second);
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
{
@@ -867,7 +867,7 @@ void
libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
{
propList.insert("draw:fill", "bitmap");
propList.insert("librevenge:mime-type", "image/svg+xml");
- propList.insert("draw:fill-image", iterVect->second.getBase64Data());
+ propList.insert("draw:fill-image", iterVect->second);
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source filter/source include/svx include/vcl oox/source sfx2/source svtools/source svx/source sw/source vcl/source
avmedia/source/macavf/framegrabber.mm |2
avmedia/source/quicktime/framegrabber.mm|2
filter/source/graphicfilter/eps/eps.cxx |4 -
filter/source/graphicfilter/ieps/ieps.cxx |8 +--
filter/source/msfilter/escherex.cxx |4 -
filter/source/svg/svgwriter.cxx |2
include/svx/galtheme.hxx|2
include/vcl/cvtgrf.hxx |4 -
include/vcl/salctype.hxx| 35 +---
oox/source/export/drawingml.cxx |4 -
sfx2/source/doc/graphhelp.cxx |6 +-
sfx2/source/doc/graphhelp.hxx |5 +-
sfx2/source/doc/sfxbasemodel.cxx|8 +--
svtools/source/misc/transfer.cxx|2
svx/source/gallery2/galtheme.cxx| 58 ++--
svx/source/xoutdev/_xoutbmp.cxx | 10 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx | 12 ++---
sw/source/filter/ww8/rtfsdrexport.cxx |2
vcl/source/filter/graphicfilter.cxx | 22 +-
vcl/source/gdi/cvtgrf.cxx |4 -
vcl/source/gdi/gfxlink.cxx | 26 ++--
vcl/source/gdi/impgraph.cxx | 12 ++---
vcl/source/gdi/pdfwriter_impl.cxx |2
23 files changed, 120 insertions(+), 116 deletions(-)
New commits:
commit 431598b97b47b13c8b241f587b5eea21bf134893
Author: Noel Grandin
Date: Wed May 20 13:00:06 2015 +0200
convert CVT constants to scoped enum
Change-Id: I7703816b6a1df2bf24c06cdf9992f9982ae724e8
Reviewed-on: https://gerrit.libreoffice.org/15826
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/avmedia/source/macavf/framegrabber.mm
b/avmedia/source/macavf/framegrabber.mm
index 4662720..cfdbbae 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -101,7 +101,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL
FrameGrabber::grabFrame( double fMe
// convert the image into the return-value type which is a
graphic::XGraphic
SvMemoryStream aMemStm( pBitmapBytes, nBitmapLen, StreamMode::READ |
StreamMode::WRITE );
Graphic aGraphic;
-if( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE
)
+if( GraphicConverter::Import( aMemStm, aGraphic, ConvertDataFormat::TIF )
== ERRCODE_NONE )
xRet = aGraphic.GetXGraphic();
// clean up resources
diff --git a/avmedia/source/quicktime/framegrabber.mm
b/avmedia/source/quicktime/framegrabber.mm
index a13d98a..401c17d 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -99,7 +99,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL
FrameGrabber::grabFrame( double fMe
const void* pBitmapData = [pBitmap bytes];
SvMemoryStream aMemStm( const_cast(pBitmapData), nSize,
StreamMode::READ | StreamMode::WRITE );
Graphic aGraphic;
-if ( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) ==
ERRCODE_NONE )
+if ( GraphicConverter::Import( aMemStm, aGraphic, ConvertDataFormat::TIF )
== ERRCODE_NONE )
{
xRet = aGraphic.GetXGraphic();
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 177fa35..1cc70b9 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -386,10 +386,10 @@ bool PSWriter::WritePS( const Graphic& rGraphic,
SvStream& rTargetStream, Filter
{
BitmapEx aTempBitmapEx( rGraphic.GetBitmapEx() );
aTempBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS );
-nErrCode = GraphicConverter::Export( rTargetStream, aTempBitmapEx,
CVT_TIF ) ;
+nErrCode = GraphicConverter::Export( rTargetStream, aTempBitmapEx,
ConvertDataFormat::TIF ) ;
}
else
-nErrCode = GraphicConverter::Export( rTargetStream, rGraphic,
CVT_TIF ) ;
+nErrCode = GraphicConverter::Export( rTargetStream, rGraphic,
ConvertDataFormat::TIF ) ;
if ( nErrCode == ERRCODE_NONE )
{
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 730dd80..0cf8b59 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -257,7 +257,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32
nBytesRead, Graphic &r
if (nCount == nBytesRead && bEMFSupported)
{
SvFileStream aFile(output, StreamMode::READ);
-if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE)
+if (GraphicConverter::Import(aFile, rGraphic, ConvertDataFormat::EMF)
== ERRCODE_NONE)
bRet = true;
}
@@ -324,7 +324,7 @@ static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf,
sal_uInt32 nBytesRea
aMemStm.Seek(0);
if (
aMemStm.GetEndOfData() &&
-GraphicConverter::I
[Libreoffice-commits] core.git: sw/source
sw/source/ui/frmdlg/wrap.cxx | 118 +-
sw/source/uibase/inc/wrap.hxx | 36 ++--
2 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 731169179209566f094d24abd1aa05da256ea7f7
Author: Miklos Vajna
Date: Thu May 21 11:39:53 2015 +0200
sw: prefix members of SwWrapTabPage
Change-Id: I58d59680768d445c073c50b49a8b6976d7a636a0
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 54ccf04..d9a0cbd 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -44,7 +44,7 @@
using namespace ::com::sun::star;
-const sal_uInt16 SwWrapTabPage::aWrapPageRg[] = {
+const sal_uInt16 SwWrapTabPage::m_aWrapPageRg[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_PROTECT, RES_SURROUND,
RES_PRINT, RES_PRINT,
@@ -65,18 +65,18 @@ SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet&
rSet, SwWrtShell* pSh, bo
SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet)
-, nOldLeftMargin(0)
-, nOldRightMargin(0)
-, nOldUpperMargin(0)
-, nOldLowerMargin(0)
-, nAnchorId(FLY_AT_PARA)
-, nHtmlMode(0)
-, pWrtSh(0)
-, bFormat(false)
-, bNew(true)
-, bHtmlMode(false)
-, bDrawMode(false)
-, bContourImage(false)
+, m_nOldLeftMargin(0)
+, m_nOldRightMargin(0)
+, m_nOldUpperMargin(0)
+, m_nOldLowerMargin(0)
+, m_nAnchorId(FLY_AT_PARA)
+, m_nHtmlMode(0)
+, m_pWrtSh(0)
+, m_bFormat(false)
+, m_bNew(true)
+, m_bHtmlMode(false)
+, m_bDrawMode(false)
+, m_bContourImage(false)
{
get(m_pNoWrapRB, "none");
get(m_pWrapLeftRB, "before");
@@ -163,7 +163,7 @@ VclPtr SwWrapTabPage::Create(vcl::Window
*pParent, const SfxItemSet
void SwWrapTabPage::Reset(const SfxItemSet *rSet)
{
// contour for Draw, Graphic and OLE (Insert/Graphic/Properties still
missing!)
-if( bDrawMode )
+if( m_bDrawMode )
{
m_pWrapOutlineCB->Show();
m_pWrapOutsideCB->Show();
@@ -174,13 +174,13 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
}
else
{
-bool bShowCB = bFormat;
-if( !bFormat )
+bool bShowCB = m_bFormat;
+if( !m_bFormat )
{
-int nSelType = pWrtSh->GetSelectionType();
+int nSelType = m_pWrtSh->GetSelectionType();
if( ( nSelType & nsSelectionType::SEL_GRF ) ||
( nSelType & nsSelectionType::SEL_OLE && GRAPHIC_NONE !=
-pWrtSh->GetIMapGraphic().GetType() ))
+m_pWrtSh->GetIMapGraphic().GetType() ))
bShowCB = true;
}
if( bShowCB )
@@ -190,10 +190,10 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
}
}
-nHtmlMode = ::GetHtmlMode(static_cast(SfxObjectShell::Current()));
-bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
+m_nHtmlMode = ::GetHtmlMode(static_cast(SfxObjectShell::Current()));
+m_bHtmlMode = (m_nHtmlMode & HTMLMODE_ON) != 0;
-FieldUnit aMetric = ::GetDfltMetric(bHtmlMode);
+FieldUnit aMetric = ::GetDfltMetric(m_bHtmlMode);
SetMetric(*m_pLeftMarginED, aMetric);
SetMetric(*m_pRightMarginED, aMetric);
SetMetric(*m_pTopMarginED, aMetric);
@@ -203,9 +203,9 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
SwSurround nSur = rSurround.GetSurround();
const SwFormatAnchor &rAnch = static_cast(rSet->Get(RES_ANCHOR));
-nAnchorId = rAnch.GetAnchorId();
+m_nAnchorId = rAnch.GetAnchorId();
-if (((nAnchorId == FLY_AT_PARA) || (nAnchorId == FLY_AT_CHAR))
+if (((m_nAnchorId == FLY_AT_PARA) || (m_nAnchorId == FLY_AT_CHAR))
&& (nSur != SURROUND_NONE))
{
m_pWrapAnchorOnlyCB->Check( rSurround.IsAnchorOnly() );
@@ -219,7 +219,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
m_pWrapOutlineCB->Check( bContour );
m_pWrapOutsideCB->Check( rSurround.IsOutside() );
m_pWrapThroughRB->Enable(!m_pWrapOutlineCB->IsChecked());
-bContourImage = !bContour;
+m_bContourImage = !bContour;
RadioButton* pBtn = NULL;
@@ -236,7 +236,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
// transparent ?
pBtn = m_pWrapThroughRB;
-if (!bDrawMode)
+if (!m_bDrawMode)
{
const SvxOpaqueItem& rOpaque = static_cast(rSet->Get(RES_OPAQUE));
m_pWrapTransparentCB->Check(!rOpaque.GetValue());
@@ -271,10 +271,10 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
// For character objects that currently are in passage, the default
// "contour on" is prepared here, in case we switch to any other
// passage later.
-if (bDrawMode && !m_pWrapOutlineCB->IsEnabled())
+if (m_bDrawMode && !m_pWrapOutlineCB->IsEnabled())
m_pWrapOutlineCB->Check();
}
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 13 -- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit d861027a8234b85504bf614ca653bfa5a378a36c Author: Robert Antoni Buj Gelonch Date: Wed May 20 02:46:21 2015 +0200 tdf#90999: Import spreadsheetML cells with inline formatting tags Change-Id: I5a723d5ecc4a075be64ba9766e574d9a9df50eb1 Reviewed-on: https://gerrit.libreoffice.org/15821 Tested-by: Jenkins Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index fa09a05..f48a7a5 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -479,7 +479,7 @@ - http://www.w3.org/TR/REC-html40']]"/> + @@ -6920,13 +6920,12 @@ - - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"/> - - + + + - + @@ -7170,7 +7169,7 @@ - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"> + ___ 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.3' - filter/source
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 13 -- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 17e0a74a724673803ee64211430d15e19de9d453 Author: Robert Antoni Buj Gelonch Date: Wed May 20 02:46:21 2015 +0200 tdf#90999: Import spreadsheetML cells with inline formatting tags Change-Id: I5a723d5ecc4a075be64ba9766e574d9a9df50eb1 Reviewed-on: https://gerrit.libreoffice.org/15821 Tested-by: Jenkins Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index a5875c2..09d1270 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -479,7 +479,7 @@ - http://www.w3.org/TR/REC-html40']]"/> + @@ -6920,13 +6920,12 @@ - - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"/> - - + + + - + @@ -7170,7 +7169,7 @@ - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"> + ___ 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.4' - filter/source
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 13 -- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 5ba58ae21fdfbd17de7ee749e493192a8986c2a4 Author: Robert Antoni Buj Gelonch Date: Wed May 20 02:46:21 2015 +0200 tdf#90999: Import spreadsheetML cells with inline formatting tags Change-Id: I5a723d5ecc4a075be64ba9766e574d9a9df50eb1 Reviewed-on: https://gerrit.libreoffice.org/15821 Tested-by: Jenkins Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index a5875c2..09d1270 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -479,7 +479,7 @@ - http://www.w3.org/TR/REC-html40']]"/> + @@ -6920,13 +6920,12 @@ - - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"/> - - + + + - + @@ -7170,7 +7169,7 @@ - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"> + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/fileview.cxx | 11 ++-
svtools/source/control/inettbc.cxx | 20 ++--
2 files changed, 8 insertions(+), 23 deletions(-)
New commits:
commit 6e01306e2094e0e0ae731aed7162bb3371f274bc
Author: Takeshi Abe
Date: Mon May 18 16:15:12 2015 +0900
svtools: simplify code by replacing std::find_if with std::any_of
... or std::none_of.
Change-Id: Ib6af7f32d9495eca03e29dcea06ff3925b1cc7b7
Reviewed-on: https://gerrit.libreoffice.org/15839
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index ada14a3..66aeece 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1795,15 +1795,8 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const
OUString &rFilter )
bDelete = true;
else
{
-// search for the first filter which matches
-::std::vector< WildCard >::const_iterator pMatchingFilter =
-::std::find_if(
-aFilters.begin(),
-aFilters.end(),
-FilterMatch( sCompareString )
-);
-
-bDelete = aFilters.end() == pMatchingFilter;
+bDelete = ::std::none_of( aFilters.begin(), aFilters.end(),
+ FilterMatch( sCompareString ) );
}
if( bDelete )
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 6f669b0..997ce064e 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -241,14 +241,9 @@ IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl )
{
OUString sUpperURL( sURL.toAsciiUpperCase() );
-::std::vector< WildCard >::const_iterator aMatchingFilter =
-::std::find_if(
-pBox->pImp->m_aFilters.begin(),
-pBox->pImp->m_aFilters.end(),
-FilterMatch( sUpperURL )
-);
-if ( aMatchingFilter == pBox->pImp->m_aFilters.end() )
-
+if ( ::std::none_of( pBox->pImp->m_aFilters.begin(),
+ pBox->pImp->m_aFilters.end(),
+ FilterMatch( sUpperURL ) ) )
{ // this URL is not allowed
bValidCompletionsFiltered = true;
continue;
@@ -988,12 +983,9 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
OUString aUpperURL( aURL );
aUpperURL = aUpperURL.toAsciiUpperCase();
-bFound
-= (::std::find_if(
-pImp->m_aFilters.begin(),
-pImp->m_aFilters.end(),
-FilterMatch( aUpperURL ) )
-!= pImp->m_aFilters.end());
+bFound = ::std::any_of(pImp->m_aFilters.begin(),
+ pImp->m_aFilters.end(),
+ FilterMatch( aUpperURL ) );
}
if ( bFound )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: clang/bin clang/find-unprefixed-members.cxx clang/Makefile clang/README clang/rename.cxx clang/test.cxx clang/test.hxx
clang/Makefile| 15 +
clang/README | 58 +++
clang/bin/rename-wrapper | 21 ++
clang/find-unprefixed-members.cxx | 168 +
clang/rename.cxx | 302 ++
clang/test.cxx| 37
clang/test.hxx| 39
7 files changed, 640 insertions(+)
New commits:
commit 9107601036fc9af9e67b37f0fc26296dddfd6eb1
Author: Miklos Vajna
Date: Thu May 21 11:05:46 2015 +0100
clang: import two libtooling-based compiler-like tool
- rename: can handle renaming of member variables
- find-unprefixed-members: can find all unprefixed members of a class
Both are examples, the main motivation is that if you have a complex
enough transformation that sed can't handle, but it's still a one-off
transformation so that you would have a throw-away tool, then writing a
tool based on libtooling is more optimal than writing a compiler plugin
and let everyone else run it for no reason.
diff --git a/clang/Makefile b/clang/Makefile
new file mode 100644
index 000..70004cc
--- /dev/null
+++ b/clang/Makefile
@@ -0,0 +1,15 @@
+CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-D__STDC_LIMIT_MACROS -fno-rtti
+CLANGWARNS=-Werror -Wall -Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels
-Wextra -Wundef -Wunused-macros -Wshadow -Woverloaded-virtual
+CLANGFLAGS = $(CLANGDEFS) $(CLANGWARNS) -g -std=c++11
+CLANGLIBS = -lLLVMSupport -lclangAST -lclangBasic -lclangFrontend
-lclangRewrite -lclangTooling
+
+bin/rename: rename.cxx Makefile
+ clang++ $(CLANGFLAGS) $(CLANGLIBS) -o $@ $<
+
+bin/find-unprefixed-members: find-unprefixed-members.cxx Makefile
+ clang++ $(CLANGFLAGS) $(CLANGLIBS) -o $@ $<
+
+test: test.cxx test.hxx Makefile
+ clang++ -o test test.cxx
+
+# vim: set noet sw=4 ts=4:
diff --git a/clang/README b/clang/README
new file mode 100644
index 000..febf50a
--- /dev/null
+++ b/clang/README
@@ -0,0 +1,58 @@
+= Clang libtooling-based rename
+
+== This tool vs clang-rename
+
+This tool is similar to clang-rename, though there are a number of differences.
+
+Pros:
+
+- old name can be a simple qualified name, no need to manually specify a byte
+ offset
+- rename handles ctor initializer list, too
+- handles macros, even nested ones
+- comes with a wrapper to do fully automatic rewriting
+
+Cons:
+
+- handles only rename of class members so far
+- only tested with clang-3.5.0
+
+== Hello world
+
+Example usage:
+
+
+bin/rename -dump -old-name=C::nX -new-name=m_nX test.cxx --
+
+
+If you get missing includes:
+
+
+ln -s /usr/lib64
+
+
+== Build system integration
+
+LibreOffice integration example with csv handling, provided that:
+
+- rename-wrapper is in your PATH
+- rename.csv is something like in your HOME:
+
+
+C::nX,m_nX
+C::nY,m_nY
+
+
+Then run:
+
+
+make -sr -j8 COMPILER_EXTERNAL_TOOL=1 FORCE_COMPILE_ALL=1
CCACHE_PREFIX=rename-wrapper RENAME_ARGS="-csv=$HOME/rename.csv"
+
+
+Once the rewriting is done, you can overwrite the original files with the .new
ones with:
+
+
+for i in $(find . -name "*.new"); do mv -f $i ${i%%.new}; done
+
+
+// vim: ft=asciidoc
diff --git a/clang/bin/rename-wrapper b/clang/bin/rename-wrapper
new file mode 100755
index 000..a67743f
--- /dev/null
+++ b/clang/bin/rename-wrapper
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+mydir=$(dirname $0)
+if [ -h $0 ]; then
+mydir=$(dirname $(readlink -f $0))
+fi
+
+c=
+for i in "$@"
+do
+if [ "$i" = "-c" ]; then
+c=1
+elif [ -n "$c" ]; then
+file=$i
+break
+fi
+done
+
+exec $mydir/rename $RENAME_ARGS $file -- "$@"
+
+# vi:set shiftwidth=4 expandtab:
diff --git a/clang/find-unprefixed-members.cxx
b/clang/find-unprefixed-members.cxx
new file mode 100644
index 000..52b1529
--- /dev/null
+++ b/clang/find-unprefixed-members.cxx
@@ -0,0 +1,168 @@
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+class Context
+{
+std::string m_aClassName;
+std::string m_aClassPrefix;
+
+public:
+Context(const std::string& rClassName, const std::string& rClassPrefix)
+: m_aClassName(rClassName),
+ m_aClassPrefix(rClassPrefix)
+{
+}
+
+bool match(const std::string& rName) const
+{
+if (m_aClassName == "")
+return rName.find(m_aClassPrefix) == 0;
+else
+return rName == m_aClassName;
+}
+};
+
+class Visitor : public clang::RecursiveASTVisitor
+{
+const Context m_rContext;
+bool m_bFound;
+
+public:
+Visitor(const Context& rContext)
+: m_rContext(rContext),
+ m_bFound(false)
+{
+}
+
+bool getFound()
+{
+return m_bFound;
+}
+
+/*
+ * class C
+ * {
+ * public:
+ * int nX; <- Handles this declaration.
+ * };
+ */
+bool VisitFieldDecl(clang:
[Libreoffice-commits] core.git: editeng/source
editeng/source/accessibility/AccessibleStaticTextBase.cxx |4 +--
editeng/source/editeng/editobj.cxx| 15 --
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 7fa3d4db1db47a7a62fdd66485a286d331a3587f
Author: Takeshi Abe
Date: Mon May 18 14:17:06 2015 +0900
editeng: simplify code by std::none_of
Change-Id: I6fb427b4e3d1179cf9291daa7204f3892a8e271f
Reviewed-on: https://gerrit.libreoffice.org/15838
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 6a1c21c..4f1c07f 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -981,8 +981,8 @@ namespace accessibility
{
const beans::PropertyValue* pItr =
aIntersectionSeq.getConstArray();
const beans::PropertyValue* pEnd = pItr +
aIntersectionSeq.getLength();
-const beans::PropertyValue* pFind = ::std::find_if( pItr, pEnd,
::std::bind2nd( PropertyValueEqualFunctor(), boost::cref( pDefAttr[i] ) ) );
-if ( pFind == pEnd && pDefAttr[i].Handle != 0)
+bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd(
PropertyValueEqualFunctor(), boost::cref( pDefAttr[i] ) ) );
+if ( bNone && pDefAttr[i].Handle != 0)
{
aDiffVec.push_back( pDefAttr[i] );
}
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index ecee5b6..c9cce3d 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -49,6 +49,7 @@
#include
#include
+#include
#if DEBUG_EDIT_ENGINE
#include
@@ -1191,11 +1192,8 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream )
const
for ( sal_uInt16 nChar = 0; nChar < rC.GetText().getLength();
nChar++ )
{
const ContentInfo::XEditAttributesType& rAttribs = rC.aAttribs;
-ContentInfo::XEditAttributesType::const_iterator it =
-std::find_if(rAttribs.begin(), rAttribs.end(),
- FindAttribByChar(EE_CHAR_FONTINFO, nChar));
-
-if (it == rAttribs.end())
+if ( std::none_of(rAttribs.begin(), rAttribs.end(),
+ FindAttribByChar(EE_CHAR_FONTINFO, nChar)) )
{
sal_Unicode cOld = rC.GetText()[ nChar ];
char cConv =
OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)),
RTL_TEXTENCODING_SYMBOL).toChar();
@@ -1454,11 +1452,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
for ( sal_uInt16 nChar = 0; nChar < pC->GetText().getLength();
nChar++ )
{
const ContentInfo::XEditAttributesType& rAttribs =
pC->aAttribs;
-ContentInfo::XEditAttributesType::const_iterator it =
-std::find_if(rAttribs.begin(), rAttribs.end(),
- FindAttribByChar(EE_CHAR_FONTINFO,
nChar));
-
-if (it == rAttribs.end())
+if ( std::none_of(rAttribs.begin(), rAttribs.end(),
+ FindAttribByChar(EE_CHAR_FONTINFO,
nChar)) )
{
sal_Unicode cOld = pC->GetText()[ nChar ];
DBG_ASSERT( cOld >= 0xF000, "cOld not converted?!" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/FilterHelper.mm| 23 +--
fpicker/source/office/OfficeFilePicker.cxx |6 +++---
2 files changed, 12 insertions(+), 17 deletions(-)
New commits:
commit d75cdda84fb98ec616b57a3dc0606d21c2413e47
Author: Takeshi Abe
Date: Mon May 18 14:27:44 2015 +0900
fpicker: simplify code by std::any_of
Change-Id: I0f5a8b5d7f8f88a821793004c1574fcb6a7a4882
Reviewed-on: https://gerrit.libreoffice.org/15836
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/fpicker/source/aqua/FilterHelper.mm
b/fpicker/source/aqua/FilterHelper.mm
index e37378d..fecea53f 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -162,11 +162,9 @@ public:
else
// a filter group -> search the sub filters
bMatch =
-_rEntry.endSubFilters() != ::std::find_if(
-
_rEntry.beginSubFilters(),
-
_rEntry.endSubFilters(),
- *this
- );
+::std::any_of(_rEntry.beginSubFilters(),
+ _rEntry.endSubFilters(),
+ *this);
return bMatch;
}
@@ -221,11 +219,9 @@ bool FilterHelper::FilterNameExists( const rtl::OUString&
rTitle )
if( m_pFilterList )
bRet =
-m_pFilterList->end() != ::std::find_if(
- m_pFilterList->begin(),
- m_pFilterList->end(),
- FilterTitleMatch( rTitle )
- );
+::std::any_of(m_pFilterList->begin(),
+ m_pFilterList->end(),
+ FilterTitleMatch( rTitle ));
return bRet;
}
@@ -240,10 +236,9 @@ bool FilterHelper::FilterNameExists( const UnoFilterList&
_rGroupedFilters )
const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
for( ; pStart != pEnd; ++pStart )
-if( m_pFilterList->end() != ::std::find_if(
-m_pFilterList->begin(),
-m_pFilterList->end(),
-FilterTitleMatch(
pStart->First ) ) )
+if( ::std::any_of(m_pFilterList->begin(),
+ m_pFilterList->end(),
+ FilterTitleMatch( pStart->First ) ) )
break;
bRet = (pStart != pEnd);
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index 6fd28ed..20d6e1d 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -358,7 +358,7 @@ namespace {
else
// a filter group -> search the sub filters
bMatch =
-_rEntry.endSubFilters() != ::std::find_if(
+::std::any_of(
_rEntry.beginSubFilters(),
_rEntry.endSubFilters(),
*this
@@ -380,7 +380,7 @@ bool SvtFilePicker::FilterNameExists( const OUString&
rTitle )
if ( m_pFilterList )
bRet =
-m_pFilterList->end() != ::std::find_if(
+::std::any_of(
m_pFilterList->begin(),
m_pFilterList->end(),
FilterTitleMatch( rTitle )
@@ -399,7 +399,7 @@ bool SvtFilePicker::FilterNameExists( const UnoFilterList&
_rGroupedFilters )
const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
for ( ; pStart != pEnd; ++pStart )
-if ( m_pFilterList->end() != ::std::find_if(
m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch( pStart->First )
) )
+if ( ::std::any_of( m_pFilterList->begin(), m_pFilterList->end(),
FilterTitleMatch( pStart->First ) ) )
break;
bRet = pStart != pEnd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/nmspmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da2c2a3dc42540229fa2b42ab797131fe080bec7
Author: Stephan Bergmann
Date: Thu May 21 12:20:59 2015 +0200
loplugin:literaltoboolconversion
Change-Id: I4b9299ef87686fee4e2771255ed1fcbc16374db9
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 78cf027..c4c9342 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -117,7 +117,7 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString&
rPrefix, const OUStrin
{
sal_uInt16 nKey = GetKeyByName( rName );
-assert(XML_NAMESPACE_NONE);
+assert(nKey != XML_NAMESPACE_NONE);
if( XML_NAMESPACE_NONE == nKey )
return XML_NAMESPACE_UNKNOWN;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/sl
source/sl/cui/source/dialogs.po |4 source/sl/cui/uiconfig/ui.po | 17 source/sl/dictionaries/pt_BR/dialog.po|1 source/sl/filter/source/config/fragments/filters.po | 26 + source/sl/formula/source/core/resource.po |4 source/sl/helpcontent2/source/text/sbasic/shared.po | 30 - source/sl/helpcontent2/source/text/scalc/01.po| 22 - source/sl/helpcontent2/source/text/shared/00.po |8 source/sl/helpcontent2/source/text/shared/01.po | 52 +- source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/sl/sc/source/ui/sidebar.po |6 source/sl/sc/source/ui/src.po | 45 +- source/sl/sd/uiconfig/simpress/ui.po | 182 -- source/sl/starmath/uiconfig/smath/ui.po |4 source/sl/svtools/source/control.po | 16 source/sl/svx/source/dialog.po|4 source/sl/sw/source/ui/app.po |6 source/sl/sw/source/uibase/inc.po |1 source/sl/sw/source/uibase/misc.po|1 source/sl/uui/uiconfig/ui.po |4 20 files changed, 170 insertions(+), 267 deletions(-) New commits: commit b29460698cce2b20cf82d33fdf5d3a9483b2ef9a Author: Andras Timar Date: Thu May 21 12:18:12 2015 +0200 Updated Slovenian translation Change-Id: I59d4e209d0749fd370881a343063da2dad94b086 diff --git a/source/sl/cui/source/dialogs.po b/source/sl/cui/source/dialogs.po index 9e25a29..dc539b2 100644 --- a/source/sl/cui/source/dialogs.po +++ b/source/sl/cui/source/dialogs.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.5\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2015-05-14 21:41+0200\n" -"PO-Revision-Date: 2015-05-15 10:44+0200\n" +"POT-Creation-Date: 2015-05-18 21:48+0200\n" +"PO-Revision-Date: 2015-05-20 11:22+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index 3a25620..44c9c38 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.0\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2015-05-14 21:41+0200\n" -"PO-Revision-Date: 2015-05-15 15:11+0200\n" +"POT-Creation-Date: 2015-05-18 21:48+0200\n" +"PO-Revision-Date: 2015-05-18 23:02+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -1616,7 +1616,7 @@ msgctxt "" "label4\n" "label\n" "string.text" -msgid "Operating System:" +msgid "Operating system:" msgstr "Operacijski sistem:" #: blackorwhitelistentrydialog.ui @@ -1652,7 +1652,7 @@ msgctxt "" "label8\n" "label\n" "string.text" -msgid "Driver Version:" +msgid "Driver version:" msgstr "RazliÄica gonilnika:" #: blackorwhitelistentrydialog.ui @@ -3350,6 +3350,15 @@ msgstr "_Y" #: colorpage.ui msgctxt "" "colorpage.ui\n" +"edit\n" +"label\n" +"string.text" +msgid "_Pickâ¦" +msgstr "_Izberi ..." + +#: colorpage.ui +msgctxt "" +"colorpage.ui\n" "modify\n" "label\n" "string.text" diff --git a/source/sl/dictionaries/pt_BR/dialog.po b/source/sl/dictionaries/pt_BR/dialog.po index 2c91924..4df6b4e 100644 --- a/source/sl/dictionaries/pt_BR/dialog.po +++ b/source/sl/dictionaries/pt_BR/dialog.po @@ -1,4 +1,5 @@ #. extracted from dictionaries/pt_BR/dialog +#, fuzzy msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.1\n" diff --git a/source/sl/filter/source/config/fragments/filters.po b/source/sl/filter/source/config/fragments/filters.po index f7af134..22bb1fb 100644 --- a/source/sl/filter/source/config/fragments/filters.po +++ b/source/sl/filter/source/config/fragments/filters.po @@ -1,16 +1,16 @@ #. extracted from filter/source/config/fragments/filters msgid "" msgstr "" -"Project-Id-Version: LibreOffice 4.5\n" +"Project-Id-Version: LibreOffice 5.0\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2015-04-21 14:32+0200\n" -"PO-Revision-Date: 2015-04-09 02:04+0200\n" +"POT-Creation-Date: 2015-05-18 21:48+0200\n" +"PO-Revision-Date: 2015-05-18 23:04+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7e705a71569768aa8fc3547ef87f1b95b501e63 Author: Andras Timar Date: Thu May 21 12:18:12 2015 +0200 Updated core Project: translations b29460698cce2b20cf82d33fdf5d3a9483b2ef9a Updated Slovenian translation Change-Id: I59d4e209d0749fd370881a343063da2dad94b086 diff --git a/translations b/translations index 845c8d1..b294606 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 845c8d1c0237efd4bbd5233830e33d1e31c291a8 +Subproject commit b29460698cce2b20cf82d33fdf5d3a9483b2ef9a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/tiledrendering/tiledrendering.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d9ba19147d6261469407a50bad4c9a04927fb166
Author: Miklos Vajna
Date: Thu May 21 11:29:04 2015 +0100
CppunitTest_sw_tiledrendering: disable the search test on non-Linux for now
Change-Id: Iae2de9b9ada2046beca29990a8abda09947d7b34
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3ba4dbd..2990d9a 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -237,6 +237,7 @@ void lcl_search()
void SwTiledRenderingTest::testSearch()
{
+#if !defined(WNT) && !defined(MACOSX)
SwXTextDocument* pXTextDocument = createDoc("search.odt");
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
size_t nNode =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
@@ -260,6 +261,7 @@ void SwTiledRenderingTest::testSearch()
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
nActual =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 7, nActual);
+#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl sd/source sfx2/source vcl/source
include/vcl/syswin.hxx | 12 +++-
sd/source/ui/framework/factories/FullScreenPane.cxx |2 +-
sfx2/source/dialog/backingcomp.cxx |2 +-
sfx2/source/view/viewfrm.cxx|2 +-
vcl/source/window/syswin.cxx|6 +++---
5 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 5b248f1348260f953686b20621255aece57358fe
Author: Noel Grandin
Date: Thu May 21 12:48:36 2015 +0200
convert MENUBAR_MODE constants to scoped enum
Change-Id: Ie4cda46d02e82cca1710603cfb3af379c702d9d7
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 7aef2ea..17ebf58 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -115,8 +115,10 @@ public:
// - SystemWindow-Types -
-#define MENUBAR_MODE_NORMAL ((sal_uInt16)0)
-#define MENUBAR_MODE_HIDE ((sal_uInt16)1)
+enum class MenuBarMode
+{
+Normal, Hide
+};
#define TITLE_BUTTON_DOCKING((sal_uInt16)1)
#define TITLE_BUTTON_HIDE ((sal_uInt16)2)
@@ -143,7 +145,7 @@ private:
boolmbSysChild;
boolmbIsCalculatingInitialLayoutSize;
boolmbInitialLayoutDone;
-sal_uInt16 mnMenuBarMode;
+MenuBarMode mnMenuBarMode;
sal_uInt16 mnIcon;
ImplData* mpImplData;
IdlemaLayoutIdle;
@@ -222,8 +224,8 @@ public:
voidSetMenuBar(MenuBar* pMenuBar, const
css::uno::Reference& rFrame =
css::uno::Reference());
MenuBar*GetMenuBar() const { return mpMenuBar; }
-voidSetMenuBarMode( sal_uInt16 nMode );
-sal_uInt16 GetMenuBarMode() const { return mnMenuBarMode; }
+voidSetMenuBarMode( MenuBarMode nMode );
+MenuBarMode GetMenuBarMode() const { return mnMenuBarMode; }
TaskPaneList* GetTaskPaneList();
voidGetWindowStateData( WindowStateData& rData ) const;
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx
b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 746be66..ef6c050 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -63,7 +63,7 @@ FullScreenPane::FullScreenPane (
// Create a new top-leve window that is displayed full screen.
mpWorkWindow->ShowFullScreenMode(true, nScreenNumber);
// For debugging (non-fullscreen) use
mpWorkWindow->SetScreenNumber(nScreenNumber);
-mpWorkWindow->SetMenuBarMode(MENUBAR_MODE_HIDE);
+mpWorkWindow->SetMenuBarMode(MenuBarMode::Hide);
mpWorkWindow->SetBorderStyle(WindowBorderStyle::REMOVEBORDER);
mpWorkWindow->SetBackground(Wallpaper());
// Don't show the window right now in order to allow the setting of an
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index f11d9ff..b69ee96 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -410,7 +410,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
if (pParent && pParent->IsFullScreenMode())
{
pParent->ShowFullScreenMode(false);
-pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
+pParent->SetMenuBarMode(MenuBarMode::Normal);
}
// create the menu bar for the backing component
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index fc8dbae..8119842 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2913,7 +2913,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
}
}
pWork->ShowFullScreenMode( bNewFullScreenMode );
-pWork->SetMenuBarMode( bNewFullScreenMode ?
MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL );
+pWork->SetMenuBarMode( bNewFullScreenMode ?
MenuBarMode::Hide : MenuBarMode::Normal );
GetFrame().GetWorkWindow_Impl()->SetFullScreen_Impl(
bNewFullScreenMode );
if ( !pItem )
rReq.AppendItem( SfxBoolItem( SID_WIN_FULLSCREEN,
bNewFullScreenMode ) );
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index d770ac3..e595f6f 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -80,7 +80,7 @@ void SystemWindow::Init()
mbSysChild = false;
mbIsCalculatingInitialLayoutSize = false;
mbInitialLayoutDone = false;
-mnMenuBarMode = MENUBAR_MODE_NORMAL;
+mnMenuBarMode = MenuBarMode::Normal;
mnIcon = 0;
mpDialogParent = NULL;
@@ -955,14 +955,14 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const
css::uno::ReferencempBorderWindow &&
(mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) )
{
-if ( nMode == MENUBAR_MODE_HIDE )
+i
Re: formula previews on export to word2003
Michael Stahl redhat.com> writes: ... > > Where in the source (module, function(s)) are the coordinates for the > > (formulas on export) preview images determined? I'd like to have it quick > > fixed and wouldn't mind attempting to fix it myself. > > most likely the preview image is created from: > SfxObjectShell::CreatePreviewMetaFile_Impl() > > called somehow by: > comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream() Thank you. That'd seem indeed to be the place for the previews dimensions generation (had superficial look only). Would be needed for other issues with formulas previews, though (not filed yet by anyone, I believe -- and relating to the formulas processing in LO itself). > did you try if this setting has any effect? > > Tools->Options...->LibreOffice Writer->Formatting Aids > "Math baseline alignment" > > apparently this was a new feature in OOo 3.4, maybe there are some > obscure bugs with it still? did OOo 3.3 perform better? Oh, that's where Michael's reply to me was (in gmane). No, that option has no effect at all. I had issues with exported formulas/equations since 2009, don't remember what the LO (OOO?) version was. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 66305] FILESAVE: ToC exported to XHTML still has page numbers
https://bugs.documentfoundation.org/show_bug.cgi?id=66305 --- Comment #10 from Yury --- If I understood this right, you do not exclude the TOC itself. Why not retain page numbers, e.g. in XHTML comments, then? -- 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] dev-tools.git: git-hooks/online.git
git-hooks/online.git/hooks/update | 140 ++
1 file changed, 140 insertions(+)
New commits:
commit cbf21b252e36fac30fe8c205d47fbd7eaa6e392a
Author: Miklos Vajna
Date: Thu May 21 12:22:56 2015 +0100
git-hooks: add online.git
diff --git a/git-hooks/online.git/hooks/update
b/git-hooks/online.git/hooks/update
new file mode 100755
index 000..7b269ff
--- /dev/null
+++ b/git-hooks/online.git/hooks/update
@@ -0,0 +1,140 @@
+#!/bin/sh
+#
+# An example hook script to mail out commit update information.
+# It also blocks tags that aren't annotated.
+# Called by git-receive-pack with arguments: refname sha1-old sha1-new
+#
+# To enable this hook:
+# (1) change the recipient e-mail address
+# (2) make this file executable by "chmod +x update".
+#
+
+# prevent pushing from anyone but the logerrit user
+if [ "$(id -u -n )" != "logerrit" ] ; then
+ echo "*** The reference for this repo is gerrit. do not push directly
to fdo" >&2
+ exit 1
+fi
+from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
+
+project=$(cat $GIT_DIR/description)
+recipients="libreoffice-comm...@lists.freedesktop.org"
+
+ref_type=$(git cat-file -t "$3")
+
+# Avoid re-introducing obsolete tags
+if grep -q "^$1$" hooks/obsolete-tags; then
+ echo "*** Re-introducing an obsolete tag ($1) is not allowed in this
repo" >&2
+ echo "*** Use corereleasebranches/killtagslocal.sh from
contrib/dev-tools.git to get rid of them." >&2
+ exit 1
+fi
+
+# Only allow annotated tags in a shared repo
+# Remove this code to treat dumb tags the same as everything else
+case "$1","$ref_type" in
+refs/tags/*,commit)
+ echo "*** Un-annotated tags are not allowed in this repo" >&2
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate."
+ exit 1;;
+refs/tags/*,tag)
+ echo "### Pushing version '${1##refs/tags/}' to the masses" >&2
+ # recipients="release-annou...@somwehere.com annou...@somewhereelse.com"
+ ;;
+esac
+
+# set this to 'cat' to get a very detailed listing.
+# short only kicks in when an annotated tag is added
+short='git shortlog'
+
+# see 'date --help' for info on how to write this
+# The default is a human-readable iso8601-like format with minute
+# precision ('2006-01-25 15:58 +0100' for example)
+date_format="%F %R %z"
+
+# Set to the number of pathname components you want in the subject line to
+# indicate which components of a project changed.
+num_path_components=2
+
+# Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
+if expr "$2" : '0*$' >/dev/null ; then
+ subject="$repo: Changes to '${1##refs/heads/}'"
+else
+ base=$(git-merge-base "$2" "$3")
+ subject=$(git-diff-tree -r --name-only "$base" "$3" |
+ cut -d/ -f-$num_path_components | sort -u | xargs echo -n)
+commits=$(git-rev-list "$3" "^$base" | wc -l)
+ if [ "$commits" -ne 1 ] ; then
+ subject="$commits commits - $subject"
+ fi
+ branch="${1##refs/heads/}"
+ if [ "$branch" != "master" ] ; then
+ subject="Branch '$branch' - $subject"
+ fi
+ subject="$repo: $subject"
+fi
+
+if expr "$2" : '0*$' >/dev/null
+then
+ # new ref
+ case "$1" in
+ refs/tags/*)
+ # a pushed and annotated tag (usually) means a new version
+ tag="${1##refs/tags/}"
+ if [ "$ref_type" = tag ]; then
+ eval $(git cat-file tag $3 | \
+ sed -n '4s/tagger
\([^>]*>\)[^0-9]*\([0-9]*\).*/tagger="\1" ts="\2"/p')
+ date=$(date --date="1970-01-01 00:00:00 $ts seconds"
+"$date_format")
+ echo "Tag '$tag' created by $tagger at $date"
+ git cat-file tag $3 | sed -n '5,$p'
+ echo
+ fi
+ prev=$(git describe "$3^" | sed 's/-g.*//')
+ # the first tag in a repo will yield no $prev
+ if [ -z "$prev" ]; then
+ echo "Changes since the dawn of time:"
+ git rev-list --pretty $3 | $short
+ else
+ echo "Changes since $prev:"
+ git rev-list --pretty $prev..$3 | $short
+ echo ---
+ git diff $prev..$3 | diffstat -p1
+ echo ---
+ fi
+ ;;
+
+ refs/heads/*)
+ branch="${1##refs/heads/}"
+ echo "New branch '$branch' available with the following
commits:"
+ git-rev-list --pretty "$3" $(git-rev-parse --not --all)
+ ;;
+ esac
+else
+ case "$base" in
+ "$2")
+ git diff "$3" "^$base" | diffstat -p1
+ echo
+ echo "New commits:"
+ ;;
+ *)
+ echo "Rebased ref, commits from common ancestor:"
+ ;;
+ esac
+ bytes=
[Bug 66305] FILESAVE: ToC exported to XHTML still has page numbers
https://bugs.documentfoundation.org/show_bug.cgi?id=66305 --- Comment #11 from Robert Antoni Buj i Gelonch --- TOC can have hyperlinks which are very useful, but page number in a continuous output isn't. -- 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: include/LibreOfficeKit libreofficekit/qa libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h |1
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 14 +
libreofficekit/source/gtk/lokdocview.cxx| 21
3 files changed, 36 insertions(+)
New commits:
commit cb0b7ff34dc193c37e89f4a968e1cb7502338230
Author: Miklos Vajna
Date: Thu May 21 13:17:18 2015 +0100
gtktiledviewer: handle LOK_CALLBACK_SEARCH_NOT_FOUND
Change-Id: Ic545bbd14d11a3b310f4d72ee02e51a7cb6f4f22
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index a517fca..cce580f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -39,6 +39,7 @@ struct _LOKDocViewClass
GtkScrolledWindowClass parent_class;
void (* edit_changed) (LOKDocView* pView, gboolean was_edit);
void (* command_changed) (LOKDocView* pView, char* new_state);
+ void (* search_not_found) (LOKDocView* pView, char* new_state);
};
guint lok_docview_get_type(void);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 7509b2f..d4d010f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -48,6 +48,7 @@ static GtkComboBoxText* pPartSelector;
#endif
GtkWidget* pFindbar;
GtkWidget* pFindbarEntry;
+GtkWidget* pFindbarLabel;
static LibreOfficeKit* pOffice;
@@ -177,6 +178,7 @@ static void signalSearchPrev(GtkWidget* /*pButton*/,
gpointer /*pItem*/)
/// Handles the key-press-event of the search entry widget.
static gboolean signalFindbar(GtkWidget* /*pWidget*/, GdkEventKey* pEvent,
gpointer /*pData*/)
{
+gtk_label_set_text(GTK_LABEL(pFindbarLabel), "");
switch(pEvent->keyval)
{
case GDK_Return:
@@ -230,6 +232,12 @@ static void signalCommand(LOKDocView* /*pLOKDocView*/,
char* pPayload, gpointer
}
}
+/// LOKDocView found no search matches -> set the search label accordingly.
+static void signalSearch(LOKDocView* /*pLOKDocView*/, char* /*pPayload*/,
gpointer /*pData*/)
+{
+gtk_label_set_text(GTK_LABEL(pFindbarLabel), "Search key not found");
+}
+
/// User clicked on a cmmand button -> inform LOKDocView.
static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
{
@@ -425,12 +433,18 @@ int main( int argc, char* argv[] )
gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarPrev, -1);
g_signal_connect(G_OBJECT(pFindbarPrev), "clicked",
G_CALLBACK(signalSearchPrev), NULL);
+GtkToolItem* pFindbarLabelContainer = gtk_tool_item_new();
+pFindbarLabel = gtk_label_new("");
+gtk_container_add(GTK_CONTAINER(pFindbarLabelContainer), pFindbarLabel);
+gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarLabelContainer, -1);
+
gtk_box_pack_end(GTK_BOX(pVBox), pFindbar, FALSE, FALSE, 0);
// Docview
pDocView = lok_docview_new( pOffice );
g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand),
NULL);
+g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch),
NULL);
// Input handling.
g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey),
pDocView);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 2cbd450..2e8e24c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -190,6 +190,8 @@ struct LOKDocView_Impl
void globalCallbackWorkerImpl(int nType, const char* pPayload);
/// Command state (various buttons like bold are toggled or not) is
changed.
void commandChanged(const std::string& rPayload);
+/// Search did not find any matches.
+void searchNotFound(const std::string& rPayload);
};
namespace {
@@ -1001,6 +1003,9 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData*
pCallback)
}
break;
case LOK_CALLBACK_SEARCH_NOT_FOUND:
+{
+searchNotFound(pCallback->m_aPayload);
+}
break;
default:
g_assert(false);
@@ -1045,6 +1050,7 @@ enum
{
EDIT_CHANGED,
COMMAND_CHANGED,
+SEARCH_NOT_FOUND,
LAST_SIGNAL
};
@@ -1055,6 +1061,11 @@ void LOKDocView_Impl::commandChanged(const std::string&
rString)
g_signal_emit(m_pDocView, docview_signals[COMMAND_CHANGED], 0,
rString.c_str());
}
+void LOKDocView_Impl::searchNotFound(const std::string& rString)
+{
+g_signal_emit(m_pDocView, docview_signals[SEARCH_NOT_FOUND], 0,
rString.c_str());
+}
+
static void lok_docview_class_init( gpointer ptr )
{
LOKDocViewClass* pClass = static_cast(ptr);
@@ -1079,6 +1090,16 @@ static void lok_docview_class_init( gpointer ptr )
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
G_TYPE_STRING);
+pClass->search_not_found =
[Libreoffice-commits] core.git: extensions/source include/sfx2 include/vcl reportdesign/source sfx2/source vcl/source
extensions/source/bibliography/bibbeam.cxx |4 -
extensions/source/bibliography/bibcont.cxx |4 -
include/sfx2/dockwin.hxx |3 -
include/vcl/splitwin.hxx | 27 ++---
reportdesign/source/ui/report/DesignView.cxx |6 +-
sfx2/source/appl/newhelp.cxx | 10 +--
sfx2/source/dialog/dockwin.cxx |5 -
sfx2/source/dialog/splitwin.cxx | 12 ++--
vcl/source/window/splitwin.cxx | 74 +--
9 files changed, 76 insertions(+), 69 deletions(-)
New commits:
commit cf991bf352d64021e872ab1f8d82cb0f3cea37f3
Author: Noel Grandin
Date: Thu May 21 11:51:59 2015 +0200
convert SWIB constants to scoped enum
Change-Id: If64368f22e748cc646a726cb962e60ad29a66df9
Reviewed-on: https://gerrit.libreoffice.org/15840
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/extensions/source/bibliography/bibbeam.cxx
b/extensions/source/bibliography/bibbeam.cxx
index 1699b8d..ff1a731 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -226,7 +226,7 @@ namespace bib
{
pToolBar= VclPtr::Create(this, LINK( this, BibBeamer,
RecalcLayout_Impl ));
::Size aSize=pToolBar->GetSizePixel();
-InsertItem(ID_TOOLBAR, pToolBar, aSize.Height(), 0, 0, SWIB_FIXED );
+InsertItem(ID_TOOLBAR, pToolBar, aSize.Height(), 0, 0,
SplitWindowItemFlags::Fixed );
if ( m_xController.is() )
pToolBar->SetXController( m_xController );
}
@@ -235,7 +235,7 @@ namespace bib
{
pGridWin = VclPtr::Create(this,0);
-InsertItem(ID_GRIDWIN, pGridWin, 40, 1, 0, SWIB_RELATIVESIZE );
+InsertItem(ID_GRIDWIN, pGridWin, 40, 1, 0,
SplitWindowItemFlags::RelativeSize );
pGridWin->createGridWin( pDatMan->updateGridModel() );
}
diff --git a/extensions/source/bibliography/bibcont.cxx
b/extensions/source/bibliography/bibcont.cxx
index 5c75e52..bd1a069 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -186,7 +186,7 @@ void BibBookContainer::createTopFrame( BibShortCutHandler*
pWin )
pTopWin->Show();
BibConfig* pConfig = BibModul::GetConfig();
long nSize = pConfig->getBeamerSize();
-InsertItem(TOP_WINDOW, pTopWin, nSize, 1, 0, SWIB_PERCENTSIZE );
+InsertItem(TOP_WINDOW, pTopWin, nSize, 1, 0,
SplitWindowItemFlags::PercentSize );
}
@@ -204,7 +204,7 @@ void BibBookContainer::createBottomFrame(
BibShortCutHandler* pWin )
BibConfig* pConfig = BibModul::GetConfig();
long nSize = pConfig->getViewSize();
-InsertItem(BOTTOM_WINDOW, pBottomWin, nSize, 1, 0, SWIB_PERCENTSIZE );
+InsertItem(BOTTOM_WINDOW, pBottomWin, nSize, 1, 0,
SplitWindowItemFlags::PercentSize );
}
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index e929824..b88f20d 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -32,6 +32,7 @@
class SfxSplitWindow;
class SfxDockingWindow_Impl;
+enum class SplitWindowItemFlags;
void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const OUString& rDockingWindowName );
bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const OUString& rDockingWindowName );
@@ -107,7 +108,7 @@ public:
DECL_LINK_TYPED(TimerHdl, Idle *, void);
SAL_DLLPRIVATE void Initialize_Impl();
-SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
+SAL_DLLPRIVATE SplitWindowItemFlags GetWinBits_Impl() const;
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
SAL_DLLPRIVATE void Disappear_Impl();
SAL_DLLPRIVATE void Reappear_Impl();
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 867a343..24a5812 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -22,17 +22,24 @@
#include
#include
+#include
class Wallpaper;
class ImplSplitSet;
-typedef sal_uInt16 SplitWindowItemBits;
-
-#define SWIB_FIXED ((SplitWindowItemBits)0x0001)
-#define SWIB_RELATIVESIZE ((SplitWindowItemBits)0x0002)
-#define SWIB_PERCENTSIZE((SplitWindowItemBits)0x0004)
-#define SWIB_COLSET ((SplitWindowItemBits)0x0008)
-#define SWIB_INVISIBLE ((SplitWindowItemBits)0x0010)
+enum class SplitWindowItemFlags
+{
+NONE = 0x,
+Fixed = 0x0001,
+RelativeSize = 0x0002,
+PercentSize= 0x0004,
+ColSet = 0x0008,
+Invisible = 0x0010,
+};
+namespace o3tl
+{
+template<> struct typed_flags :
is_typed_flags {};
+}
#define SPLITWINDOW_APPEND ((sal_uInt16)0x)
#define SPLITWINDOW_ITEM_NOTFOUND ((sal_uInt16)0x)
@@ -146,10 +153,10 @@ public:
void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 13 -- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 26c6602c9036e12e0d228b6f5377f47fde5a530f Author: Robert Antoni Buj Gelonch Date: Wed May 20 23:31:46 2015 +0200 tdf#90999: Import spreadsheetML cells with inline formatting tags Change-Id: Icb906a7944097d2cc92addc0e85be08f089a23e4 Reviewed-on: https://gerrit.libreoffice.org/15833 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index a5875c2..09d1270 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -479,7 +479,7 @@ - http://www.w3.org/TR/REC-html40']]"/> + @@ -6920,13 +6920,12 @@ - - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"/> - - + + + - + @@ -7170,7 +7169,7 @@ - http://www.w3.org/TR/REC-html40'][string-length(text()) != 0]"> + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/CustomTarget_android_desktop.mk android/experimental
android/CustomTarget_android_desktop.mk | 36 android/experimental/desktop/AndroidManifest.xml | 21 android/experimental/desktop/Makefile | 68 - android/experimental/desktop/ant.properties | 17 android/experimental/desktop/build.xml | 84 -- android/experimental/desktop/fonts.conf | 154 android/experimental/desktop/jni/Android.mk | 19 android/experimental/desktop/project.properties | 13 android/experimental/desktop/res/layout/main.xml | 12 android/experimental/desktop/res/values/strings.xml |4 android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java | 379 -- 11 files changed, 807 deletions(-) New commits: commit 43ad4c56fabe0304cf7aa133c7778996afbfae23 Author: Tor Lillqvist Date: Thu May 21 14:21:16 2015 +0100 Bin the since long obsolete "desktop" Android app It was an early approach, indeed experimental, and has been abandoned for quite a while. diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk deleted file mode 100644 index 715fd8c..000 --- a/android/CustomTarget_android_desktop.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$(eval $(call gb_CustomTarget_CustomTarget,android/desktop)) - -android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Desktop) - -$(call gb_CustomTarget_get_target,android/desktop) : \ - $(android_desktop_DIR)/done - -# We want that to be built completely first, -# so that we can serialize Ant access to Bootstrap, which is used -# by several LO-android apps. We don't want one Ant to be cleaning -# out Bootstrap while another is building stuff that depends on it. -# Yeah, this sucks - -$(android_desktop_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) - cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all -# Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script -# still looks for the .apk, and we want fresh daily builds to be uploaded. Even if -# the apps as such are mostly useless. -# Us "foo" instead of the old INPATH - mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/desktop/bin/*.apk $(BUILDDIR)/instsetoo_native/foo/bin - -$(call gb_CustomTarget_get_clean_target,android/desktop) : - $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) - cd $(SRCDIR)/android/experimental/desktop && $(MAKE) clean - -# vim: set noet sw=4 ts=4: diff --git a/android/experimental/desktop/AndroidManifest.xml b/android/experimental/desktop/AndroidManifest.xml deleted file mode 100644 index d685e17..000 --- a/android/experimental/desktop/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - -http://schemas.android.com/apk/res/android"; - package="org.libreoffice.experimental.desktop" - android:versionCode="1" - android:versionName="1.0"> - - - - - - - - - - diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile deleted file mode 100644 index 9516737..000 --- a/android/experimental/desktop/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -ifeq ($(BUILDDIR),) -include ../../../config_host.mk -endif - -# The default target just builds. -all: build-ant - -# The package of this app -APP_PACKAGE=org.libreoffice.experimental.desktop - -BOOTSTRAPDIR=../../Bootstrap -include $(BOOTSTRAPDIR)/Makefile.shared - -native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py - $< -j \ - -g core -g edit -g writer \ - > $@ - -# The name of the Bootstrap activity class -BOOTSTRAP=org.libreoffice.android.Bootstrap - -# The default target just builds. - -copy-stuff-desktop: -# tango artwork / icons - mkdir -p assets/share/config - cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config -# shell / splash images - mkdir -p assets/program - cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program -# presets - becomes the users home directory, .stamp forces .zip dir creation - for D in $(strip autocorr autotext backup b
[Libreoffice-commits] core.git: android/Bootstrap desktop/source solenv/bin vcl/android
android/Bootstrap/src/org/libreoffice/android/AppSupport.java | 31 -
desktop/source/app/sofficemain.cxx| 15
solenv/bin/native-code.py |9
vcl/android/androidinst.cxx | 161 --
4 files changed, 216 deletions(-)
New commits:
commit 72a688db732bca48969977b84a165d6d6a80e5af
Author: Tor Lillqvist
Date: Thu May 21 14:51:59 2015 +0100
Remove more obsolete Android code: The 'AppSupport' stuff
diff --git a/android/Bootstrap/src/org/libreoffice/android/AppSupport.java
b/android/Bootstrap/src/org/libreoffice/android/AppSupport.java
deleted file mode 100644
index ef37f18..000
--- a/android/Bootstrap/src/org/libreoffice/android/AppSupport.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Native functions that are used by "desktop" approach apps. That means apps
-// that have a "real" LibreOffice "main loop" running (headless).
-
-package org.libreoffice.android;
-
-import android.graphics.Bitmap;
-
-public final class AppSupport
-{
-/* In desktop */
-public static native void runMain();
-
-/* In vcl */
-public static native void renderVCL(Bitmap bitmap);
-public static native void registerForDamageCallback(Class
destinationClass);
-public static native void setViewSize(int width, int height);
-public static native void key(char c);
-public static native void touch(int action, int x, int y);
-public static native void zoom(float scale, int x, int y);
-public static native void scroll(int x, int y);
-}
-
-// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 25da9d8..48aafb7 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -105,21 +105,6 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
#if defined(ANDROID) || defined(IOS)
-#ifdef ANDROID
-extern "C" SAL_JNI_EXPORT void JNICALL
-Java_org_libreoffice_android_AppSupport_runMain(JNIEnv* /* env */,
-jobject /* clazz */)
-{
-int nRet;
-do {
-nRet = soffice_main();
-LOGI("soffice_main returned %d", nRet);
-} while (nRet == EXITHELPER_NORMAL_RESTART ||
- nRet == EXITHELPER_CRASH_WITH_RESTART); // pretend to re-start.
-
-}
-#endif
-
extern "C" void PtylTestEncryptionAndExport(const char *pathname)
{
OUString sUri(pathname, strlen(pathname), RTL_TEXTENCODING_UTF8);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 676e9c4..1df3280 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -464,15 +464,6 @@ print ("""
if options.java:
print ("""
-// Guard against possible function-level link-time pruning of
-// "unused" code. We need to pull these in, too, as they aren't in
-// any of the libs we link with -Wl,--whole-archive. Is this necessary?
-extern void Java_org_libreoffice_android_AppSupport_runMain();
-volatile void *p = (void *)
Java_org_libreoffice_android_AppSupport_runMain;
-
-extern void Java_org_libreoffice_android_AppSupport_renderVCL();
-p = (void *) Java_org_libreoffice_android_AppSupport_renderVCL;
-
extern void Java_org_libreoffice_kit_LibreOfficeKit_initializeNative();
p = (void *) Java_org_libreoffice_kit_LibreOfficeKit_initializeNative;
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 6099536..d1b760d 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -382,165 +382,4 @@ int AndroidSalSystem::ShowNativeDialog( const OUString&
rTitle,
return 0;
}
-// public static native void renderVCL(Bitmap bitmap);
-extern "C" SAL_JNI_EXPORT void JNICALL
-Java_org_libreoffice_android_AppSupport_renderVCL(JNIEnv *env,
- jobject /* clazz */,
- jobject bitmap)
-{
-AndroidBitmapInfo info;
-void* pixels;
-intret;
-
-if ((ret = AndroidBitmap_getInfo(env, bitmap, &info)) < 0) {
-LOGI("AndroidBitmap_getInfo() failed ! error=%d", ret);
-return;
-}
-
-if ((ret = AndroidBitmap_lockPixels(env, bitmap, &pixels)) < 0) {
-LOGI("AndroidBitmap_lockPixels() failed ! error=%d", ret);
-}
-
-/*
-typedef struct ANativeWindow_Buffer {
-// The number of pixels that are show horizontally.
-int32_t width;
-
-// The number of pixels that are shown vertically.
-int32_t height;
-
-// The number of *pixels* that a line in the buffer t
[Libreoffice-commits] core.git: vcl/android
vcl/android/androidinst.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit f7d886ca038cd0a67738e6afe33ee002982d4cae Author: Tor Lillqvist Date: Thu May 21 14:54:58 2015 +0100 WaE: macro "LOGW" is not used diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index d1b760d..03ddd0b 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -23,7 +23,6 @@ #define LOGTAG "LibreOffice/androidinst" #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__)) -#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, LOGTAG, __VA_ARGS__)) #define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOGTAG, __VA_ARGS__)) static jclass appClass = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e3390e9236564f4becef9f61197aa1dcb93f7f6
Author: Tor Lillqvist
Date: Thu May 21 15:04:07 2015 +0100
Fix thinko
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1df3280..44b1515 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -465,7 +465,7 @@ print ("""
if options.java:
print ("""
extern void Java_org_libreoffice_kit_LibreOfficeKit_initializeNative();
-p = (void *) Java_org_libreoffice_kit_LibreOfficeKit_initializeNative;
+volatile void *p = (void *)
Java_org_libreoffice_kit_LibreOfficeKit_initializeNative;
extern void Java_org_libreoffice_kit_Office_getError();
p = (void *) Java_org_libreoffice_kit_Office_getError;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/basegfx
include/basegfx/numeric/ftools.hxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit ce7d80c69d936e844ec4ed930264bfc8cadacde1
Author: Zsolt Bölöny
Date: Mon May 18 16:52:10 2015 +0200
fTools::getSmallValue() is not used anymore
Change-Id: I20ecd3078d1b0c5265929405484cda2cfd88060d
Reviewed-on: https://gerrit.libreoffice.org/15806
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/include/basegfx/numeric/ftools.hxx
b/include/basegfx/numeric/ftools.hxx
index b4ae0a4..32c7654 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -151,13 +151,10 @@ namespace basegfx
class BASEGFX_DLLPUBLIC fTools
{
public:
-/// Get threshold value for equalZero and friends
-static double getSmallValue() { return 0.1f; }
-
/// Compare against small value
static bool equalZero(const double& rfVal)
{
-return (fabs(rfVal) <= getSmallValue());
+return (fabs(rfVal) <= 0.1f);
}
/// Compare against given small value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 50100] [Task] Verify a Bugfix
https://bugs.documentfoundation.org/show_bug.cgi?id=50100 --- Comment #3 from samtuke --- The bugzilla search query now returns zero results... -- 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 47652] Provide stacktraces for crashes in existing bug reports
https://bugs.documentfoundation.org/show_bug.cgi?id=47652 --- Comment #5 from samtuke --- This link no longer leads to stacktrace instructions: http://wiki.documentfoundation.org/BugReport#How_to_get_backtrace_.28on_Linux.29 Where can the instructions be found? -- 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: svx/source
svx/source/customshapes/EnhancedCustomShapeEngine.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23cba1f55f1937c27c2a1bc27f9d3fd7b1ef1b47
Author: Miklos Vajna
Date: Thu May 21 15:12:10 2015 +0100
tdf#91095 svx: avoid unconditional SdrObject -> SdrObjCustomShape
static_cast
Change-Id: I5ed86633e909c13f14ee382b4d9ec8f9c264df1d
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 2beb70f..c78641f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -273,7 +273,7 @@ Reference< drawing::XShape > SAL_CALL
EnhancedCustomShapeEngine::render()
throw ( RuntimeException, std::exception )
{
Reference< drawing::XShape > xShape;
-SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
+SdrObject* pSdrObjCustomShape( PTR_CAST( SdrObjCustomShape,
GetSdrObjectFromXShape( mxShape ) ) );
if ( pSdrObjCustomShape )
{
// retrieving the TextPath property to check if feature is enabled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/UnpackedTarball_libetonyek.mk |8
external/libetonyek/ubsan-visibility.patch| 11 +++
2 files changed, 19 insertions(+)
New commits:
commit 1dbc9e022e750a16dbf5b530783c4adaafd609f5
Author: Stephan Bergmann
Date: Thu May 21 15:29:59 2015 +0100
For Clang -fsanitize=vptr use -fvisibility-ms-compat, not
-fvisibility=hidden
...same as f0aa1a78fb209310e8baef53c02f365fca518d11
Change-Id: Ib02a20677eaaf2930bf3620c4ed2b1c3c098ce00
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4706d02..c531894 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,4 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
))
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
+external/libetonyek/ubsan-visibility.patch \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ubsan-visibility.patch
b/external/libetonyek/ubsan-visibility.patch
new file mode 100644
index 000..925f4a8
--- /dev/null
+++ b/external/libetonyek/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
configure
+@@ -17443,7 +17443,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
-fvisibility=hidden compiler flag" >&5
+ $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
+ saved_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter
filter/source/msfilter/escherex.cxx | 39 +++
include/filter/msfilter/escherex.hxx |9 +---
2 files changed, 23 insertions(+), 25 deletions(-)
New commits:
commit b8f4b28cf6fa6c16d714179913be8c1198a11844
Author: Stephan Bergmann
Date: Wed May 20 17:13:45 2015 +0200
Use delegating constructor
Change-Id: I793130bda833f4eb6ba5f2901adb2362ce666fe9
Reviewed-on: https://gerrit.libreoffice.org/15829
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index d6bed05..3faaecd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -140,35 +140,30 @@ EscherExClientAnchor_Base::~EscherExClientAnchor_Base()
{
}
-void EscherPropertyContainer::ImplInit()
-{
-nSortCount = 0;
-nCountCount = 0;
-nCountSize = 0;
-nSortBufSize = 64;
-bHasComplexData = false;
-pSortStruct = new EscherPropSortStruct[ nSortBufSize ];
-}
+EscherPropertyContainer::EscherPropertyContainer(
+EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm,
+Rectangle * pBoundRect):
+pGraphicProvider(pGraphProv),
+pPicOutStrm(pPiOutStrm),
+pShapeBoundRect(pBoundRect),
+nSortCount(0),
+nSortBufSize(64),
+nCountCount(0),
+nCountSize(0),
+pSortStruct(new EscherPropSortStruct[nSortBufSize]),
+bHasComplexData(false)
+{}
EscherPropertyContainer::EscherPropertyContainer()
-: pGraphicProvider(NULL)
-, pPicOutStrm(NULL)
-, pShapeBoundRect(NULL)
-{
-ImplInit();
-}
+: EscherPropertyContainer(nullptr, nullptr, nullptr)
+{}
EscherPropertyContainer::EscherPropertyContainer(
EscherGraphicProvider& rGraphProv,
SvStream* pPiOutStrm,
Rectangle& rBoundRect ) :
-
-pGraphicProvider( &rGraphProv ),
-pPicOutStrm ( pPiOutStrm ),
-pShapeBoundRect ( &rBoundRect )
-{
-ImplInit();
-}
+EscherPropertyContainer(&rGraphProv, pPiOutStrm, &rBoundRect)
+{}
EscherPropertyContainer::~EscherPropertyContainer()
{
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 4e3f8d7..8c1fbbe 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -772,13 +772,13 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
SvStream* pPicOutStrm;
Rectangle* pShapeBoundRect;
-EscherPropSortStruct* pSortStruct;
-
sal_uInt32 nSortCount;
sal_uInt32 nSortBufSize;
sal_uInt32 nCountCount;
sal_uInt32 nCountSize;
+EscherPropSortStruct* pSortStruct;
+
boolbHasComplexData;
@@ -789,7 +789,10 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
bool bCreateCroppingAttributes
);
boolImplCreateEmbeddedBmp( const OString& rUniqueId );
-voidImplInit();
+
+SAL_DLLPRIVATE explicit EscherPropertyContainer(
+EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm,
+Rectangle * pBoundRect);
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 138 +++--
1 file changed, 73 insertions(+), 65 deletions(-)
New commits:
commit 06cb0e6d2675cff7b526f9fe2578d9727fda4404
Author: Caolán McNamara
Date: Thu May 21 15:44:20 2015 +0100
gtk3: implement keyboard and mouse grab
Change-Id: Iff17dccc58e0fcd6bdc479e6135e067ae375dce9
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 8ca6a53..5e519f4 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2726,90 +2726,98 @@ void GtkSalFrame::SetPointer( PointerStyle
ePointerStyle )
void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
{
-#if !GTK_CHECK_VERSION(3,0,0)
static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
+if (pEnv && *pEnv)
+return;
-if( m_pWindow )
+if (!m_pWindow)
+return;
+
+const int nMask = (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+#if GTK_CHECK_VERSION(3,0,0)
+GdkDeviceManager* pDeviceManager =
gdk_display_get_device_manager(getGdkDisplay());
+GdkDevice* pPointer =
gdk_device_manager_get_client_pointer(pDeviceManager);
+if (bGrab)
+gdk_device_grab(pPointer, widget_get_window(m_pWindow),
GDK_OWNERSHIP_NONE, bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor,
GDK_CURRENT_TIME);
+else
+gdk_device_ungrab(pPointer, GDK_CURRENT_TIME);
+#else
+if( bGrab )
{
-if( bGrab )
+bool bUseGdkGrab = true;
+const std::list< SalFrame* >& rFrames = getDisplay()->getFrames();
+for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it
!= rFrames.end(); ++it )
{
-bool bUseGdkGrab = true;
-const std::list< SalFrame* >& rFrames = getDisplay()->getFrames();
-for( std::list< SalFrame* >::const_iterator it = rFrames.begin();
it != rFrames.end(); ++it )
-{
-const GtkSalFrame* pFrame = static_cast< const GtkSalFrame*
>(*it);
-if( pFrame->m_bWindowIsGtkPlug )
-{
-bUseGdkGrab = false;
-break;
-}
-}
-if( bUseGdkGrab )
-{
-const int nMask = ( GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK );
-
-if( !pEnv || !*pEnv )
-gdk_pointer_grab( widget_get_window( m_pWindow ),
bOwnerEvents,
- (GdkEventMask) nMask, NULL,
m_pCurrentCursor,
- GDK_CURRENT_TIME );
-}
-else
+const GtkSalFrame* pFrame = static_cast< const GtkSalFrame* >(*it);
+if( pFrame->m_bWindowIsGtkPlug )
{
-// FIXME: for some unknown reason gdk_pointer_grab does not
-// really produce owner events for GtkPlug windows
-// the cause is yet unknown
-
-// this is of course a bad hack, especially as we cannot
-// set the right cursor this way
-if( !pEnv || !*pEnv )
-XGrabPointer( getDisplay()->GetDisplay(),
- widget_get_xid( m_pWindow ),
- bOwnerEvents,
- PointerMotionMask | ButtonPressMask |
ButtonReleaseMask,
- GrabModeAsync,
- GrabModeAsync,
- None,
- None,
- CurrentTime
-);
-
+bUseGdkGrab = false;
+break;
}
}
+if( bUseGdkGrab )
+{
+gdk_pointer_grab( widget_get_window( m_pWindow ), bOwnerEvents,
+ (GdkEventMask) nMask, NULL, m_pCurrentCursor,
+ GDK_CURRENT_TIME );
+}
else
{
-// Two GdkDisplays may be open
-if( !pEnv || !*pEnv )
-{
-gdk_display_pointer_ungrab( getGdkDisplay(), GDK_CURRENT_TIME);
-}
+// FIXME: for some unknown reason gdk_pointer_grab does not
+// really produce owner events for GtkPlug windows
+// the cause is yet unknown
+
+// this is of course a bad hack, especially as we cannot
+// set the right cursor this way
+XGrabPointer( getDisplay()->GetDisplay(),
+ widget_get_xid( m_pWindow ),
+ bOwnerEvents,
+ PointerMotionMask | ButtonPressMask |
ButtonReleaseMask,
+ GrabModeAsync,
+ GrabModeAsync,
+ None
[Libreoffice-commits] core.git: include/basegfx
include/basegfx/numeric/ftools.hxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 2c798538041310294ac7900b110620a8eece9150
Author: Caolán McNamara
Date: Thu May 21 16:02:42 2015 +0100
Revert "fTools::getSmallValue() is not used anymore"
to fix the build
This reverts commit ce7d80c69d936e844ec4ed930264bfc8cadacde1.
diff --git a/include/basegfx/numeric/ftools.hxx
b/include/basegfx/numeric/ftools.hxx
index 32c7654..b4ae0a4 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -151,10 +151,13 @@ namespace basegfx
class BASEGFX_DLLPUBLIC fTools
{
public:
+/// Get threshold value for equalZero and friends
+static double getSmallValue() { return 0.1f; }
+
/// Compare against small value
static bool equalZero(const double& rfVal)
{
-return (fabs(rfVal) <= 0.1f);
+return (fabs(rfVal) <= getSmallValue());
}
/// Compare against given small value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - distro-configs/LibreOfficeWin64.conf
distro-configs/LibreOfficeWin64.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 00c9a5ce8712723ba31918dd5afdb3ce8a2a22f0 Author: Thorsten Behrens Date: Thu May 21 17:03:31 2015 +0200 win64: disable non-working experimental firebird sdbc for the while Change-Id: I9ddb09c08c2984249a6b8c7efc7fd52d3cf95bd0 diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 1c3ee28..5fa640d 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -8,6 +8,7 @@ --enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-online-update +--disable-firebird-sdbc --with-help --with-myspell-dicts --with-package-format=msi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_docbookexport.mk sw/Module_sw.mk sw/qa
sw/CppunitTest_sw_docbookexport.mk| 58 ++
sw/Module_sw.mk |1
sw/qa/extras/docbookexport/data/simple.docx |binary
sw/qa/extras/docbookexport/data/tdf91095.docx |binary
sw/qa/extras/docbookexport/docbookexport.cxx | 50 ++
5 files changed, 109 insertions(+)
New commits:
commit fb8377fe404564871d7be8cf777abe2108c74951
Author: Laurent Godard
Date: Wed May 6 16:36:52 2015 +0200
unit test for tdf#91095
and ready for any docbook export tests
Change-Id: Ia1c7a5066fc72c502c3b0ebb5811910797943742
Reviewed-on: https://gerrit.libreoffice.org/15653
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/CppunitTest_sw_docbookexport.mk
b/sw/CppunitTest_sw_docbookexport.mk
new file mode 100644
index 000..9bed3e13
--- /dev/null
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_docbookexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_docbookexport, \
+sw/qa/extras/docbookexport/docbookexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_docbookexport, \
+comphelper \
+cppu \
+ cppuhelper \
+ i18nlangtag \
+sal \
+sw \
+test \
+ tl \
+unotest \
+utl \
+vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_docbookexport,\
+ boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_docbookexport,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_docbookexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_docbookexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_docbookexport,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_docbookexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 13453b5..ce01e9a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,6 +48,7 @@ endif
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sw_uwriter) \
+CppunitTest_sw_docbookexport \
CppunitTest_sw_htmlexport \
CppunitTest_sw_htmlimport \
CppunitTest_sw_macros_test \
diff --git a/sw/qa/extras/docbookexport/data/simple.docx
b/sw/qa/extras/docbookexport/data/simple.docx
new file mode 100644
index 000..89081fd
Binary files /dev/null and b/sw/qa/extras/docbookexport/data/simple.docx differ
diff --git a/sw/qa/extras/docbookexport/data/tdf91095.docx
b/sw/qa/extras/docbookexport/data/tdf91095.docx
new file mode 100644
index 000..fbe23c8
Binary files /dev/null and b/sw/qa/extras/docbookexport/data/tdf91095.docx
differ
diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx
b/sw/qa/extras/docbookexport/docbookexport.cxx
new file mode 100644
index 000..2f52546
--- /dev/null
+++ b/sw/qa/extras/docbookexport/docbookexport.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+class DocbookExportTest : public SwModelTestBase
+{
+private:
+FieldUnit m_eUnit;
+
+public:
+DocbookExportTest() :
+SwModelTestBase("/sw/qa/extras/docbookexport/data/", "DocBook File"),
+m_eUnit(FUNIT_NONE)
+{}
+};
+
+#define DECLARE_DOCBOOKEXPORT_TEST(TestName, filename)
DECLARE_SW_EXPORT_TEST(TestName, filename, DocbookExportTest)
+
+DECLARE_DOCBOOKEXPORT_TEST(testsimple, "simple.docx")
+{
+xmlDocPtr pDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+assertXPathContent(pDoc, "/article/para", "");
+}
+
+/* the test actually should crash with this file */
+DECLARE_DOCBOOKEXPORT_TEST(testtdf91095, "tdf91095.docx")
+{
+xmlDocPtr pDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+}
+
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libre
minutes of ESC call ...
* Present: + Lionel, Norbert, Michael M., Stephan, Caolan, Tor, Laszlo, Miklos, Kendy, Andras, Sam, Bjoern, Thorsten, Muthu, Christian, Sophie, Cedric, Michael S, Robinson * Completed Action Items: + review bin/rename-sw-abbreviations.sh (All writer-types) [ completed, and is the branch-off point for 5.0 ] * Pending Action Items: + please forward numbers to Fridrich/Thorsten/Cedric (Thorsten, Kendy) + find some developer/sysadmin'y type people to train in CI maintenance (Cloph) [ no time scheduled; after the call ] + move problem writer tests from check -> subsequentcheck for sw.all (Michael S) [ pending wait for result of subsequentcheck enabling on Jenkins, been set on Linux build for some weeks, all working fine for some weeks (Norbert) ] * GSoC (Cedric) + make sure students on-track; coding starts next monday ... + make sure students wake up Monday (or Tue. if a public holiday) + Nov 7th & 8th - Mentor summit * Release Engineering update (Christian) + 5.0.0 - Beta 0 + branched off - tag created by Alex. + worked well + builds on pre-release server, announced early-testing & QA list + available for the bug-hunt this weekend. + Late Features: + LibreOfficeKit / Online tweaks (Michael) + only bug-fixes so far; non-controversial (Kendy) + in the unstable part of LibreOfficeKit + in case it's a feature - ask for 3x approvals here + only the #ifdef UNSTABLE_API ifdefs anyway + no concerns. + OpenGL / double-buffer RenderContext (Kendy/Quikee) + available in 5.0 by default; widgets need annotating as to (Kendy) whether they work for double buffering or not. + would like to enable double buffering as it is fixed up + improvements in non-flickering-ness. + get non-controversial parts in & ask for wider review (Kendy) + happy to review (Caolan) + desire to get OpenGL working well for 5.0 @ Collabora (Michael) + concerns wrt. a few rendering regressions (Markus) + see how some widgets are created. + have an idea how much work & how dangerous + 2nd big VCL change in 5.0 + interested in the bugs (Kendy) + Tomaz willing to fix that + dialogs not updating so fast anymore; had a few where it can be seen how they are created (Markus) + could be Idle timer issues, or VclPtr, or OpenGL (Michael) + concerned wrt. regressions in the release cycle (Markus) + fixing VCL issues takes a while (Markus) + double-buffer, guarded with a variable (Kendy) + can disable it before the release if an issue + can disable it per-class, etc. + review in a week - see if we can fix the rendering. + gtk3+ theming, embedded video, cut/paste (Caolan) + showing it off at the hack-fest + some parts better than gtk2 theming; list buttons / boxes etc. + focus frames - look better etc. + gtk3 theming; they're still working on it inside gtk3 + ABI issues in gtk port + missing cut/paste & embedded videos + some temp-popup windows not working. + incredibly isolated (Michael) + some long stretch headless backend (Caolan) + no concerns. + Windows 64 (Norbert) + setting up a tinderbox but: + OLE crashing in the basic tests. (VBATest::testMiscOLEStuff) + basic build unit test failing + only 1x big Amazon Windows build. + would be lovely to see it working (Thorsten) + are we blocking on CI ? + my builds pass (Thorsten) + nothing tweaked now/in in W2012r2 and VS 2013 (Norbert) + same for Thorsten + compare configure options (Thorsten, Norbert, Cloph) AI: + firebird_sdbc disable by default in the config (Thorsten) + remove the addressbook thunderbird / driver bits too AI: + disable by default in favour of mork (Thorsten) + people complain when Win64 bit tinderbox stops building too (Thorsten) + its being tested
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit b45c1cd7e7108a1101c556aae48ababc8832d2a9
Author: Markus Mohrhard
Date: Thu May 21 15:57:52 2015 +0200
introduce some dbgutil calc data dumps
Currently CTRL+SHIFT+F12 will dump the column width in pixel
of the first 20 columns.
Change-Id: I7184eae8d1cde9be7ea067aab6b4b5fb1b6b8b0f
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5f2a06a..2228a66 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3507,6 +3507,22 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
}
+#ifdef DBG_UTIL
+
+if (rKeyCode.IsMod1() && rKeyCode.IsShift() && rKeyCode.GetCode() ==
KEY_F12)
+{
+ScDocument* pDoc = pViewData->GetDocument();
+for (SCCOL nCol = 0; nCol <= 20; ++nCol)
+{
+SCTAB nTab = pViewData->GetTabNo();
+sal_uInt16 nWidth = pDoc->GetColWidth(nCol, nTab, true);
+long nPixel = LogicToPixel(Point(nWidth, 0),
MapMode(MAP_TWIP)).getX();
+std::cout << "Column: " << nCol << ", Width: " << nPixel << "px"
<< std::endl;
+}
+}
+
+#endif
+
Window::KeyInput(rKEvt);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/svdlayer.hxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 25e975857780e4fc4c03255cf977ddc82662b2ac
Author: Sam Tuke
Date: Thu May 21 13:51:52 2015 +0100
Translated some German comments to English
Change-Id: I448b15418ff3c029fb8fb3d1e94a9babed29c85d
Reviewed-on: https://gerrit.libreoffice.org/15844
Reviewed-by: Björn Michaelsen
Tested-by: Jenkins
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index a0d0dc8..d485ed9 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -57,15 +57,15 @@ public:
SdrLayerIDGetID() const { return nID; }
void SetModel(SdrModel* pNewModel) {
pModel=pNewModel; }
SdrModel* GetModel() const{ return pModel;
}
-// Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll.
-// Es wird dann laenderspeziefisch der passende Name gesetzt. SetName()
-// setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined".
+// A SdrLayer should be considered the standard Layer. It shall then set
the
+// appropriate country-specific name. SetName() sets the "StandardLayer"
flag
+// and if necessary returns "Userdefined".
void SetStandardLayer(bool bStd = true);
bool IsStandardLayer() const { return
nType==1; }
};
-// Beim Aendern von Layerdaten muss man derzeit
-// noch selbst das Modify-Flag am Model setzen.
+// When Changing the layer data you currently have to set the Modify-Flag
+// manually
#define SDRLAYER_MAXCOUNT 255
class SVX_DLLPUBLIC SdrLayerAdmin {
friend class SdrView;
@@ -75,7 +75,7 @@ friend class SdrPage;
protected:
std::vector aLayer;
SdrLayerAdmin* pParent; // Der Admin der Seite kennt den Admin des Docs
-SdrModel* pModel; // zum Broadcasten
+SdrModel* pModel; // for broadcasting
OUString maControlLayerName;
protected:
// Eine noch nicht verwendete LayerID raussuchen. Sind bereits alle
@@ -111,9 +111,9 @@ public:
Broadcast();
}
SdrLayer*RemoveLayer(sal_uInt16 nPos);
-// Alle Layer loeschen
+// Delete the entire layer
void ClearLayer();
-// Neuer Layer wird angelegt und eingefuegt
+// New layer is created and inserted
SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0x);
void DeleteLayer(SdrLayer* pLayer)
{
@@ -124,10 +124,10 @@ public:
delete pLayer;
Broadcast();
}
-// Neuer Layer, Name wird aus der Resource geholt
+// New layer, name is retrieved from the resource
SdrLayer* NewStandardLayer(sal_uInt16 nPos=0x);
-// Iterieren ueber alle Layer
+// Iterate over all layers
sal_uInt16 GetLayerCount() const
{ return sal_uInt16(aLayer.size()); }
SdrLayer* GetLayer(sal_uInt16 i)
{ return aLayer[i]; }
const SdrLayer*GetLayer(sal_uInt16 i) const
{ return aLayer[i]; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/UnpackedTarball_libetonyek.mk |1 +
external/libetonyek/ubsan.patch | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit 15cc77f8d3d1edfd0e8114829bc4b340c3d73b4d
Author: Stephan Bergmann
Date: Thu May 21 16:25:54 2015 +0100
external/libetonyek: -fsanitize=enum
e.g., during CppunitTest_writerperfect_impress
Change-Id: Ib9eb7a9ba7c9bad9cc43fbe2132ca315e2f28c0a
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index c531894..834bef2b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
+ external/libetonyek/ubsan.patch \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE)
diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch
new file mode 100644
index 000..f0ab147
--- /dev/null
+++ b/external/libetonyek/ubsan.patch
@@ -0,0 +1,11 @@
+--- src/lib/contexts/IWORKPropertyMapElement.cpp
src/lib/contexts/IWORKPropertyMapElement.cpp
+@@ -264,7 +264,7 @@
+
+ void AlignmentElement::endOfElement()
+ {
+- IWORKAlignment prop;
++ IWORKAlignment prop = IWORK_ALIGNMENT_LEFT;
+
+ if (m_value)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sfx2/source
sd/source/ui/animations/CustomAnimationPane.cxx | 102 +++-
sfx2/source/dialog/dockwin.cxx |3
2 files changed, 53 insertions(+), 52 deletions(-)
New commits:
commit 99938e7bc8a305dcc9733adbe635e25a38afed31
Author: Michael Meeks
Date: Thu May 21 16:26:37 2015 +0100
tdf#91381 - fix a couple of animation related lifecycle issues.
Change-Id: I4aada7f27e3a88124ad670e62ddb6c92ecf431a8
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index d7a97cb..ca19853 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1752,76 +1752,74 @@ void CustomAnimationPane::onChange( bool bCreate )
}
}
-VclPtrInstance< CustomAnimationCreateDialog > pDlg( this, this, aTargets,
bHasText, sPresetId, fDuration );
-if( pDlg->Execute() )
{
-addUndo();
-fDuration = pDlg->getSelectedDuration();
-CustomAnimationPresetPtr pDescriptor = pDlg->getSelectedPreset();
-if( pDescriptor.get() )
+ScopedVclPtrInstance< CustomAnimationCreateDialog > pDlg( this, this,
aTargets, bHasText, sPresetId, fDuration );
+if( pDlg->Execute() )
{
-if( bCreate )
+addUndo();
+fDuration = pDlg->getSelectedDuration();
+CustomAnimationPresetPtr pDescriptor = pDlg->getSelectedPreset();
+if( pDescriptor.get() )
{
-mpCustomAnimationList->SelectAll( false );
-
-// gather shapes from the selection
-std::vector< Any >::iterator aIter( aTargets.begin() );
-const std::vector< Any >::iterator aEnd( aTargets.end() );
-bool bFirst = true;
-for( ; aIter != aEnd; ++aIter )
+if( bCreate )
{
-CustomAnimationEffectPtr pCreated =
mpMainSequence->append( pDescriptor, (*aIter), fDuration );
+mpCustomAnimationList->SelectAll( false );
-// if only one shape with text and no fill or outline is
selected, animate only by first level paragraphs
-if( bHasText && (aTargets.size() == 1) )
+// gather shapes from the selection
+std::vector< Any >::iterator aIter( aTargets.begin() );
+const std::vector< Any >::iterator aEnd( aTargets.end() );
+bool bFirst = true;
+for( ; aIter != aEnd; ++aIter )
{
-Reference< XShape > xShape( (*aIter), UNO_QUERY );
-if( xShape.is() && !hasVisibleShape( xShape ) )
+CustomAnimationEffectPtr pCreated =
mpMainSequence->append( pDescriptor, (*aIter), fDuration );
+
+// if only one shape with text and no fill or outline
is selected, animate only by first level paragraphs
+if( bHasText && (aTargets.size() == 1) )
{
-mpMainSequence->createTextGroup( pCreated, 1,
-1.0, false, false );
+Reference< XShape > xShape( (*aIter), UNO_QUERY );
+if( xShape.is() && !hasVisibleShape( xShape ) )
+{
+mpMainSequence->createTextGroup( pCreated, 1,
-1.0, false, false );
+}
}
-}
-if( bFirst )
-bFirst = false;
-else
-pCreated->setNodeType( EffectNodeType::WITH_PREVIOUS );
+if( bFirst )
+bFirst = false;
+else
+pCreated->setNodeType(
EffectNodeType::WITH_PREVIOUS );
-if( pCreated.get() )
-{
-mpCustomAnimationList->select( pCreated );
+if( pCreated.get() )
+mpCustomAnimationList->select( pCreated );
}
}
-}
-else
-{
-MainSequenceRebuildGuard aGuard( mpMainSequence );
-
-// get selected effect
-EffectSequence::iterator aIter( maListSelection.begin() );
-const EffectSequence::iterator aEnd( maListSelection.end() );
-while( aIter != aEnd )
+else
{
-CustomAnimationEffectPtr pEffect = (*aIter++);
+MainSequenceRebuildGuard aGuard( mpMainSequence );
-EffectSequenceHelper* pEffectSequence =
pEffect->getEffectSequence();
-if( !pEffectSequence )
-pEffectSequence = mpMainSequence.
[Bug 47652] Provide stacktraces for crashes in existing bug reports
https://bugs.documentfoundation.org/show_bug.cgi?id=47652 --- Comment #6 from Michael Stahl --- how to get a backtrace on Linux, Windows or Mac is documented on this page: https://wiki.documentfoundation.org/QA/BugReport/Debug_Information -- 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 46892] Provide stacktraces for crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=46892 --- Comment #7 from Michael Stahl --- how to get a backtrace on Linux, Windows or Mac is documented on this page: https://wiki.documentfoundation.org/QA/BugReport/Debug_Information -- 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: vcl/android vcl/inc
vcl/android/androidinst.cxx | 107
vcl/inc/android/androidinst.hxx |3 -
2 files changed, 110 deletions(-)
New commits:
commit ff2c4ee8a5416c90b1344cb95b69483156d4d210
Author: Tor Lillqvist
Date: Thu May 21 15:24:59 2015 +0100
Bin unused code
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 03ddd0b..82c4a33 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -38,90 +38,6 @@ public:
virtual bool ErrorTrapPop( bool ) { return false; }
};
-static void BlitFrameRegionToWindow(ANativeWindow_Buffer *pOutBuffer,
-const basebmp::BitmapDeviceSharedPtr& aDev,
-const ARect &rSrcRect,
-int nDestX, int nDestY)
-{
-basebmp::RawMemorySharedArray aSrcData = aDev->getBuffer();
-basegfx::B2IVector aDevSize = aDev->getSize();
-sal_Int32 nStride = aDev->getScanlineStride();
-unsigned char *pSrc = aSrcData.get();
-
-// FIXME: do some cropping goodness on aSrcRect to ensure no overflows etc.
-ARect aSrcRect = rSrcRect;
-
-for (unsigned int y = 0; y < (unsigned int)(aSrcRect.bottom -
aSrcRect.top); y++)
-{
-unsigned char *sp = ( pSrc + nStride * (aSrcRect.top + y) +
- aSrcRect.left * 4 /* src pixel size */ );
-
-switch (pOutBuffer->format) {
-case WINDOW_FORMAT_RGBA_:
-case WINDOW_FORMAT_RGBX_:
-{
-unsigned char *dp = ( (unsigned char *)pOutBuffer->bits +
- pOutBuffer->stride * 4 * (y + nDestY) +
- nDestX * 4 /* dest pixel size */ );
-for (unsigned int x = 0; x < (unsigned int)(aSrcRect.right -
aSrcRect.left); x++)
-{
-dp[x*4 + 0] = sp[x*4 + 0]; // R
-dp[x*4 + 1] = sp[x*4 + 1]; // G
-dp[x*4 + 2] = sp[x*4 + 2]; // B
-dp[x*4 + 3] = 255; // A
-}
-break;
-}
-case WINDOW_FORMAT_RGB_565:
-{
-unsigned char *dp = ( (unsigned char *)pOutBuffer->bits +
- pOutBuffer->stride * 2 * (y + nDestY) +
- nDestX * 2 /* dest pixel size */ );
-for (unsigned int x = 0; x < (unsigned int)(aSrcRect.right -
aSrcRect.left); x++)
-{
-unsigned char b = sp[x*3 + 0]; // B
-unsigned char g = sp[x*3 + 1]; // G
-unsigned char r = sp[x*3 + 2]; // R
-dp[x*2 + 0] = (r & 0xf8) | (g >> 5);
-dp[x*2 + 1] = ((g & 0x1c) << 5) | ((b & 0xf8) >> 3);
-}
-break;
-}
-default:
-LOGI("unknown pixel format %d !", pOutBuffer->format);
-break;
-}
-}
-}
-
-void AndroidSalInstance::BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
- const
basebmp::BitmapDeviceSharedPtr& aDev)
-{
-basegfx::B2IVector aDevSize = aDev->getSize();
-ARect aWhole = { 0, 0, aDevSize.getX(), aDevSize.getY() };
-BlitFrameRegionToWindow(pOutBuffer, aDev, aWhole, 0, 0);
-}
-
-void AndroidSalInstance::RedrawWindows(ANativeWindow_Buffer *pBuffer)
-{
-if (pBuffer->bits != NULL)
-{
-int i = 0;
-std::list< SalFrame* >::const_iterator it;
-for ( it = getFrames().begin(); it != getFrames().end(); i++, ++it )
-{
-SvpSalFrame *pFrame = static_cast(*it);
-
-if (pFrame->IsVisible())
-{
-BlitFrameToWindow (pBuffer, pFrame->getDevice());
-}
-}
-}
-else
-LOGI("no buffer for locked window");
-}
-
void AndroidSalInstance::damaged(AndroidSalFrame */* frame */)
{
static bool beenHere = false;
@@ -148,29 +64,6 @@ void AndroidSalInstance::GetWorkArea( Rectangle& rRect )
Size( viewWidth, viewHeight ) );
}
-/*
- * Try too hard to get a frame, in the absence of anything better to do
- */
-SalFrame *AndroidSalInstance::getFocusFrame() const
-{
-SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
-if (!pFocus) {
-LOGI("no focus frame, re-focusing first visible frame");
-const std::list< SalFrame* >& rFrames( getFrames() );
-for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it
!= rFrames.end(); ++it )
-{
-SvpSalFrame *pFrame = const_cast(static_cast(*it));
-if( pFrame->IsVisible() )
-{
-pFrame->GetFocus();
-pFocus = pFrame;
-break;
-}
-}
-}
-return pFocus;
-}
-
AndroidSalInstance *AndroidSalInstance::getInstance()
{
if (!ImplGetSVData())
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 79dad74..f99de12 100644
--- a/vcl
[Bug 50100] [Task] Verify a Bugfix
https://bugs.documentfoundation.org/show_bug.cgi?id=50100 --- Comment #4 from Björn Michaelsen --- (In reply to samtuke from comment #3) > The bugzilla search query now returns zero results... Indeed: freedesktop needed to be replaced with documentfoundation as we now have our own bugzilla: https://bugs.documentfoundation.org/buglist.cgi?bug_status=RESOLVED&chfield=bug_status&chfieldfrom=-4w&chfieldto=-2d&chfieldvalue=RESOLVED&list_id=538110&product=LibreOffice&query_format=advanced&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: vcl/inc
vcl/inc/android/androidinst.hxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit cf78adf518a91a8f070d7cdcccb1973e58195e84
Author: Tor Lillqvist
Date: Thu May 21 16:46:18 2015 +0100
Bin one leftover
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index f99de12..21c6583 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -19,9 +19,6 @@
class AndroidSalFrame;
class AndroidSalInstance : public SvpSalInstance
{
-void BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
- const basebmp::BitmapDeviceSharedPtr& aDev);
-
// This JNIEnv is valid only in the thread where this
// AndroidSalInstance object is created, which is the "LO" thread
// in which soffice_main() runs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/writer/MSWorksImportFilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dae9a386bacc08a55eda96e1e8925883a4fa494d
Author: Stephan Bergmann
Date: Thu May 21 16:46:08 2015 +0100
-fsanitize=bool (during CppunitTest_writerperfect_writer)
...as libwps::WPSDocument::isFileFormatSupported doesn't necessarily write
false
into its needCharSetEncoding param ("A flag set to true if we need the
character
set encoding"), whether or not that's a good idea.
Change-Id: Ib094a0fed84b6e6ff66e9b8a2524f55a60de64ef
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 018f790..90bb62d 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -37,7 +37,7 @@ bool
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
{
libwps::WPSKind kind = libwps::WPS_TEXT;
libwps::WPSCreator creator;
-bool needEncoding;
+bool needEncoding = false;
const libwps::WPSConfidence confidence =
libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator,
needEncoding);
std::string fileEncoding("");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - svtools/source
svtools/source/dialogs/RemoteFilesDialog.cxx | 30 ++-
1 file changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 060bafcdf8698f15e7246b41dd91371440115fe0
Author: Szymon KÅos
Date: Thu May 21 17:53:55 2015 +0200
filter places and add only remote services
Change-Id: If4ced3f6766f07dfb454a5c8056a98d8365dcf70
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index e91cf19..28b153d 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -11,6 +11,8 @@
using namespace ::com::sun::star::uno;
+const OUString sLocalFilePrefix = "file://";
+
RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent, WinBits nBits)
: ModalDialog(pParent, "RemoteFilesDialog", "svt/ui/remotefilesdialog.ui")
, m_context(comphelper::getProcessComponentContext())
@@ -47,15 +49,18 @@ void RemoteFilesDialog::fillServicesListbox()
Sequence< OUString >
placesUrlsList(officecfg::Office::Common::Misc::FilePickerPlacesUrls::get(m_context));
Sequence< OUString >
placesNamesList(officecfg::Office::Common::Misc::FilePickerPlacesNames::get(m_context));
-// TODO: filter - only online services
if(placesUrlsList.getLength() > 0 && placesNamesList.getLength() > 0)
{
for(sal_Int32 nPlace = 0; nPlace < placesUrlsList.getLength() &&
nPlace < placesNamesList.getLength(); ++nPlace)
{
-ServicePtr pService(new Place(placesNamesList[nPlace],
placesUrlsList[nPlace], true));
-m_aServices.push_back(pService);
+// Add only remote services, not local bookmarks
+if(placesUrlsList[nPlace].compareTo(sLocalFilePrefix,
sLocalFilePrefix.getLength()) != 0)
+{
+ServicePtr pService(new Place(placesNamesList[nPlace],
placesUrlsList[nPlace], true));
+m_aServices.push_back(pService);
-m_pServices_lb->InsertEntry(placesNamesList[nPlace]);
+m_pServices_lb->InsertEntry(placesNamesList[nPlace]);
+}
}
m_pServices_lb->SelectEntryPos(0);
@@ -80,18 +85,15 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl )
m_pServices_lb->InsertEntry(newService->GetName());
m_pServices_lb->SelectEntryPos(m_pServices_lb->GetEntryCount() -
1);
-// save services
+// load all places (with local bookmarks), add new service and
save all
-Sequence< OUString > placesUrlsList(m_aServices.size());
-Sequence< OUString > placesNamesList(m_aServices.size());
+Sequence< OUString >
placesUrlsList(officecfg::Office::Common::Misc::FilePickerPlacesUrls::get(m_context));
+placesUrlsList.realloc(placesUrlsList.getLength() + 1);
+Sequence< OUString >
placesNamesList(officecfg::Office::Common::Misc::FilePickerPlacesNames::get(m_context));
+placesNamesList.realloc(placesNamesList.getLength() + 1);
-int i = 0;
-for(std::vector::const_iterator it =
m_aServices.begin(); it != m_aServices.end(); ++it)
-{
-placesUrlsList[i] = (*it)->GetUrl();
-placesNamesList[i] = (*it)->GetName();
-i++;
-}
+placesUrlsList[placesUrlsList.getLength() - 1] =
newService->GetUrl();
+placesNamesList[placesNamesList.getLength() - 1] =
newService->GetName();
std::shared_ptr
batch(comphelper::ConfigurationChanges::create(m_context));
officecfg::Office::Common::Misc::FilePickerPlacesUrls::set(placesUrlsList,
batch);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental README.cross
README.cross | 16 android/experimental/DocumentLoader/AndroidManifest.xml | 23 android/experimental/DocumentLoader/Makefile | 37 android/experimental/DocumentLoader/build.xml | 84 android/experimental/DocumentLoader/fonts.conf | 154 - android/experimental/DocumentLoader/jni/Android.mk |8 android/experimental/DocumentLoader/project.properties | 14 android/experimental/DocumentLoader/res/menu/option.xml |5 android/experimental/DocumentLoader/res/values/strings.xml |4 android/experimental/DocumentLoader/src/com/polites/android/Animation.java | 28 android/experimental/DocumentLoader/src/com/polites/android/Animator.java | 91 android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java | 70 android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java | 24 android/experimental/DocumentLoader/src/com/polites/android/GestureImageView.java | 718 -- android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java | 26 android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewTouchListener.java | 565 android/experimental/DocumentLoader/src/com/polites/android/MathUtils.java | 76 android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java | 102 android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java | 22 android/experimental/DocumentLoader/src/com/polites/android/VectorF.java | 63 android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java | 162 - android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java | 21 android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java | 1140 -- 23 files changed, 4 insertions(+), 3449 deletions(-) New commits: commit 1b53066433d1db9c3bfc3c6e6618565c15642b59 Author: Tor Lillqvist Date: Thu May 21 16:54:28 2015 +0100 Bin the 'DocumentLoader' Android test app It is the wrong approach, from the time before tiled rendering, and has not been built for a long time. diff --git a/README.cross b/README.cross index efaa8c2..ad1475a 100644 --- a/README.cross +++ b/README.cross @@ -352,18 +352,10 @@ And here is an (quite old) autogen.input for Android on X86: --enable-ccache --with-distro=LibreOfficeAndroidX86 -There are a couple of (more or less) interactive apps that you can run -on the emulator or on a device that use LibreOffice code. Look in -android/experimental. DocumentLoader is just a testbench, really for -code to load a document (just Writer ones so far) and display one page -at a time. LibreOffice4Android is what resulted from a Google Summer -of Code project in 2012, a document viewer. desktop is a totally -different app, where the actual LibreOffice desktop GUI is present. -Note that none of these apps in any way are claimed to be ready for -end-users. No "beta testing" offers needed, it is painfully obvious -what problems they have. - -To run some of the apps, do "make install" followed by either "make run" or +A LibreOffice app for Android is being developed progress in the +android/experimental/LOAndroid3 directory. + +To run the app, do "make install" followed by either "make run" or starting it from Android itself. You most likely want to have an "adb logcat" running in another window. To debug, run "make debugrun". diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml b/android/experimental/DocumentLoader/AndroidManifest.xml deleted file mode 100644 index 366a1c9..000 --- a/android/experimental/DocumentLoader/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - -http://schemas.android.com/apk/res/android"; - package="org.libreoffice.android.examples" - android:installLocation="preferExternal" - android:versionCode="1" - android:versionName="1.0"> - - - - - - - - - - - diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile deleted file mode 100644 index dbe2b5c..000 --- a/android/experimental/DocumentLoader/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -ifeq ($(BUILDDIR),) -include ../../../config_host.mk -endif - -# The defa
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.documentfoundation.org/show_bug.cgi?id=34555 Mike §chinagl changed: What|Removed |Added CC||librele...@gmx.de --- Comment #66 from Mike §chinagl --- This bug fix is mentioned in the release notes of the coming LibreOffice 5.0 (see release notes https://wiki.documentfoundation.org/ReleaseNotes/5.0). Therefore it would be wonderful if this feature really worked well, otherwise it should not be mentioned in the release notes. In the notes it reads: Crop, change and save an image tdf#34555 (Philippe Jung) It is now possible from Format ▸ Image menu, from contextual menu and from graphic toolbar, to Crop an Image with the mouse, to Save an image and to Change it by another image from disk. These functionalities behave like in Impress or Writer. Format menu has been updated accordingly: there is now Format ▸ Object entry with Position and Size, Line, Area, Define Text Attributes and Points, Format ▸ Image entry with Crop, Edit with External Tool, Change Image, Compress Image, Save Image. -- 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: android/Bootstrap android/CustomTarget_lo_android.mk android/experimental android/source
android/Bootstrap/Makefile.shared |4 android/CustomTarget_lo_android.mk |8 android/experimental/LOAndroid3/AndroidManifest.xml.in | 112 - android/experimental/LOAndroid3/Makefile | 42 android/experimental/LOAndroid3/build.xml | 84 android/experimental/LOAndroid3/fonts.conf | 154 - android/experimental/LOAndroid3/jni/Android.mk |8 android/experimental/LOAndroid3/proguard-project.txt | 20 android/experimental/LOAndroid3/project.properties | 15 android/experimental/LOAndroid3/res/drawable/bg_striped.xml |6 android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml |6 android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml | 15 android/experimental/LOAndroid3/res/drawable/handle_end_level.xml | 14 android/experimental/LOAndroid3/res/drawable/handle_start_level.xml | 14 android/experimental/LOAndroid3/res/layout/about.xml | 47 android/experimental/LOAndroid3/res/layout/activity_document_browser.xml | 36 android/experimental/LOAndroid3/res/layout/activity_main.xml | 65 android/experimental/LOAndroid3/res/layout/document_part_list_layout.xml | 20 android/experimental/LOAndroid3/res/layout/document_viewer.xml | 33 android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml | 37 android/experimental/LOAndroid3/res/layout/file_grid.xml | 25 android/experimental/LOAndroid3/res/layout/file_list.xml | 20 android/experimental/LOAndroid3/res/layout/file_list_item.xml | 41 android/experimental/LOAndroid3/res/layout/item_in_drawer.xml | 17 android/experimental/LOAndroid3/res/layout/main.xml | 22 android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml | 23 android/experimental/LOAndroid3/res/layout/text_selection_handles.xml | 14 android/experimental/LOAndroid3/res/layout/toolbar.xml | 10 android/experimental/LOAndroid3/res/menu/context_menu.xml |7 android/experimental/LOAndroid3/res/menu/main.xml | 54 android/experimental/LOAndroid3/res/menu/view_menu.xml | 19 android/experimental/LOAndroid3/res/values-v21/themes.xml | 18 android/experimental/LOAndroid3/res/values/arrays.xml | 59 android/experimental/LOAndroid3/res/values/attrs.xml | 17 android/experimental/LOAndroid3/res/values/colors.xml | 95 android/experimental/LOAndroid3/res/values/dimens.xml |8 android/experimental/LOAndroid3/res/values/ids.xml |4 android/experimental/LOAndroid3/res/values/strings.xml | 59 android/experimental/LOAndroid3/res/values/themes.xml | 17 android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml | 32 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java | 21 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java | 51 android/experimental/LOAndroid3/src/ja
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/docbookexport/docbookexport.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 70c307f0a5a81fb6f3e92f1c52b4372d36922c4b
Author: Miklos Vajna
Date: Thu May 21 17:47:01 2015 +0100
CppunitTest_sw_docbookexport: -Werror,-Wunused-private-field
Change-Id: I51586c4187948aeb62cc3ca92e61e96681be02cd
diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx
b/sw/qa/extras/docbookexport/docbookexport.cxx
index 2f52546..d341a3c 100644
--- a/sw/qa/extras/docbookexport/docbookexport.cxx
+++ b/sw/qa/extras/docbookexport/docbookexport.cxx
@@ -17,13 +17,9 @@
class DocbookExportTest : public SwModelTestBase
{
-private:
-FieldUnit m_eUnit;
-
public:
DocbookExportTest() :
-SwModelTestBase("/sw/qa/extras/docbookexport/data/", "DocBook File"),
-m_eUnit(FUNIT_NONE)
+SwModelTestBase("/sw/qa/extras/docbookexport/data/", "DocBook File")
{}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/.gitignore |2 -- 1 file changed, 2 deletions(-) New commits: commit 97b096275af7054aed6cc8715e5cb968d7e5163f Author: Miklos Vajna Date: Thu May 21 17:51:37 2015 +0100 android: leftover gitignore Change-Id: I45a709d805e8706a2f186fd44b4f467d173bc61e diff --git a/android/experimental/.gitignore b/android/experimental/.gitignore deleted file mode 100644 index e63eb4a..000 --- a/android/experimental/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*/jni/Application.mk -*/liblo-native-code.map ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Makefile android/README configure.ac .gitignore libreofficekit/source Makefile.in README.cross
.gitignore |2 +- Makefile.in |4 ++-- README.cross |2 +- android/Makefile |6 +++--- android/README |4 ++-- configure.ac |4 ++-- libreofficekit/source/gtk/lokdocview.cxx |2 +- 7 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 562d8f57f0d684879ae62fb10dcf9dcea2bd213b Author: Miklos Vajna Date: Thu May 21 17:55:28 2015 +0100 lokdocview: adapt Android path Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182 diff --git a/.gitignore b/.gitignore index 30279a1..e198d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ # autoconf generated stuff /aclocal.m4 -/android/experimental/LOAndroid3/AndroidManifest.xml +/android/source/AndroidManifest.xml /autom4te.cache /autogen.input /autogen.lastrun diff --git a/Makefile.in b/Makefile.in index 61b16ab..61cc906 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \ $(SRCDIR)/instsetoo_native/util/openoffice.lst.in \ $(SRCDIR)/configure.ac \ $(SRCDIR)/config_host/*.h.in \ - $(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \ + $(SRCDIR)/android/source/AndroidManifest.xml.in \ $(BUILDDIR)/autogen.input \ $(BUILDDIR)/autogen.lastrun \ $(BUILDDIR)/autogen.sh \ @@ -172,7 +172,7 @@ distclean : clean compilerplugins-clean rm -fr \ $(BUILDDIR)/Makefile \ $(BUILDDIR)/aclocal.m4 \ -$(BUILDDIR)/android/experimental/LOAndroid3/AndroidManifest.xml \ +$(BUILDDIR)/android/source/AndroidManifest.xml \ $(BUILDDIR)/autom4te.cache \ $(BUILDDIR)/config.log \ $(BUILDDIR)/config.Build.log \ diff --git a/README.cross b/README.cross index ad1475a..c1745d3 100644 --- a/README.cross +++ b/README.cross @@ -353,7 +353,7 @@ And here is an (quite old) autogen.input for Android on X86: --with-distro=LibreOfficeAndroidX86 A LibreOffice app for Android is being developed progress in the -android/experimental/LOAndroid3 directory. +android/source directory. To run the app, do "make install" followed by either "make run" or starting it from Android itself. You most likely want to have an "adb logcat" diff --git a/android/Makefile b/android/Makefile index 152b1a7..3d7763a 100644 --- a/android/Makefile +++ b/android/Makefile @@ -12,7 +12,7 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk .PHONY: sign -SIGNED_APK := $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer.apk +SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.apk RELEASE_APK_USAGE := echo; echo "Usage: make versionCode= exampleDocument= key= release-apk" release-apk: build @@ -23,8 +23,8 @@ release-apk: build rm -f $(SIGNED_APK) # the actual signing - jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk $(key) - $(ANDROID_SDK_HOME)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk $(SIGNED_APK) + jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/bin/LibreOfficeViewer-release-unsigned.apk $(key) + $(ANDROID_SDK_HOME)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/bin/LibreOfficeViewer-release-unsigned.apk $(SIGNED_APK) @echo @echo "Resulting signed apk: $(SIGNED_APK)" diff --git a/android/README b/android/README index 6b5e22b..513444c 100644 --- a/android/README +++ b/android/README @@ -157,7 +157,7 @@ For instructions on how to build for Android, see README.cross. Attach your device, so 'adb devices' shows it. Then run: -cd android/experimental/LOAndroid3 +cd android/source ant debug install adb logcat @@ -206,7 +206,7 @@ that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain: When you have all this, install the .apk to the device, and: -cd android/experimental/LOAndroid3 +cd android/source /ndk-gdb --adb=/platform-tools/adb --start Pretty printers aren't loaded automatically due to the single shared diff --git a/configure.ac b/configure.ac index f6c541f..85990ac 100644 --- a/configure.ac +++ b/configure.ac @@ -360,8 +360,8 @@ if test -n "$with_android_ndk"; then # Check if there is a 64-bit tool-chain. Google provides a NDK with 64-bit tool-chain binaries in # NDK r8e and later, and for earlier NDKs it was possible to build one yourself. Using a 64-bit # linker is required if you compile large parts of the code with -g. A 32-bit linker just won'
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e8bd2f3f19073ae7543a75be3898a46fc87beb7 Author: László Németh Date: Thu May 21 15:46:42 2015 +0200 Updated core Project: help 07df7cad7f66736e3a3ad7677704b6ffddc92e4d LibreLogo help: about joining points, filling shapes defined by points + examples for CLOSE and FILL + fix typo (bad quoation mark) Change-Id: I40e4e84460c17a332e1cd46ef4511b94117d9abd Reviewed-on: https://gerrit.libreoffice.org/15845 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 3668b09..07df7ca 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3668b09b960f69d1ad1589d5b526b108577f5887 +Subproject commit 07df7cad7f66736e3a3ad7677704b6ffddc92e4d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/librelogo/LibreLogo.xhp | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 07df7cad7f66736e3a3ad7677704b6ffddc92e4d Author: László Németh Date: Thu May 21 15:46:42 2015 +0200 LibreLogo help: about joining points, filling shapes defined by points + examples for CLOSE and FILL + fix typo (bad quoation mark) Change-Id: I40e4e84460c17a332e1cd46ef4511b94117d9abd Reviewed-on: https://gerrit.libreoffice.org/15845 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/source/text/swriter/librelogo/LibreLogo.xhp b/source/text/swriter/librelogo/LibreLogo.xhp index 8c58243..3081947 100644 --- a/source/text/swriter/librelogo/LibreLogo.xhp +++ b/source/text/swriter/librelogo/LibreLogo.xhp @@ -146,7 +146,11 @@ CLEARSCREEN (cs) CLEARSCREEN ; remove drawing objects of the document FILL and CLOSE - FILL ; close and fill the actual line shape CLOSE ; close the actual line shape + FILL ; close and fill the actual line shape or points CLOSE ; close the actual line shape or join the actual points +Example: filling a regular triangle: + FORWARD 50 LEFT 120 FORWARD 50 FILL +Example: drawing a regular triangle: + FORWARD 50 LEFT 120 FORWARD 50 CLOSE Pen settings PENSIZE (ps) PENSIZE 100 ; line width is 100 points PENSIZE ANY ; equivalent of PENSIZE RANDOM 10 @@ -162,7 +166,7 @@ PENSTYLE âsolidâ ; solid line (default) PENSTYLE âdottedâ ; dotted line PENSTYLE âdashedâ ; dashed line ; custom dotâdash pattern specified by a list with the following arguments: ; â number of the neighbouring dots ; â length of a dot ; â number of the neighbouring dashes ; â length of a dash ; â distance of the dots/dashes ; â type (optional): ; 0 = dots are rectangles (default) ; 2 = dots are squares (lengths and distances are relative to the pensize) PENSTYLE [3, 1mm, 2, 4mm, 2mm, 2] ; ...ââ...ââ...ââ Fill settings FILLCOLOR/FILLCOLOUR (fc) - FILLCOLOR âblueâ ; fill with blue color, see also PENCOLOR FILLCOLOR âinvisibleâ CIRCLE 10 ; unfilled circle FILLCOLOR [âblueâ, âredâ] ; gradient between red and blue FILLCOLOR [[255, 255, 255], [255, 128, 0]] ; between white and orange FILLCOLOR [âblueâ, âredâ, 1, 0, 0] ; set axial gradient (with the required rotation and border settings), possible values: 0-5 = linear, axial, radial, elliptical, square and rectangle gradients FILLCOLOR [âredâ, âblueâ, 0, 90, 20] ; linear with 20% border, rotated with 90 degrees from the actual heading of the turtle FILLCOLOR [âredâ, 'blueâ, 0, 90, 20, 0, 0, 200, 50] ; from 200% to 50% intensity FILLCOLOR [ANY, ANY, 2, 0, 0, 50, 50] ; radial gradient with random colors and 50-50% horizontal and vertical positions of the center + FILLCOLOR âblueâ ; fill with blue color, see also PENCOLOR FILLCOLOR âinvisibleâ CIRCLE 10 ; unfilled circle FILLCOLOR [âblueâ, âredâ] ; gradient between red and blue FILLCOLOR [[255, 255, 255], [255, 128, 0]] ; between white and orange FILLCOLOR [âblueâ, âredâ, 1, 0, 0] ; set axial gradient (with the required rotation and border settings), possible values: 0-5 = linear, axial, radial, elliptical, square and rectangle gradients FILLCOLOR [âredâ, âblueâ, 0, 90, 20] ; linear with 20% border, rotated with 90 degrees from the actual heading of the turtle FILLCOLOR [âredâ, âblueâ, 0, 90, 20, 0, 0, 200, 50] ; from 200% to 50% intensity FILLCOLOR [ANY, ANY, 2, 0, 0, 50, 50] ; radial gradient with random colors and 50-50% horizontal and vertical positions of the center FILLTRANSPARENCY FILLTRANSPARENCY 80 ; set the transparency of the actual fill color to 80% FILLTRANSPARENCY [80] ; set linear transparency gradient from 80% to 0% FILLTRANSPARENCY [80, 20] ; set linear transparency gradient from 80% to 20% FILLTRANSPARENCY [80, 20, 1, 90] ; set axial transparency gradient rotated with 90 degrees from the actual heading of the turtle FILLTRANSPARENCY [80, 20, 2, 0, 20, 50, 50] ; set radial transparency gradient from outer 80% to inner 20% transparency with 20% border and with 50-50% horizontal and vertical positions of the center FILLSTYLE @@ -178,6 +182,8 @@ RECTANGLE [50, 100] ; draw a rectange shape (50Ã100pt) RECTANGLE [50, 100, 10] ; draw a rectangle with rounded corners POINT POINT ; draw a point with size and color of the pen +CLOSE can join the last points, FILL can fill the shape defined by points. For example, itâs easy to draw a âflatâ star starting from its center: + PENUP REPEAT 5 [ FORWARD 80 POINT BACK 80 RIGHT 36 FORWARD 50 POINT BACK 50 RIGHT 120 ] FILL LABEL LABEL âtextâ ; print text in the turtle position LABEL 'text' ; see above LABEL "text ; see above (only for single words) TEXT ___ Libreoffice-commits mailing list libreoffice-comm...
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.documentfoundation.org/show_bug.cgi?id=34555 --- Comment #67 from Yan Pashkovsky --- @Mike what does it mean? To crop image via mouse - you should search "crop" in the labyrinth of menus? No one-click way (button on panel)? -- 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 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.documentfoundation.org/show_bug.cgi?id=34555 --- Comment #68 from Philippe Jung --- (In reply to Yan Pashkovsky from comment #67) > @Mike what does it mean? To crop image via mouse - you should search "crop" > in the labyrinth of menus? No one-click way (button on panel)? As stated in the release note, it is possible from (and it should be verified that it is possible and working from :-) ): - the Format menu - the graphic toolbar - the contextual menu of the image (which is the one I guess users will use most of the time) -- 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: include/o3tl sw/source
include/o3tl/make_unique.hxx | 34 +
sw/source/filter/ww8/docxsdrexport.cxx |2 -
sw/source/filter/ww8/docxsdrexport.hxx |3 +-
3 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit 821b72886f1e407a492f881a2efb27ead2c22b5c
Author: Miklos Vajna
Date: Thu May 21 16:37:16 2015 +0100
o3tl: add make_unique template till we can't use std::make_unique
Change-Id: I48b26f0199e339badf7a0e2bed322ca701689d13
Reviewed-on: https://gerrit.libreoffice.org/15846
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/o3tl/make_unique.hxx b/include/o3tl/make_unique.hxx
new file mode 100644
index 000..2be03e9
--- /dev/null
+++ b/include/o3tl/make_unique.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_O3TL_MAKE_UNIQUE_HXX
+#define INCLUDED_O3TL_MAKE_UNIQUE_HXX
+
+#include
+#include
+
+namespace o3tl
+{
+
+/**
+ * Constructs an object of type T and wraps it in a std::unique_ptr.
+ *
+ * Can be replaced by std::make_unique when we allow C++14.
+ */
+template
+typename std::unique_ptr make_unique(Args&& ... args)
+{
+return std::unique_ptr(new T(std::forward(args)...));
+}
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 13c7bd0..5e1e94a 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -188,7 +188,7 @@ struct DocxSdrExport::Impl
};
DocxSdrExport::DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr
pSerializer, oox::drawingml::DrawingML* pDrawingML)
-: m_pImpl(std::make_shared(*this, rExport, pSerializer, pDrawingML))
+: m_pImpl(o3tl::make_unique(*this, rExport, pSerializer, pDrawingML))
{
}
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx
b/sw/source/filter/ww8/docxsdrexport.hxx
index dd98d71..0a32f20 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
#include
+#include
#include
#include
@@ -52,7 +53,7 @@ public:
class DocxSdrExport
{
struct Impl;
-std::shared_ptr m_pImpl;
+std::unique_ptr m_pImpl;
public:
DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr
pSerializer, oox::drawingml::DrawingML* pDrawingML);
~DocxSdrExport();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-5-0' - source/text
source/text/swriter/librelogo/LibreLogo.xhp | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 47ffd26d2f28efa5b54c1f44516a6a6ebd8245eb Author: László Németh Date: Thu May 21 15:46:42 2015 +0200 LibreLogo help: about joining points, filling shapes defined by points + examples for CLOSE and FILL + fix typo (bad quoation mark) Change-Id: I40e4e84460c17a332e1cd46ef4511b94117d9abd Reviewed-on: https://gerrit.libreoffice.org/15845 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos (cherry picked from commit 07df7cad7f66736e3a3ad7677704b6ffddc92e4d) Reviewed-on: https://gerrit.libreoffice.org/15849 diff --git a/source/text/swriter/librelogo/LibreLogo.xhp b/source/text/swriter/librelogo/LibreLogo.xhp index 8c58243..3081947 100644 --- a/source/text/swriter/librelogo/LibreLogo.xhp +++ b/source/text/swriter/librelogo/LibreLogo.xhp @@ -146,7 +146,11 @@ CLEARSCREEN (cs) CLEARSCREEN ; remove drawing objects of the document FILL and CLOSE - FILL ; close and fill the actual line shape CLOSE ; close the actual line shape + FILL ; close and fill the actual line shape or points CLOSE ; close the actual line shape or join the actual points +Example: filling a regular triangle: + FORWARD 50 LEFT 120 FORWARD 50 FILL +Example: drawing a regular triangle: + FORWARD 50 LEFT 120 FORWARD 50 CLOSE Pen settings PENSIZE (ps) PENSIZE 100 ; line width is 100 points PENSIZE ANY ; equivalent of PENSIZE RANDOM 10 @@ -162,7 +166,7 @@ PENSTYLE âsolidâ ; solid line (default) PENSTYLE âdottedâ ; dotted line PENSTYLE âdashedâ ; dashed line ; custom dotâdash pattern specified by a list with the following arguments: ; â number of the neighbouring dots ; â length of a dot ; â number of the neighbouring dashes ; â length of a dash ; â distance of the dots/dashes ; â type (optional): ; 0 = dots are rectangles (default) ; 2 = dots are squares (lengths and distances are relative to the pensize) PENSTYLE [3, 1mm, 2, 4mm, 2mm, 2] ; ...ââ...ââ...ââ Fill settings FILLCOLOR/FILLCOLOUR (fc) - FILLCOLOR âblueâ ; fill with blue color, see also PENCOLOR FILLCOLOR âinvisibleâ CIRCLE 10 ; unfilled circle FILLCOLOR [âblueâ, âredâ] ; gradient between red and blue FILLCOLOR [[255, 255, 255], [255, 128, 0]] ; between white and orange FILLCOLOR [âblueâ, âredâ, 1, 0, 0] ; set axial gradient (with the required rotation and border settings), possible values: 0-5 = linear, axial, radial, elliptical, square and rectangle gradients FILLCOLOR [âredâ, âblueâ, 0, 90, 20] ; linear with 20% border, rotated with 90 degrees from the actual heading of the turtle FILLCOLOR [âredâ, 'blueâ, 0, 90, 20, 0, 0, 200, 50] ; from 200% to 50% intensity FILLCOLOR [ANY, ANY, 2, 0, 0, 50, 50] ; radial gradient with random colors and 50-50% horizontal and vertical positions of the center + FILLCOLOR âblueâ ; fill with blue color, see also PENCOLOR FILLCOLOR âinvisibleâ CIRCLE 10 ; unfilled circle FILLCOLOR [âblueâ, âredâ] ; gradient between red and blue FILLCOLOR [[255, 255, 255], [255, 128, 0]] ; between white and orange FILLCOLOR [âblueâ, âredâ, 1, 0, 0] ; set axial gradient (with the required rotation and border settings), possible values: 0-5 = linear, axial, radial, elliptical, square and rectangle gradients FILLCOLOR [âredâ, âblueâ, 0, 90, 20] ; linear with 20% border, rotated with 90 degrees from the actual heading of the turtle FILLCOLOR [âredâ, âblueâ, 0, 90, 20, 0, 0, 200, 50] ; from 200% to 50% intensity FILLCOLOR [ANY, ANY, 2, 0, 0, 50, 50] ; radial gradient with random colors and 50-50% horizontal and vertical positions of the center FILLTRANSPARENCY FILLTRANSPARENCY 80 ; set the transparency of the actual fill color to 80% FILLTRANSPARENCY [80] ; set linear transparency gradient from 80% to 0% FILLTRANSPARENCY [80, 20] ; set linear transparency gradient from 80% to 20% FILLTRANSPARENCY [80, 20, 1, 90] ; set axial transparency gradient rotated with 90 degrees from the actual heading of the turtle FILLTRANSPARENCY [80, 20, 2, 0, 20, 50, 50] ; set radial transparency gradient from outer 80% to inner 20% transparency with 20% border and with 50-50% horizontal and vertical positions of the center FILLSTYLE @@ -178,6 +182,8 @@ RECTANGLE [50, 100] ; draw a rectange shape (50Ã100pt) RECTANGLE [50, 100, 10] ; draw a rectangle with rounded corners POINT POINT ; draw a point with size and color of the pen +CLOSE can join the last points, FILL can fill the shape defined by points. For example, itâs easy to draw a âflatâ star starting from its center: + PENUP REPEAT 5 [ FORWARD 80 POINT BACK 80 RIGHT 36 FORWARD 50 POINT BACK 50 RIGHT 120 ] FILL LABEL LABEL âtextâ ; print text in the turtle position LABEL 'text' ; see above LABEL "text ; see above (on
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49fda17306fb9cbe22482bb2b2a3e72ad43a9b42 Author: László Németh Date: Thu May 21 15:46:42 2015 +0200 Updated core Project: help 47ffd26d2f28efa5b54c1f44516a6a6ebd8245eb LibreLogo help: about joining points, filling shapes defined by points + examples for CLOSE and FILL + fix typo (bad quoation mark) Change-Id: I40e4e84460c17a332e1cd46ef4511b94117d9abd Reviewed-on: https://gerrit.libreoffice.org/15845 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos (cherry picked from commit 07df7cad7f66736e3a3ad7677704b6ffddc92e4d) Reviewed-on: https://gerrit.libreoffice.org/15849 diff --git a/helpcontent2 b/helpcontent2 index a91e647..47ffd26 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a91e6477a0e6cef4e842fa6fe94f88e324f262bc +Subproject commit 47ffd26d2f28efa5b54c1f44516a6a6ebd8245eb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b2dtrapezoid.cxx | 42
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit e346aa639ced4fae653b52b0812fa5ca12949125
Author: Zsolt Bölöny
Date: Mon May 18 16:41:41 2015 +0200
Use the better precision equality check in b2trapezoid.cxx
Change-Id: Ie048543ad19c12dc47f6638af7dc029a38da964e
Reviewed-on: https://gerrit.libreoffice.org/15805
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx
b/basegfx/source/polygon/b2dtrapezoid.cxx
index b813e03..4e544c0 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -143,9 +143,9 @@ namespace basegfx
// operator for sort support. Sort by Y, X and slope (in that
order)
bool operator<(const TrDeEdgeEntry& rComp) const
{
-if(fTools::equal(getStart().getY(), rComp.getStart().getY(),
fTools::getSmallValue()))
+if(fTools::equal(getStart().getY(), rComp.getStart().getY()))
{
-if(fTools::equal(getStart().getX(),
rComp.getStart().getX(), fTools::getSmallValue()))
+if(fTools::equal(getStart().getX(),
rComp.getStart().getX()))
{
// when start points are equal, use the direction the
edge is pointing
// to. That value is created on demand and derived
from atan2 in the
@@ -274,13 +274,13 @@ namespace basegfx
TrDeEdgeEntries::iterator aCurrent)
{
// do not create edges without deltaY: do not split when start
is identical
-if(aEdge.getStart().equal(rCutPoint, fTools::getSmallValue()))
+if(aEdge.getStart().equal(rCutPoint))
{
return false;
}
// do not create edges without deltaY: do not split when end
is identical
-if(aEdge.getEnd().equal(rCutPoint, fTools::getSmallValue()))
+if(aEdge.getEnd().equal(rCutPoint))
{
return false;
}
@@ -326,33 +326,33 @@ namespace basegfx
TrDeEdgeEntries::iterator aCurrent)
{
// Exclude simple cases: same start or end point
-if(aEdgeA.getStart().equal(aEdgeB.getStart(),
fTools::getSmallValue()))
+if(aEdgeA.getStart().equal(aEdgeB.getStart()))
{
return false;
}
-if(aEdgeA.getStart().equal(aEdgeB.getEnd(),
fTools::getSmallValue()))
+if(aEdgeA.getStart().equal(aEdgeB.getEnd()))
{
return false;
}
-if(aEdgeA.getEnd().equal(aEdgeB.getStart(),
fTools::getSmallValue()))
+if(aEdgeA.getEnd().equal(aEdgeB.getStart()))
{
return false;
}
-if(aEdgeA.getEnd().equal(aEdgeB.getEnd(),
fTools::getSmallValue()))
+if(aEdgeA.getEnd().equal(aEdgeB.getEnd()))
{
return false;
}
// Exclude simple cases: one of the edges has no length anymore
-if(aEdgeA.getStart().equal(aEdgeA.getEnd(),
fTools::getSmallValue()))
+if(aEdgeA.getStart().equal(aEdgeA.getEnd()))
{
return false;
}
-if(aEdgeB.getStart().equal(aEdgeB.getEnd(),
fTools::getSmallValue()))
+if(aEdgeB.getStart().equal(aEdgeB.getEnd()))
{
return false;
}
@@ -551,10 +551,10 @@ namespace basegfx
// get next point
B2DPoint* pCurr(&maPoints[nStartIndex++]);
-if(fTools::equal(pPrev->getY(), pCurr->getY(),
fTools::getSmallValue()))
+if(fTools::equal(pPrev->getY(), pCurr->getY()))
{
// horizontal edge, check for single point
-if(!fTools::equal(pPrev->getX(),
pCurr->getX(), fTools::getSmallValue()))
+if(!fTools::equal(pPrev->getX(),
pCurr->getX()))
{
// X-order not needed, just add
aTrDeSimpleEdges.push_back(TrDeSimpleEdge(pPrev, pCurr));
@@ -646,7 +646,7 @@ namespace basegfx
// get second edge
TrDeEdgeEntries::reference aRight(*aCurrent++);
-if(!fTools::equal(aLeft.getStart().getY(),
aRight.getStart().getY(), fTools::getSmallVa
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/1c9302565aefb5a54b1b7f1478dd6dac724d30ea/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.documentfoundation.org/show_bug.cgi?id=34555 --- Comment #69 from Adolfo Jayme --- (In reply to Mike §chinagl from comment #66) > Therefore it would be wonderful if this feature really worked well (In reply to Yan Pashkovsky from comment #67) > @Mike what does it mean? @Yan: Don’t worry. Mike is spamming every bug report mentioned in the in-progress release notes with the same comment. -- 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: 3 commits - i18npool/source solenv/bin solenv/gbuild
i18npool/source/breakiterator/gendict.cxx |2 +-
solenv/bin/gdb-core-bt.sh |4
solenv/gbuild/CppunitTest.mk |7 ++-
solenv/gbuild/PythonTest.mk |3 ++-
4 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 5a7816b971c51ea4b642738a065e90d4d9bf12d7
Author: Michael Stahl
Date: Wed May 20 13:18:42 2015 +0200
gbuild: allow recording of CppunitTests and PythonTests too
Since these don't use soffice they need to be tweaked to use RR varaiable.
Unfortunately rr crashes in some CppunitTest so don't enable that now.
Unfortunately rr crashes in PythonTest.
Change-Id: I2143618fa2181e36b6aaeded43637cb3481f5e47
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 021ecc8..e2d8e3f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -39,6 +39,10 @@ $(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running
performance tests with e
gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes
--instr-atstart=no
endif
+ifneq ($(strip $(RR)),)
+gb_CppunitTest_RR := rr record
+endif
+
# defined by platform
# gb_CppunitTest_get_filename
gb_CppunitTest_RUNTIMEDEPS := $(call
gb_Executable_get_runtime_dependencies,cppunittester)
@@ -99,7 +103,8 @@ $(call gb_CppunitTest_get_target,%) :|
$(gb_CppunitTest_RUNTIMEDEPS)
$(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
- $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
+ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
+ $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call
gb_CppunitTest_get_linktarget,$*)) \
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),, \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index ce5f5ed..d093d38 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -52,7 +52,8 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
UserInstallation=$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*))user) \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
- $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL)
$(gb_PythonTest_COMMAND) \
+ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL)
$(gb_CppunitTest_RR) \
+ $(gb_PythonTest_COMMAND) \
$(MODULES) \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
commit ea980f3de1da84de730541217bd497a4d3bb3642
Author: Michael Stahl
Date: Wed May 20 12:55:06 2015 +0200
solenv: if RR is set, skip gdb backtrace, since it's recorded already
Change-Id: I3a393e91d392c3cc572c46e94d7ea7bb1205c0c3
diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index dba100e..e3965f5 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -20,6 +20,10 @@ then
COREFILE=$(ls "$COREDIR"/core*)
echo
echo "It looks like ${EXECUTABLE} generated a core file at ${COREFILE}"
+if test -n "$RR"; then
+echo "rr is recording, skipping gdb backtrace generation"
+exit 0
+fi
echo "Backtraces:"
GDBCOMMANDFILE=$(mktemp)
echo "thread apply all backtrace full" > "$GDBCOMMANDFILE"
commit 2589d545ec099c7b670b185d06fbf9ca841fb748
Author: Michael Stahl
Date: Thu May 21 23:51:01 2015 +0200
i18npool: ASAN: fix off-by-one in gendict's index2 array
The charArray always contains the size of lenArray *before* it is
extended, i.e., the last valid index.
Change-Id: Id1f4e1f2cb55a88ef5339e9d962a3adf4cde91f9
diff --git a/i18npool/source/breakiterator/gendict.cxx
b/i18npool/source/breakiterator/gendict.cxx
index a779981..8bec7d2 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -151,8 +151,8 @@ static inline void printDataArea(FILE *dictionary_fp, FILE
*source_fp, vectorhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/CppunitTest.mk |7 +-- solenv/gbuild/PythonTest.mk |3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit 297680e88e97ce2940b3e38c0cdfeec5c061daca Author: Michael Stahl Date: Fri May 22 00:01:11 2015 +0200 Revert "gbuild: allow recording of CppunitTests and PythonTests too" This reverts commit 5a7816b971c51ea4b642738a065e90d4d9bf12d7. diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e2d8e3f..021ecc8 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -39,10 +39,6 @@ $(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with e gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no endif -ifneq ($(strip $(RR)),) -gb_CppunitTest_RR := rr record -endif - # defined by platform # gb_CppunitTest_get_filename gb_CppunitTest_RUNTIMEDEPS := $(call gb_Executable_get_runtime_dependencies,cppunittester) @@ -103,8 +99,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS) $(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \ $(if $(strip $(PYTHON_URE)),\ PYTHONDONTWRITEBYTECODE=1) \ - $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \ - $(gb_CppunitTest_CPPTESTCOMMAND) \ + $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \ $(call gb_CppunitTest__make_args) \ $(if $(gb_CppunitTest__interactive),, \ diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index d093d38..ce5f5ed 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -52,8 +52,7 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS) UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=1 \ - $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \ - $(gb_PythonTest_COMMAND) \ + $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \ $(MODULES) \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/gdb-core-bt.sh |4
1 file changed, 4 deletions(-)
New commits:
commit 70b24144162a48a2a9f5fe5964c08a8396754b57
Author: Michael Stahl
Date: Fri May 22 00:01:37 2015 +0200
Revert "solenv: if RR is set, skip gdb backtrace, since it's recorded
already"
This reverts commit ea980f3de1da84de730541217bd497a4d3bb3642.
diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index e3965f5..dba100e 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -20,10 +20,6 @@ then
COREFILE=$(ls "$COREDIR"/core*)
echo
echo "It looks like ${EXECUTABLE} generated a core file at ${COREFILE}"
-if test -n "$RR"; then
-echo "rr is recording, skipping gdb backtrace generation"
-exit 0
-fi
echo "Backtraces:"
GDBCOMMANDFILE=$(mktemp)
echo "thread apply all backtrace full" > "$GDBCOMMANDFILE"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 51 ++- 1 file changed, 26 insertions(+), 25 deletions(-) New commits: commit edcd1d5a9c88455fd1d52ab25815fc8d439f31ec Author: Norbert Thiebaud Date: Thu May 21 11:54:33 2015 -0500 on windows/VC build, force enable-pch and force disable-ccache Change-Id: I0ccd9c51766ba9d079449dda62e49c42d0f47875 Reviewed-on: https://gerrit.libreoffice.org/15847 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud diff --git a/configure.ac b/configure.ac index 85990ac..66177db 100644 --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ AC_ARG_ENABLE(lockdown, AC_ARG_ENABLE(pch, AS_HELP_STRING([--enable-pch], -[Enables precompiled header support for C++.]) +[Enables precompiled header support for C++. Forced default on Windows/VC build]) ) AC_ARG_ENABLE(win-mozab-driver, @@ -1279,7 +1279,7 @@ AC_ARG_ENABLE(cups, AC_ARG_ENABLE(ccache, AS_HELP_STRING([--disable-ccache], [Do not try to use ccache automatically. - By default, we will try to detect if ccache is available; in that case if + By default, unless on Windows, we will try to detect if ccache is available; in that case if CC/CXX are not yet set, and --enable-icecream is not given, we attempt to use ccache. --disable-ccache disables ccache completely. ]), @@ -2585,7 +2585,10 @@ AC_SUBST(WITH_GALLERY_BUILD) dnl === dnl Checks if ccache is available dnl === -if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \); then +if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then +# on windows/VC build do not use ccache +CCACHE="" +elif test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \); then case "%$CC%$CXX%" in # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some version number etc), # assume that's good then @@ -4795,11 +4798,11 @@ dnl enable pch by default on windows dnl enable it explicitely otherwise AC_MSG_CHECKING([whether to enable pch feature]) ENABLE_PCH="" -if test "$enable_pch" != "no"; then -if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then -ENABLE_PCH="TRUE" -AC_MSG_RESULT([yes]) -elif test -n "$enable_pch" && test "$GCC" = "yes"; then +if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then +ENABLE_PCH="TRUE" +AC_MSG_RESULT([yes]) +elif test "$enable_pch" != "no"; then +if test -n "$enable_pch" && test "$GCC" = "yes"; then ENABLE_PCH="TRUE" AC_MSG_RESULT([yes]) elif test -n "$enable_pch"; then @@ -5362,24 +5365,22 @@ AC_SUBST(BOOST_CXXFLAGS) # # prefx CXX with ccache if needed # -if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then -if test "$CCACHE" != ""; then -AC_MSG_CHECKING([whether $CXX is already ccached]) -AC_LANG_PUSH([C++]) -save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS --ccache-skip -O2" -dnl an empty program will do, we're checking the compiler flags -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) -if test $use_ccache = yes; then -AC_MSG_RESULT([yes]) -else -CXX="$CCACHE $CXX" -AC_MSG_RESULT([no]) -fi -CXXFLAGS=$save_CXXFLAGS -AC_LANG_POP([C++]) +if test "$CCACHE" != ""; then +AC_MSG_CHECKING([whether $CXX is already ccached]) +AC_LANG_PUSH([C++]) +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS --ccache-skip -O2" +dnl an empty program will do, we're checking the compiler flags +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) +if test $use_ccache = yes; then +AC_MSG_RESULT([yes]) +else +CXX="$CCACHE $CXX" +AC_MSG_RESULT([no]) fi +CXXFLAGS=$save_CXXFLAGS +AC_LANG_POP([C++]) fi dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC15] Chaining text boxes in Draw - more brainstorming on specifications and RSS
Hi there, another blog post on the topic: http://gsoc15-draw.logdown.com/posts/276831-text-chaining-in-draw-an-attempt-to-specifications To avoid more spam on the mailing list, here is the RSS for the blog, I will avoid posting it here from now on: http://gsoc15-draw.logdown.com/posts.atom Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2015-05-22
Moin! ~~ Project dictionaries ~~ * Open changes on master for project dictionaries changed in the last 25 hours: + Lightproof: do not return invalid nBehindEndOfSentencePosition in https://gerrit.libreoffice.org/15834 from Michael Stahl * Merged changes on master for project dictionaries changed in the last 25 hours: None * Abandoned changes on master for project dictionaries changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + LibreLogo help: about joining points, filling shapes defined by points in https://gerrit.libreoffice.org/15845 from Németh László * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2015-05-22
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + writefilter: removed #includes in https://gerrit.libreoffice.org/15850 from Andrea Gelmini about module writerfilter + Calc: Insert row/col before/after [1/2] in https://gerrit.libreoffice.org/15830 from Philippe Jung about module officecfg, sc + Removed getNormal() from polygontools, it just calls B3DPolygon::getNorma in https://gerrit.libreoffice.org/15809 from Zsolt Bölöny about module basegfx, chart2, include, svx + Calc: Insert row/col before/after [2/2] in https://gerrit.libreoffice.org/15831 from Philippe Jung about module officecfg, sc End of freshness + Remove include stdio (part5) in https://gerrit.libreoffice.org/15851 from Julien Nabet about module sc + convert constants in include/vcl/settings.hxx to scoped enums in https://gerrit.libreoffice.org/15828 from Noel Grandin about module cui, desktop, editeng, include, reportdesign, sc, svtools, svx, toolkit, vcl + convert POINTER constants to scoped enum in https://gerrit.libreoffice.org/15825 from Noel Grandin about module avmedia, basctl, chart2, dbaccess, editeng, extensions, include, o3tl, reportdesign, sc, sd, sfx2, svtools, svx, sw, tools, unotools, vbahelper, vcl + tdf#88276: Add background colour toolbar and sidebar buttons in https://gerrit.libreoffice.org/15841 from Katarina Behrens about module icon-themes, officecfg, sc, sd, svx + return and use std::vector from OInterfaceContainerHelper in https://gerrit.libreoffice.org/15747 from Noel Grandin about module UnoControls, chart2, comphelper, cppuhelper, dbaccess, desktop, embedserv, include, sc, sd, sfx2, svx, toolkit, ucb + desktop: simplify code by std::none_of in https://gerrit.libreoffice.org/15837 from Takeshi Abe about module desktop * Merged changes on master for project core changed in the last 25 hours: + on windows/VC build, force enable-pch and force disable-ccache in https://gerrit.libreoffice.org/15847 from Norbert Thiebaud + Use the better precision equality check in b2trapezoid.cxx in https://gerrit.libreoffice.org/15805 from Zsolt Bölöny + o3tl: add make_unique template till we can't use std::make_unique in https://gerrit.libreoffice.org/15846 from Miklos Vajna + unit test for tdf#91095 in https://gerrit.libreoffice.org/15653 from Laurent Godard + Translated some German comments to English in https://gerrit.libreoffice.org/15844 from Sam Tuke + Use delegating constructor in https://gerrit.libreoffice.org/15829 from Stephan Bergmann + fTools::getSmallValue() is not used anymore in https://gerrit.libreoffice.org/15806 from Zsolt Bölöny + convert SWIB constants to scoped enum in https://gerrit.libreoffice.org/15840 from Noel Grandin + fpicker: simplify code by std::any_of in https://gerrit.libreoffice.org/15836 from Takeshi Abe + editeng: simplify code by std::none_of in https://gerrit.libreoffice.org/15838 from Takeshi Abe + svtools: simplify code by replacing std::find_if with std::any_of in https://gerrit.libreoffice.org/15839 from Takeshi Abe + convert CVT constants to scoped enum in https://gerrit.libreoffice.org/15826 from Noel Grandin + tdf#90999: Import spreadsheetML cells with inline formatting tags in https://gerrit.libreoffice.org/15821 from Robert Antoni Buj i Gelonch + convert TABITEM constants to scoped enum in https://gerrit.libreoffice.org/15827 from Noel Grandin + tdf#91054: cleanup weirdo function prototypes in https://gerrit.libreoffice.org/15832 from Jens Carl * Abandoned changes on master for project core changed in the last 25 hours: + tdf#91144 Crash on selecting custom animation in https://gerrit.libreoffice.org/15842 from Philippe Jung + tdf#62475: removed comments on closed namespaces in https://gerrit.libreoffice.org/15782 from Andrea Gelmini + replace ScaList in scaddins with a std container tdf#90222 in https://gerrit.libreoffice.org/15177 from Pieter Adriaensen * Open changes needing tweaks, but being untouched for more than a week: + Add very initial support for Visual Studio 2015 in https://gerrit.libreoffice.org/15644 from Jesús Corrius + tdf#90494: Change gradient angle diagonally by choosing option. in https://gerrit.libreoffice.org/15180 from Heena Gupta + Rendering support for multiStop GradientFill (OOXML LINEAR) in https://gerrit.libreoffice.org/12056 from Vinaya Mandke + Resolves tdf#83365 Other: Access across spreadsheet returns Err:504 in https://gerrit.libreoffice.org/15363 from Henry Castro + tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza + tdf#90494-Add new Attribute for exporting gradient angle diagonally in https://gerrit.libreoffice.org/15323 from Heena Gupta + preserve whitespaces here, tdf#88137, tdf#89254 in https://gerrit.libreoffice.org/15375 from Markus Mohrhard + add kde5 build of
[Libreoffice-commits] core.git: avmedia/source basctl/source chart2/source dbaccess/source editeng/source extensions/source include/vbahelper include/vcl reportdesign/source sc/source sd/source sfx2/s
avmedia/source/viewer/mediawindow_impl.cxx |8 basctl/source/basicide/baside2b.cxx |2 chart2/source/controller/main/ChartController_Window.cxx | 54 +- chart2/source/controller/main/DragMethod_Base.cxx|4 dbaccess/source/ui/querydesign/JoinTableView.cxx |4 dbaccess/source/ui/querydesign/TableWindow.cxx |8 editeng/source/editeng/impedit.hxx | 10 editeng/source/outliner/outlvw.cxx |8 extensions/source/propctrlr/standardcontrol.cxx |4 include/vbahelper/vbahelper.hxx |2 include/vcl/pointr.hxx |2 include/vcl/ptrstyle.hxx | 200 - reportdesign/source/ui/report/dlgedfunc.cxx |4 sc/source/ui/app/inputwin.cxx|6 sc/source/ui/dbgui/csvruler.cxx |2 sc/source/ui/dbgui/scuiasciiopt.cxx |8 sc/source/ui/drawfunc/fuconarc.cxx |8 sc/source/ui/drawfunc/fuconcustomshape.cxx |2 sc/source/ui/drawfunc/fuconpol.cxx |2 sc/source/ui/drawfunc/fuconrec.cxx | 10 sc/source/ui/drawfunc/fuconstr.cxx |2 sc/source/ui/drawfunc/fuconuno.cxx |2 sc/source/ui/drawfunc/fudraw.cxx | 14 sc/source/ui/drawfunc/futext.cxx |2 sc/source/ui/formdlg/privsplt.cxx|4 sc/source/ui/inc/preview.hxx |4 sc/source/ui/miscdlgs/acredlin.cxx | 26 - sc/source/ui/miscdlgs/conflictsdlg.cxx |8 sc/source/ui/miscdlgs/instbdlg.cxx |2 sc/source/ui/pagedlg/tphfedit.cxx|2 sc/source/ui/vba/vbaapplication.cxx | 14 sc/source/ui/view/formatsh.cxx |4 sc/source/ui/view/gridwin.cxx| 48 +- sc/source/ui/view/gridwin2.cxx | 12 sc/source/ui/view/gridwin3.cxx |2 sc/source/ui/view/hdrcont.cxx|8 sc/source/ui/view/preview.cxx| 102 ++--- sc/source/ui/view/tabsplit.cxx |6 sc/source/ui/view/tabview5.cxx |2 sd/source/ui/annotations/annotationwindow.cxx|2 sd/source/ui/func/fuconuno.cxx |2 sd/source/ui/func/fudraw.cxx | 14 sd/source/ui/func/fudspord.cxx |2 sd/source/ui/func/fuformatpaintbrush.cxx |6 sd/source/ui/func/fuzoom.cxx |8 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |2 sd/source/ui/view/viewoverlaymanager.cxx |2 sfx2/source/control/recentdocsviewitem.cxx |2 svtools/source/brwbox/brwbox2.cxx|4 svtools/source/brwbox/datwin.cxx |4 svtools/source/control/headbar.cxx |6 svtools/source/control/hyperlabel.cxx|4 svtools/source/control/ruler.cxx | 26 - svtools/source/control/tabbar.cxx|2 svtools/source/hatchwindow/ipwin.cxx | 10 svtools/source/table/mousefunction.cxx | 10 svtools/source/toolpanel/toolpaneldrawer.cxx |2 svx/source/dialog/contwnd.cxx|2 svx/source/dialog/graphctl.cxx |2 svx/source/engine3d/dragmt3d.cxx |4 svx/source/svdraw/svdcrtv.cxx|6 svx/source/svdraw/svddrgmt.cxx | 26 - svx/source/svdraw/svdhdl.cxx | 70 +-- svx/source/svdraw/svdhlpln.cxx |6 svx/source/svdraw/svdobj.cxx |4 svx/source/svdraw/svdocapt.cxx |2 svx/source/svdraw/svdocirc.cxx | 10 svx/source/svdraw/svdoedge.cxx |2 svx/source/svdraw/svdomeas.cxx |2 svx/source/svdraw/svdopath.cxx | 24 - svx/source/svdraw/svdorect.cxx |4 svx
[Libreoffice-commits] core.git: cui/source desktop/source editeng/source include/svtools include/vcl reportdesign/source sc/source svtools/source svx/source toolkit/source vcl/osx vcl/source vcl/unx v
cui/source/options/optgdlg.cxx |8 -
desktop/source/app/app.cxx | 10 -
editeng/source/editeng/impedit.cxx |2
include/svtools/apearcfg.hxx |7 -
include/vcl/settings.hxx | 172 +++--
reportdesign/source/ui/report/ScrollHelper.cxx |2
sc/source/ui/app/inputwin.cxx |2
sc/source/ui/view/gridwin.cxx |2
svtools/source/config/apearcfg.cxx | 24 +--
svtools/source/config/miscopt.cxx |4
svtools/source/control/fmtfield.cxx|8 -
svtools/source/control/valueset.cxx|2
svx/source/fmcomp/gridcell.cxx | 25 +--
toolkit/source/awt/vclxwindow.cxx | 21 +--
toolkit/source/awt/vclxwindows.cxx | 14 +-
vcl/osx/salframe.cxx |4
vcl/source/app/settings.cxx| 90 ++---
vcl/source/control/button.cxx | 15 +-
vcl/source/control/combobox.cxx|6
vcl/source/control/ctrl.cxx|2
vcl/source/control/edit.cxx|6
vcl/source/control/fixed.cxx |4
vcl/source/control/group.cxx |2
vcl/source/control/ilstbox.cxx |2
vcl/source/control/lstbox.cxx |6
vcl/source/control/scrbar.cxx |6
vcl/source/control/spinfld.cxx | 12 -
vcl/source/control/tabctrl.cxx | 10 -
vcl/source/edit/textview.cxx |4
vcl/source/edit/vclmedit.cxx |2
vcl/source/outdev/font.cxx |2
vcl/source/outdev/text.cxx |6
vcl/source/window/brdwin.cxx |8 -
vcl/source/window/decoview.cxx | 12 -
vcl/source/window/dialog.cxx |6
vcl/source/window/dockwin.cxx |2
vcl/source/window/split.cxx|2
vcl/source/window/splitwin.cxx |2
vcl/source/window/winproc.cxx |8 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2
vcl/unx/kde/salnativewidgets-kde.cxx |2
vcl/unx/kde4/KDESalFrame.cxx |2
vcl/win/source/window/salframe.cxx |8 -
44 files changed, 293 insertions(+), 245 deletions(-)
New commits:
commit 83eb114394879cbfd073322a51c47d02553c1fcf
Author: Noel Grandin
Date: Wed May 20 14:46:54 2015 +0200
convert constants in include/vcl/settings.hxx to scoped enums
Change-Id: I2a110c017f13eca6ddbd70ef3ed195d24adef0a3
Reviewed-on: https://gerrit.libreoffice.org/15828
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fa0bb0e..893ab53 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -826,14 +826,14 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
}
// Middle Mouse Button
-short eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton();
+MouseMiddleButtonAction eOldMiddleMouse =
pAppearanceCfg->GetMiddleMouseButton();
short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectEntryPos();
if(eNewMiddleMouse > 2)
eNewMiddleMouse = 2;
-if ( eNewMiddleMouse != eOldMiddleMouse )
+if ( eNewMiddleMouse != static_cast(eOldMiddleMouse) )
{
-pAppearanceCfg->SetMiddleMouseButton( eNewMiddleMouse );
+pAppearanceCfg->SetMiddleMouseButton(
static_cast(eNewMiddleMouse) );
bAppearanceChanged = true;
}
@@ -982,7 +982,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_pMousePosLB->SaveValue();
// Mouse Snap
-m_pMouseMiddleLB->SelectEntryPos(pAppearanceCfg->GetMiddleMouseButton());
+
m_pMouseMiddleLB->SelectEntryPos(static_cast(pAppearanceCfg->GetMiddleMouseButton()));
m_pMouseMiddleLB->SaveValue();
#if defined( UNX )
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8a86c54..5042752 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1836,25 +1836,25 @@ void Desktop::OverrideSystemSettings( AllSettings&
rSettings )
StyleSettings hStyleSettings = rSettings.GetStyleSettings();
MouseSettings hMouseSettings = rSettings.GetMouseSettings();
-sal_uLong nDragFullOptions = hStyleSettings.GetDragFullOptions();
+DragFullOptions nDragFullOptions = hStyleSettings.GetDragFullOptions();
SvtTabAppearanceCfg aAppearanceCfg;
sal_uInt16 nDragMode = aAppearanceCfg.GetDragMode();
switch ( nDragMode )
{
case DragFullWindow:
-nDragFullOptions |= DRAGFULL_OPTION_ALL;
+nDragFullOptions |= DragFullOptions::All;
break;
ca
