[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source
sd/source/ui/unoidl/unopage.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 0cdef1b85048436997dd5b4003efb954305ecd66
Author: Armin Le Grand a...@apache.org
Date: Wed Jul 9 11:57:21 2014 +
Resolves: #i119287# corrected default style for draw objects...
created using UNO API
(cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sd/source/ui/unoidl/unopage.cxx
Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e
(cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index a4fd2e2..1544aaf 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -71,6 +71,7 @@
#include unopback.hxx
#include unohelp.hxx
#include vcl/dibtools.hxx
+#include svx/svdograf.hxx
using ::com::sun::star::animations::XAnimationNode;
using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -400,7 +401,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const
Reference drawing::XShap
{
SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()-GetModel();
if( pDoc )
-pObj-NbcSetStyleSheet( pDoc-GetDefaultStyleSheet(), true );
+{
+// #i119287# similar to the code in the SdrObject methods the
graphic and ole
+// SdrObjects need another default style than the rest, see
task. Adding here, too.
+// : Same as for #i119287#: Can be removed in branch aw080
again
+const bool bIsSdrGrafObj(0 != dynamic_cast SdrGrafObj*
(pObj));
+const bool bIsSdrOle2Obj(0 != dynamic_cast SdrOle2Obj*
(pObj));
+
+if(bIsSdrGrafObj || bIsSdrOle2Obj)
+{
+
pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(),
true);
+}
+else
+{
+pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheet(), true);
+}
+}
}
return pObj;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-07-10
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ Convert RID_SCDLG_RETYPEPASS to .ui
in https://gerrit.libreoffice.org/10178 from Mihály Palenik
about module sc
+ nss/nspr: update build/autoconf/config.{guess,sub}
in https://gerrit.libreoffice.org/10148 from Robert Antoni Buj i Gelonch
about module external
+ vcl/source/outdev/outdev.cxx: drop unused svsys.h header
in https://gerrit.libreoffice.org/10165 from Douglas Mencken
about module vcl
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
about module chart2, oox
+ fdo76279:Invalid Citation on RoundTrip
in https://gerrit.libreoffice.org/9898 from Sourav Mahajan
about module sw, writerfilter
+ vcl/source/window/wrkwin.cxx: drop unused svsys.h header
in https://gerrit.libreoffice.org/10152 from Douglas Mencken
about module vcl
+ fdo#79018: LO hangs while opening file.
in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
about module sw
End of freshness
+ enable ww8import/export tests for mac
in https://gerrit.libreoffice.org/10144 from Luke Deller
about module sw
+ VS2013: Make 64 bit shell extensions optional
in https://gerrit.libreoffice.org/10163 from David Ostrovsky
about module build
+ VS2013: Adjust lcms2 to 12.0 vcproj version
in https://gerrit.libreoffice.org/10157 from David Ostrovsky
about module external
+ VS2013: Adjust python3 to 12.0 vcproj version
in https://gerrit.libreoffice.org/10162 from David Ostrovsky
about module external
+ VS2013: Adjust libgltf to 12.0 vcproj version
in https://gerrit.libreoffice.org/10161 from David Ostrovsky
about module external
+ VS2013: Adjust glew to 12.0 vcproj version
in https://gerrit.libreoffice.org/10160 from David Ostrovsky
about module external
+ VS2013: Adjust cppunit to 12.0 vcproj version
in https://gerrit.libreoffice.org/10159 from David Ostrovsky
about module external
+ VS2013: Adjust coinmp to 12.0 vcproj version
in https://gerrit.libreoffice.org/10158 from David Ostrovsky
about module external
+ VS2013: Make ADO backwards compatible for SDK 8.0
in https://gerrit.libreoffice.org/10156 from David Ostrovsky
about module connectivity
+ VS2013: Add support for new msbuild and Windows SDK 8.1
in https://gerrit.libreoffice.org/10155 from David Ostrovsky
about module build
+ VS2013: Prefer it over VS2012 and VS2010
in https://gerrit.libreoffice.org/10154 from David Ostrovsky
about module build
+ fdo#57950 Replace chained append( with operator+)
in https://gerrit.libreoffice.org/10149 from Petr Vorel
about module idl
+ use correct type for vector::size()
in https://gerrit.libreoffice.org/10153 from Winfried Donkers
about module sc
* Merged changes on master for project core changed in the last 25 hours:
+ Translate German comments (continued)
in https://gerrit.libreoffice.org/10151 from Philipp Weissenbacher
+ fdo#75757: remove inheritance to std::vector
in https://gerrit.libreoffice.org/10167 from Takeshi Abe
+ fix fdo#77844: header wrongly enabled from .doc
in https://gerrit.libreoffice.org/10100 from Luke Deller
+ Related fdo#67642: remove redundant 'Preferences' label to save some spac
in https://gerrit.libreoffice.org/10119 from Adolfo Jayme Barrientos
+ RID_SVXDLG_IMAP conversion to .ui
in https://gerrit.libreoffice.org/10105 from Szymon Kłos
* Abandoned changes on master for project core changed in the last 25 hours:
None
* Open changes needing tweaks, but being untouched for more than a week:
+ attempt
in https://gerrit.libreoffice.org/9939 from Michael Stahl
+ fdo#79541 :Corrupt: Shape enclosed within a floating table
in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#78947 : The File gets corrupted when saved in LO
in https://gerrit.libreoffice.org/9775 from BisalNayal
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad
Best,
Your friendly LibreOffice Gerrit Digest Mailer
Note: The bot generating this message can be found and improved here:
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Depends on||81147 -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Depends on||81148 -- 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: download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_sourcesans.mk | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit e842914ae3ec6109e889cfc4d0387192a68d2907 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jul 10 09:45:39 2014 +0200 fdo#81095 update our copy of Source Sans Pro Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6 diff --git a/download.lst b/download.lst index 944f751..61ef420 100644 --- a/download.lst +++ b/download.lst @@ -50,7 +50,7 @@ export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLiberti export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz -export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz +export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FREEHAND_MD5SUM := 5f029fef73e42a2c2ae4524a7513f97d export FREEHAND_TARBALL := libfreehand-0.1.0.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk index 45f21d6..cd7ac29 100644 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -10,10 +10,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSansPro-BoldItalic.ttf \ + SourceSansPro-BlackIt.ttf \ + SourceSansPro-Black.ttf \ + SourceSansPro-BoldIt.ttf \ SourceSansPro-Bold.ttf \ - SourceSansPro-Italic.ttf \ + SourceSansPro-ExtraLightIt.ttf \ + SourceSansPro-ExtraLight.ttf \ + SourceSansPro-It.ttf \ + SourceSansPro-LightIt.ttf \ + SourceSansPro-Light.ttf \ SourceSansPro-Regular.ttf \ + SourceSansPro-SemiboldIt.ttf \ + SourceSansPro-Semibold.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - include/oox include/svx oox/source svx/source
include/oox/drawingml/chart/axisconverter.hxx| 10 ++---
include/svx/svdoole2.hxx |7 +++
oox/source/drawingml/chart/axisconverter.cxx | 46 ---
oox/source/drawingml/chart/objectformatter.cxx |8 +---
oox/source/drawingml/chart/plotareaconverter.cxx |6 +--
oox/source/token/properties.txt |1
svx/source/svdraw/svdetc.cxx |4 ++
svx/source/svdraw/svdoole2.cxx |8 +++-
8 files changed, 61 insertions(+), 29 deletions(-)
New commits:
commit bac8126cf1d485eaa65d9ab480118346eff90ad2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 9 21:46:34 2014 -0400
bnc#883684: Make chart objects exempt from automatic unloading.
The Memory option page contains Number of objects setting which controls
how many OLE objects can be loaded at any given time. When the number of
total OLE objects exceeds this number the oldest ones get unloaded. Note
that the total number is across all open documents, not per document.
Technically, chart objects are OLE objects, but unlike other OLE objects
that are embedded Calc, Writer, Draw documents, chart objects normally
belong to the host document. It therefore makes no sense to subject
chart objects to this automatic unloading.
In the future we may want to apply this exemption to other types of OLE
objects, like formula objects for example.. Or maybe this setting can be
removed altogether...
(cherry picked from commit b023565d4f064cd0312e8c1fcc23a9f552112935)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
include/svx/svdoole2.hxx
svx/source/svdraw/svdetc.cxx
svx/source/svdraw/svdoole2.cxx
Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4
(cherry picked from commit 55612305b645a1c0872373c0a9f434763708732a)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 7a93f4b..0f1df14 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -167,6 +167,13 @@ public:
sal_Bool IsChart() const;
sal_Bool IsCalc() const;
+/**
+ * Unloadable OLE objects are subject to automatic unloading per memory
+ * setting. The Number of objects setting in the Memory option controls
+ * how many OLE objects can be loaded at any given moment.
+ */
+bool IsUnloadable() const;
+
sal_Bool UpdateLinkURL_Impl();
void BreakFileLink_Impl();
void DisconnectFileLink_Impl();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 4caca94..afcc792 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -165,6 +165,10 @@ void OLEObjCache::UnloadOnDemand()
void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
{
+if (!pObj-IsUnloadable())
+// This OLE object is exempt from automatic unloading.
+return;
+
if ( !empty() )
{
SdrOle2Obj* pExistingObj = front();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 2929252..1102de8 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2142,7 +2142,13 @@ sal_Bool SdrOle2Obj::IsCalc() const
return sal_False;
}
-//
-
+bool SdrOle2Obj::IsUnloadable() const
+{
+// Right now, chart OLE objects are the only ones exempt from automatic
+// unloading.
+return !IsChart();
+}
+
uno::Reference frame::XModel SdrOle2Obj::GetParentXModel() const
{
uno::Reference frame::XModel xDoc;
commit c1ed90d187eac6abae9f7e50137b20d2ce93f7ff
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 7 16:38:29 2014 -0400
bnc#881025: Mark axis a percent axis only when all data series are percent.
(cherry picked from commit b8c444a46b2f41dae673c6118d84276be0e6c87d)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
oox/inc/drawingml/chart/axisconverter.hxx
Change-Id: I302cc1e5b164b2ce087293b034ec930951af
(cherry picked from commit 3997f7b8e5f07312466e66f6bcf0a4ac1c8c5a39)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/include/oox/drawingml/chart/axisconverter.hxx
b/include/oox/drawingml/chart/axisconverter.hxx
index e107057..f2df756 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
@@ -45,12 +45,10 @@ public:
virtual ~AxisConverter();
/** Creates a chart2 axis and inserts it into the passed coordinate
system. */
-voidconvertFromModel(
-const ::com::sun::star::uno::Reference
::com::sun::star::chart2::XCoordinateSystem rxCoordSystem,
-TypeGroupConverter rTypeGroup,
-
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/alpha.hxx |3 -
include/vcl/bitmap.hxx |3 +
vcl/source/gdi/alpha.cxx| 108
vcl/source/gdi/bitmap.cxx | 108
vcl/source/gdi/bitmapex.cxx |2
5 files changed, 112 insertions(+), 112 deletions(-)
New commits:
commit f136890dc01260bde611b4c121ddf119281cf5b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 10 10:37:08 2014 +0200
Clean up AlphaMask::CopyPixel override hack
...that required undefined downcasts of Bitmap objects that are not
actually AlphaMasks.
Change-Id: I629f4a81d40a2a85cd877ffec13445786ef58187
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 483f749..de3b451 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -105,9 +105,6 @@ public:
Bitmap GetBitmap() const;
-boolCopyPixel( const Rectangle rRectDst, const Rectangle rRectSrc,
- const AlphaMask* pAlphaSrc = NULL);
-
boolErase( sal_uInt8 cTransparency );
boolReplace( const Bitmap rMask, sal_uInt8 rReplaceTransparency );
boolReplace( sal_uInt8 cSearchTransparency, sal_uInt8
cReplaceTransparency,
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 8dd7125..d2f0cac 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -512,6 +512,9 @@ public:
const Rectangle rRectSrc,
const Bitmap* pBmpSrc = NULL );
+boolCopyPixel_AlphaOptimized( const Rectangle rRectDst, const
Rectangle rRectSrc,
+ const Bitmap* pBmpSrc = NULL);
+
/** Perform boolean operations with another bitmap
@param rMask
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 32c42d0..1a26072 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -76,114 +76,6 @@ Bitmap AlphaMask::GetBitmap() const
return ImplGetBitmap();
}
-bool AlphaMask::CopyPixel( const Rectangle rRectDst, const Rectangle
rRectSrc,
- const AlphaMask* pAlphaSrc )
-{
-// Note: this code is copied from Bitmap::CopyPixel but avoids any palette
lookups
-// This optimization is possible because the palettes of AlphaMasks are
always identical (8bit GreyPalette, see ctor)
-const Size aSizePix( GetSizePixel() );
-Rectangle aRectDst( rRectDst );
-boolbRet = false;
-
-aRectDst.Intersection( Rectangle( Point(), aSizePix ) );
-
-if( !aRectDst.IsEmpty() )
-{
-if( pAlphaSrc ( *pAlphaSrc != *this ) )
-{
-Bitmap* pSrc = (Bitmap*) pAlphaSrc;
-const Size aCopySizePix( pSrc-GetSizePixel() );
-Rectangle aRectSrc( rRectSrc );
-
-aRectSrc.Intersection( Rectangle( Point(), aCopySizePix ) );
-
-if( !aRectSrc.IsEmpty() )
-{
-BitmapReadAccess* pReadAcc = pSrc-AcquireReadAccess();
-
-if( pReadAcc )
-{
-BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
-
-if( pWriteAcc )
-{
-const long nWidth = std::min( aRectSrc.GetWidth(),
aRectDst.GetWidth() );
-const long nHeight = std::min( aRectSrc.GetHeight(),
aRectDst.GetHeight() );
-const long nSrcEndX = aRectSrc.Left() + nWidth;
-const long nSrcEndY = aRectSrc.Top() + nHeight;
-longnDstY = aRectDst.Top();
-
-for( long nSrcY = aRectSrc.Top(); nSrcY nSrcEndY;
nSrcY++, nDstY++ )
-for( long nSrcX = aRectSrc.Left(), nDstX =
aRectDst.Left(); nSrcX nSrcEndX; nSrcX++, nDstX++ )
-pWriteAcc-SetPixel( nDstY, nDstX,
pReadAcc-GetPixel( nSrcY, nSrcX ) );
-
-ReleaseAccess( pWriteAcc );
-bRet = ( nWidth 0L ) ( nHeight 0L );
-}
-
-pSrc-ReleaseAccess( pReadAcc );
-}
-}
-}
-else
-{
-Rectangle aRectSrc( rRectSrc );
-
-aRectSrc.Intersection( Rectangle( Point(), aSizePix ) );
-
-if( !aRectSrc.IsEmpty() ( aRectSrc != aRectDst ) )
-{
-BitmapWriteAccess* pWriteAcc = AcquireWriteAccess();
-
-if( pWriteAcc )
-{
-const long nWidth = std::min( aRectSrc.GetWidth(),
aRectDst.GetWidth() );
-const long nHeight = std::min( aRectSrc.GetHeight(),
aRectDst.GetHeight() );
-const long nSrcX = aRectSrc.Left();
-const long nSrcY = aRectSrc.Top();
-const long nSrcEndX1 = nSrcX + nWidth - 1L;
-const long
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Marina Latini mar...@studiostorti.com changed: What|Removed |Added Depends on||81148 -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Marina Latini mar...@studiostorti.com changed: What|Removed |Added Depends on|81148 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/sdt-2-run.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10
sw/source/filter/ww8/docxattributeoutput.cxx | 49 ++
sw/source/filter/ww8/docxattributeoutput.hxx |8 +++
writerfilter/source/dmapper/DomainMapper.cxx | 10
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10
writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 ++
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
9 files changed, 87 insertions(+), 8 deletions(-)
New commits:
commit 0a90643947e3767fd5d76784df54d7ee25e6793d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jul 10 10:19:18 2014 +0200
DOCX export: allow multiple runs in w:sdt tags
Change-Id: Iec053f92ebdfb89ddd311e190609c9dd1a1c64ef
diff --git a/sw/qa/extras/ooxmlexport/data/sdt-2-run.docx
b/sw/qa/extras/ooxmlexport/data/sdt-2-run.docx
new file mode 100644
index 000..6063ebc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/sdt-2-run.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 494b8a8..d534ed9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3739,6 +3739,16 @@ DECLARE_OOXMLEXPORT_TEST(test2colHeader,
2col-header.docx)
CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xPageStyle, HeaderIsOn));
}
+DECLARE_OOXMLEXPORT_TEST(testSdt2Run, sdt-2-run.docx)
+{
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+
+// The problem was that w:sdt was closed after first, not after
second, so the second assert failed.
+assertXPathContent(pXmlDoc,
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r[1]/w:t, first);
+assertXPathContent(pXmlDoc,
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r[2]/w:t, second);
+}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 937a337..85c45da 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -508,9 +508,16 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
m_nHyperLinkCount = 0;
}
+if (m_bStartedCharSdt)
+{
+// Run-level SDT still open? Close it now.
+EndSdtBlock();
+m_bStartedCharSdt = false;
+}
+
m_pSerializer-endElementNS( XML_w, XML_p );
if( !m_bAnchorLinkedToNode )
-WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs );
+WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs, /*bPara=*/true );
else
{
//These should be written out to the actual Node and not to the anchor.
@@ -549,7 +556,10 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
}
-void DocxAttributeOutput::WriteSdtBlock( sal_Int32 nSdtPrToken,
::sax_fastparser::FastAttributeList* pSdtPrTokenChildren,
::sax_fastparser::FastAttributeList* pSdtPrDataBindingAttrs )
+void DocxAttributeOutput::WriteSdtBlock( sal_Int32 nSdtPrToken,
+ ::sax_fastparser::FastAttributeList*
pSdtPrTokenChildren,
+ ::sax_fastparser::FastAttributeList*
pSdtPrDataBindingAttrs,
+ bool bPara )
{
if( nSdtPrToken 0 || pSdtPrDataBindingAttrs )
{
@@ -597,8 +607,11 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32
nSdtPrToken, ::sax_fastparse
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
// write the ending tags after the paragraph
-m_pSerializer-endElementNS( XML_w, XML_sdtContent );
-m_pSerializer-endElementNS( XML_w, XML_sdt );
+if (bPara)
+EndSdtBlock();
+else
+// Support multiple runs inside a run-evel SDT: don't close the
SDT block yet.
+m_bStartedCharSdt = true;
// clear sdt status
nSdtPrToken = 0;
@@ -611,6 +624,12 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32
nSdtPrToken, ::sax_fastparse
}
}
+void DocxAttributeOutput::EndSdtBlock()
+{
+m_pSerializer-endElementNS( XML_w, XML_sdtContent );
+m_pSerializer-endElementNS( XML_w, XML_sdt );
+}
+
void DocxAttributeOutput::FinishTableRowCell(
ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph )
{
if ( pInner.get() )
@@ -945,6 +964,14 @@ void DocxAttributeOutput::EndRun()
// before postponed run start)
m_pSerializer-mark(); // let's call it actual run start
+if (m_bEndCharSdt)
+{
+// This is the common case: close sdt before the current run was
requrested by the next run.
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 12 commits - dbaccess/source include/oox oox/Library_oox.mk oox/source sc/source sd/source sw/qa sw/source unotools/source vcl/win
dbaccess/source/core/dataaccess/documentdefinition.cxx |2
include/oox/drawingml/ThemeOverrideFragmentHandler.hxx | 40 +
include/oox/drawingml/shapepropertymap.hxx |4
include/oox/ppt/pptimport.hxx |1
oox/Library_oox.mk |1
oox/source/drawingml/ThemeOverrideFragmentHandler.cxx | 48 +++
oox/source/drawingml/chart/objectformatter.cxx |8 -
oox/source/drawingml/shape.cxx | 20
sc/source/filter/xml/xmlcelli.cxx |6 +
sd/source/ui/unoidl/unopage.cxx| 16 +++
sw/qa/extras/ww8import/data/fdo77844.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 47 ++
sw/source/filter/ww8/ww8par.cxx| 74 -
sw/source/filter/ww8/ww8par.hxx|2
unotools/source/config/useroptions.cxx | 38 +++-
vcl/win/source/window/salframe.cxx |2
16 files changed, 278 insertions(+), 31 deletions(-)
New commits:
commit 9e3b80f2348da3455f5c751d74a1f1c5a622af13
Author: Armin Le Grand a...@apache.org
Date: Wed Jul 9 11:57:21 2014 +
Resolves: #i119287# corrected default style for draw objects...
created using UNO API
(cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026)
Conflicts:
sd/source/ui/unoidl/unopage.cxx
(cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sd/source/ui/unoidl/unopage.cxx
Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 9ad3473..fa61e5f 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -69,6 +69,7 @@
#include unopback.hxx
#include unohelp.hxx
#include vcl/dibtools.hxx
+#include svx/svdograf.hxx
using ::com::sun::star::animations::XAnimationNode;
using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -410,7 +411,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const
Reference drawing::XShap
{
SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()-GetModel();
if( pDoc )
+{
+// #i119287# similar to the code in the SdrObject methods the
graphic and ole
+// SdrObjects need another default style than the rest, see
task. Adding here, too.
+// : Same as for #i119287#: Can be removed in branch aw080
again
+const bool bIsSdrGrafObj(0 != dynamic_cast SdrGrafObj*
(pObj));
+const bool bIsSdrOle2Obj(0 != dynamic_cast SdrOle2Obj*
(pObj));
+
+if(bIsSdrGrafObj || bIsSdrOle2Obj)
+{
+
pObj-NbcSetStyleSheet(pDoc-GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(),
sal_True);
+}
+else
+{
pObj-NbcSetStyleSheet( pDoc-GetDefaultStyleSheet(), sal_True
);
+}
+}
}
return pObj;
}
commit 8196454b0e6fd1d48d6d862ac3207f36abb869e2
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Jul 9 11:44:32 2014 +0200
localized GetFullName()
Change-Id: I4f2bffadef3db1bd07432202525734ab9b0cb0de
(cherry picked from commit 33c36fb9fbc69bbc32088532dd21db7153aee09d)
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index 01ae9e6..1dadaf3 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -19,7 +19,7 @@
#include unotools/useroptions.hxx
-
+#include unotools/syslocale.hxx
#include unotools/configmgr.hxx
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
@@ -39,6 +39,7 @@
#include com/sun/star/util/ChangesEvent.hpp
#include comphelper/configurationhelper.hxx
#include comphelper/processfactory.hxx
+#include i18nlangtag/mslangid.hxx
using namespace utl;
using namespace com::sun::star;
@@ -210,11 +211,36 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken,
OUString const sToken)
OUString SvtUserOptions::Impl::GetFullName () const
{
-// TODO international name
-OUString sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
-if (!sFullName.isEmpty())
-sFullName += ;
-sFullName += GetToken(USER_OPT_LASTNAME).trim();
+OUString sFullName;
+switch (LanguageType const eLang =
SvtSysLocale().GetUILanguageTag().getLanguageType())
+{
+case LANGUAGE_RUSSIAN:
+sFullName = GetToken(USER_OPT_FIRSTNAME).trim();
+if (!sFullName.isEmpty())
+sFullName += ;
+sFullName += GetToken(USER_OPT_FATHERSNAME).trim();
+if (!sFullName.isEmpty())
+
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/cpool/Zregistration.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d16bb62d226ede68899f14a2c037158d94c61620
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 10 11:11:00 2014 +0200
Fix function signature
Change-Id: Ia3cd228009792d2e5c2e3b74e740341bb0088867
diff --git a/connectivity/source/cpool/Zregistration.cxx
b/connectivity/source/cpool/Zregistration.cxx
index c10ce44..8367c97 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -34,7 +34,7 @@ extern C
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const
sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory*
_pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const
sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
@@ -42,7 +42,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL
dbpool2_component_getFactory(const sal_Char*
{
Reference XSingleServiceFactory xFactory(
::cppu::createOneInstanceFactory(
-_pServiceManager,
+static_castcss::lang::XMultiServiceFactory *(
+_pServiceManager),
OPoolCollection::getImplementationName_Static(),
OPoolCollection::CreateInstance,
OPoolCollection::getSupportedServiceNames_Static()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst external/more_fonts
download.lst |2 +- external/more_fonts/ExternalPackage_sourcesans.mk | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) New commits: commit e343f9c570a6d038019bea1377b50d5f6b081a86 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jul 10 09:45:39 2014 +0200 fdo#81095 update our copy of Source Sans Pro Change-Id: Ifea8069b9d499cb7b23575786350446e85771eb6 (cherry picked from commit e842914ae3ec6109e889cfc4d0387192a68d2907) Reviewed-on: https://gerrit.libreoffice.org/10183 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/download.lst b/download.lst index cf5633f..f4c38b5 100644 --- a/download.lst +++ b/download.lst @@ -50,7 +50,7 @@ export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLiberti export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz -export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz +export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FREEHAND_MD5SUM := 5f029fef73e42a2c2ae4524a7513f97d export FREEHAND_TARBALL := libfreehand-0.1.0.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk index 45f21d6..cd7ac29 100644 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -10,10 +10,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSansPro-BoldItalic.ttf \ + SourceSansPro-BlackIt.ttf \ + SourceSansPro-Black.ttf \ + SourceSansPro-BoldIt.ttf \ SourceSansPro-Bold.ttf \ - SourceSansPro-Italic.ttf \ + SourceSansPro-ExtraLightIt.ttf \ + SourceSansPro-ExtraLight.ttf \ + SourceSansPro-It.ttf \ + SourceSansPro-LightIt.ttf \ + SourceSansPro-Light.ttf \ SourceSansPro-Regular.ttf \ + SourceSansPro-SemiboldIt.ttf \ + SourceSansPro-Semibold.ttf \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 43027942770578818e81399c97be1c75ee552300 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Thu Jul 10 11:37:36 2014 +0200 svp clipping again: Rectangle dimensions don't map directly to B2IBox. This is the same as in 80f3211a7aeff221718703c445be4c753e0a1067. Change-Id: Ibb981da064b4fc97fd865be2decabd8798de7380 Reviewed-on: https://gerrit.libreoffice.org/10186 Reviewed-by: Tomaž Vajngerl qui...@gmail.com Tested-by: Tomaž Vajngerl qui...@gmail.com diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 35c582d..9c1d4e5 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -259,8 +259,8 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox aRange, SvpSalGraphi m_aDevice = basebmp::subsetBitmapDevice( m_aOrigDevice, basegfx::B2IBox (aHitRect.Left(), aHitRect.Top(), - aHitRect.Right(), - aHitRect.Bottom()) ); + aHitRect.Right() + 1, + aHitRect.Bottom() + 1) ); return false; } //fprintf (stderr, URK: complex slow clipping case\n ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vcl.mk
vcl/Library_vcl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3549bd49561ddfdd8b4891d4c8874f7e7772f2c2 Author: Noel Grandin n...@peralex.com Date: Thu Jul 10 11:56:57 2014 +0200 fix linking in vcl under OSX after commit 4789eab use SimpleReferenceObject in vcl/osx module Change-Id: I14a3f1da6267a5bb0aede9e56063db4b21a455bf diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0c980e9..227372d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ i18nutil \ cppu \ sal \ +salhelper \ xmlreader \ $(gb_UWINAPI) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - avmedia/source
avmedia/source/opengl/oglwindow.cxx | 18 ++
avmedia/source/opengl/oglwindow.hxx |2 ++
2 files changed, 20 insertions(+)
New commits:
commit 1fd83db78cc08aca927682f71dde6294087dfc7c
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Jul 3 16:26:44 2014 +0200
glTF: constraine camera move in orbit mode
Not to get too close to / too far from the model.
Too close means move into the model.
Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66
(cherry picked from commit 9a670eb493f3760eb398c3f9d2296d979b608f95)
glTF: improve camera movement constraint
Stop moving only on the wrong direction.
Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125
(cherry picked from commit 09fe9db46615265c6c7119f2524d19335d0e0283)
glTF: camera movement constraint: use distance from the boundary box
... instead of distance from model center position.
Change-Id: I379ab5e32cc5009d0eb751c4808fecf0109d1e5a
(cherry picked from commit 2946c7c62718cb74feab554b5939ec340e6c4280)
Reviewed-on: https://gerrit.libreoffice.org/10084
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index ffb0855..c748ca1 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -22,6 +22,7 @@ OGLWindow::OGLWindow( glTFHandle rHandle, OpenGLContext
rContext, Window rEve
, meZoomLevel( media::ZoomLevel_ORIGINAL )
, m_aLastMousePos(Point())
, m_bIsOrbitMode( false )
+, m_fCameraDistance(0.0)
{
}
@@ -274,6 +275,17 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
if(nCode == KEY_A)vMoveBy -=
vStrafe*(0.0005f*fModelSize);
if(nCode == KEY_D)vMoveBy +=
vStrafe*(0.0005f*fModelSize);
}
+else
+{
+// Limit zooming in orbit mode
+m_fCameraDistance += vMoveBy.z;
+if ((m_fCameraDistance 0.5 * fModelSize vMoveBy.z
0.0 ) ||
+(m_fCameraDistance 2 * fModelSize vMoveBy.z
0.0 ))
+{
+m_fCameraDistance -= vMoveBy.z;
+vMoveBy = glm::vec3(0.0);
+}
+}
}
gltf_renderer_move_camera(m_rHandle, vMoveBy.x, vMoveBy.y,
vMoveBy.z, 0.0);
}
@@ -288,6 +300,12 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
{
gltf_orbit_mode_start(m_rHandle);
m_bIsOrbitMode = true;
+// Set default camera distance
+glm::vec3 vEye;
+glm::vec3 vView;
+glm::vec3 vUp;
+gltf_get_camera_pos(m_rHandle, vEye,vView,vUp);
+m_fCameraDistance = vEye.z -
gltf_get_model_center_pos(m_rHandle)-z -
(gltf_get_model_size(m_rHandle)/2.0);
}
}
else if(nCode == KEY_F)
diff --git a/avmedia/source/opengl/oglwindow.hxx
b/avmedia/source/opengl/oglwindow.hxx
index 5a52cca..35c54c8 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -68,10 +68,12 @@ private:
glTFHandle m_rHandle;
OpenGLContext m_rContext;
Window m_rEventHandler;
+
bool m_bVisible;
com::sun::star::media::ZoomLevel meZoomLevel;
Point m_aLastMousePos;
bool m_bIsOrbitMode;
+double m_fCameraDistance;
};
} // namespace ogl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 606af1462d81ac5188e0a6a3a1c270a327a68fd4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Jul 10 11:16:40 2014 +0200
we need to make sure the context is current
Change-Id: Ia3d9df493899949f8de096f1cb0a3b63bffac0eb
Reviewed-on: https://gerrit.libreoffice.org/10184
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 6884098..b325f1e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -346,6 +346,7 @@ void OpenGLRender::renderDebug()
void OpenGLRender::prepareToRender()
{
+aContext.makeCurrent();
aContext.setWinSize(Size(m_iWidth, m_iHeight));
glViewport(0, 0, m_iWidth, m_iHeight);
if (!m_FboID[0])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/tools
cui/source/dialogs/linkdlg.cxx |2 +-
include/tools/ref.hxx | 21 +++--
2 files changed, 8 insertions(+), 15 deletions(-)
New commits:
commit 5a3d129a46a9f749439eeaff473ffb848a9650cf
Author: Noel Grandin n...@peralex.com
Date: Thu Jul 10 11:03:27 2014 +0200
remove SvRefBase::ReleaseReference
because no-one is using the return value of ReleaseRef, but everyone is
calling ReleaseRef, so make ReleaseRef void-returning and remove
ReleaseReference
Change-Id: I0bedcb65a887ba7a4953132b4c1ccefbdd554a43
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 9155325..27abd85 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -60,7 +60,7 @@ public:
{
SvBaseLink* p = *it;
if( p )
-p-ReleaseReference();
+p-ReleaseRef();
}
}
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 87aed32..a87d099 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -37,13 +37,13 @@ public:
SvRef(T * pObjP): pObj(pObjP) { if (pObj != 0) pObj-AddRef(); }
-~SvRef() { if (pObj != 0) pObj-ReleaseReference(); }
+~SvRef() { if (pObj != 0) pObj-ReleaseRef(); }
void Clear() {
if (pObj != 0) {
T * pRefObj = pObj;
pObj = 0;
-pRefObj-ReleaseReference();
+pRefObj-ReleaseRef();
}
}
@@ -54,7 +54,7 @@ public:
T * pRefObj = pObj;
pObj = rObj.pObj;
if (pRefObj != 0) {
-pRefObj-ReleaseReference();
+pRefObj-ReleaseRef();
}
return *this;
}
@@ -102,7 +102,7 @@ public:
{
T p = *it;
if( p )
- p-ReleaseReference();
+ p-ReleaseRef();
}
base_t::clear();
}
@@ -126,7 +126,7 @@ public:
T p = base_t::back();
base_t::pop_back();
if( p )
-p-ReleaseReference();
+p-ReleaseRef();
return p;
}
};
@@ -159,18 +159,11 @@ public:
nRefCount -= SV_NO_DELETE_REFCOUNT;
return ++nRefCount;
}
-voidReleaseReference()
+voidReleaseRef()
{
if( !--nRefCount )
QueryDelete();
}
-sal_uIntPtr ReleaseRef()
-{
-sal_uIntPtr n = --nRefCount;
-if( !n )
-QueryDelete();
-return n;
-}
sal_uIntPtr GetRefCount() const { return nRefCount; }
};
@@ -196,7 +189,7 @@ class SvCompatWeakBase
public:
SvCompatWeakHdl* GetHdl() { return _xHdl; }
-// does not use Initalizer due to compiler warnings
+// does not use initalizer due to compiler warnings
SvCompatWeakBase( void* pObj ) { _xHdl = new SvCompatWeakHdl( pObj ); }
~SvCompatWeakBase() { _xHdl-ResetWeakBase(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/appl/impldde.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4
Author: Herbert Dürr h...@apache.org
Date: Thu Jul 10 09:11:07 2014 +
#i125226# disallow absolute and relative paths for DDE servers
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 76981f9..3fbcaa7 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -260,19 +260,20 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
// check the suitability of starting the DDE server
const SvtSecurityOptions aSecOpts;
bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (bInWinExec != sal_False);
+bForbidden |= (sServer.SearchChar( L:./%\\) != STRING_NOTFOUND);
static const char* aBadServers[] = { cmd, rundll32 };
for( int i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i])
== COMPARE_EQUAL );
+bForbidden |= (sServer.CompareIgnoreCaseToAscii( aBadServers[i])
== COMPARE_EQUAL);
// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != sal_False);
if( !bForbidden )
{
ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
aCmdLine.Append( .exe );
aCmdLine.Append( ByteString( sTopic, RTL_TEXTENCODING_ASCII_US ) );
-if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED ) 32 )
+if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED ) 32 ) //
TODO: use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |3 +++
chart2/source/view/main/OpenGLRender.hxx |2 ++
2 files changed, 5 insertions(+)
New commits:
commit bb84f7814dcc3b8f729eead8009f71ba698bb8db
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jul 5 20:15:59 2014 +0200
don't forget glewInit
Change-Id: Ifc1c995f50fe34dbb072345aab37190d3a57e074
Reviewed-on: https://gerrit.libreoffice.org/10094
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
(cherry picked from commit b1d4fbb69491bcf211fb4c8cb5c2dd4d9efb4edb)
Reviewed-on: https://gerrit.libreoffice.org/10185
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com
Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 12dfb79..6884098 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -120,6 +120,8 @@ int OpenGLRender::InitOpenGL()
//TODO: moggi: get the information from the context
mbArbMultisampleSupported = true;
+aContext.init();
+
if (glewIsSupported(framebuffer_object) != GLEW_OK)
{
SAL_WARN(chart2.opengl, GL stack has no framebuffer support);
@@ -344,6 +346,7 @@ void OpenGLRender::renderDebug()
void OpenGLRender::prepareToRender()
{
+aContext.setWinSize(Size(m_iWidth, m_iHeight));
glViewport(0, 0, m_iWidth, m_iHeight);
if (!m_FboID[0])
{
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index e88fffa..187cb5e 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -119,6 +119,8 @@ public:
private:
+OpenGLContext aContext;
+
com::sun::star::uno::Reference com::sun::star::drawing::XShape mxTarget;
#if 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 73806, which changed state. Bug 73806 Summary: Expert Configuration button opens huge and not resizable table https://bugs.freedesktop.org/show_bug.cgi?id=73806 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/sdt-alias.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 25 -
sw/source/filter/ww8/docxattributeoutput.hxx |7 ++-
writerfilter/source/dmapper/DomainMapper.cxx | 12 +++-
5 files changed, 48 insertions(+), 7 deletions(-)
New commits:
commit 06e696a043114fcaba005cd8feac0ecb7ecede4a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jul 10 11:48:06 2014 +0200
DOCX export: write w:alias inside w:sdtPr
Change-Id: Iaa020c00ddb3f9c6e6a9a6b2bc248a47c01a89d4
diff --git a/sw/qa/extras/ooxmlexport/data/sdt-alias.docx
b/sw/qa/extras/ooxmlexport/data/sdt-alias.docx
new file mode 100644
index 000..f46ef69
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/sdt-alias.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d534ed9..d156805 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3749,6 +3749,17 @@ DECLARE_OOXMLEXPORT_TEST(testSdt2Run, sdt-2-run.docx)
assertXPathContent(pXmlDoc,
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r[1]/w:t, first);
assertXPathContent(pXmlDoc,
/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r[2]/w:t, second);
}
+
+DECLARE_OOXMLEXPORT_TEST(testSdtAlias, sdt-alias.docx)
+{
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+
+// w:alias was completely missing.
+assertXPath(pXmlDoc, /w:document/w:body/w:p/w:sdt/w:sdtPr/w:alias,
val, Subtitle);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 85c45da..2026ddd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -291,7 +291,7 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
m_bIsFirstParagraph = false;
}
-static void lcl_deleteAndResetTheLists( ::sax_fastparser::FastAttributeList*
pSdtPrTokenChildren, ::sax_fastparser::FastAttributeList*
pSdtPrDataBindingAttrs)
+static void lcl_deleteAndResetTheLists( ::sax_fastparser::FastAttributeList*
pSdtPrTokenChildren, ::sax_fastparser::FastAttributeList*
pSdtPrDataBindingAttrs, OUString rSdtPrAlias)
{
if( pSdtPrTokenChildren )
{
@@ -303,6 +303,8 @@ static void lcl_deleteAndResetTheLists(
::sax_fastparser::FastAttributeList* pS
delete pSdtPrDataBindingAttrs;
pSdtPrDataBindingAttrs = NULL;
}
+if (!rSdtPrAlias.isEmpty())
+rSdtPrAlias = ;
}
void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt,
const Size rSize)
@@ -516,14 +518,15 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
}
m_pSerializer-endElementNS( XML_w, XML_p );
+OUString aParagraphSdtPrAlias;
if( !m_bAnchorLinkedToNode )
-WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs, /*bPara=*/true );
+WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs, aParagraphSdtPrAlias, /*bPara=*/true );
else
{
//These should be written out to the actual Node and not to the anchor.
//Clear them as they will be repopulated when the node is processed.
m_nParagraphSdtPrToken = 0;
-lcl_deleteAndResetTheLists( m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs );
+lcl_deleteAndResetTheLists( m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs, aParagraphSdtPrAlias );
}
//sdtcontent is written so Set m_bParagraphHasDrawing to false
@@ -559,6 +562,7 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
void DocxAttributeOutput::WriteSdtBlock( sal_Int32 nSdtPrToken,
::sax_fastparser::FastAttributeList*
pSdtPrTokenChildren,
::sax_fastparser::FastAttributeList*
pSdtPrDataBindingAttrs,
+ OUString rSdtPrAlias,
bool bPara )
{
if( nSdtPrToken 0 || pSdtPrDataBindingAttrs )
@@ -598,6 +602,11 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32
nSdtPrToken,
m_pSerializer-singleElementNS( XML_w, XML_dataBinding, xAttrList
);
}
+if (!rSdtPrAlias.isEmpty())
+m_pSerializer-singleElementNS(XML_w, XML_alias, FSNS(XML_w,
XML_val),
+ OUStringToOString(rSdtPrAlias,
RTL_TEXTENCODING_UTF8).getStr(),
+ FSEND);
+
m_pSerializer-endElementNS( XML_w, XML_sdtPr );
// sdt contents start tag
@@ -621,6 +630,7
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Marina Latini mar...@studiostorti.com changed: What|Removed |Added Depends on||63024 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #178 from Marina Latini mar...@studiostorti.com --- Added bug 63024 (FILESAVE FILEOPEN Writer does not preserve position of images in its own RTF files) LibreOffice can't handle rtf files with images. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Text Background Color in Draw - Report 22/06/2014
Hi Matteo, I noticed a crash that's probably related to your (otherwise great :-) ), text background editeng work -- care to take a look? 1) Start Writer, enable form controls toolbar (View - Toolbars - Form controls) 2) Click the more controls button, pick the Date Field 3) Draw a rectangle in the body text area to create an instance 4) Try to query its background color via UNO: Tools - Macros - Organize macros - Basic - Edit, then type: print ThisComponent.DrawPage(0).CharBackColor and Press F5 to run, it crashes with: Program received signal SIGSEGV, Segmentation fault. 0x73b4d9fc in SfxItemSet::Get (this=0x1dfaa00, nWhich=0, bSrchInParent=true) at /home/vmiklos/git/libreoffice/master/svl/source/items/itemset.cxx:1002 1002DBG_ASSERT( !pItem-ISA(SfxSetItem) || (gdb) bt 10 #0 0x73b4d9fc in SfxItemSet::Get (this=0x1dfaa00, nWhich=0, bSrchInParent=true) at /home/vmiklos/git/libreoffice/master/svl/source/items/itemset.cxx:1002 #1 0x7fffd2cc9de6 in SdrObject::GetMergedItem (this=0x226b140, nWhich=0) at /home/vmiklos/git/libreoffice/master/svx/source/svdraw/svdobj.cxx:2113 #2 0x7fffd2ea856e in SvxShape::_getPropertyValue (this=0x21c1f38, PropertyName=CharBackColor) at /home/vmiklos/git/libreoffice/master/svx/source/unodraw/unoshape.cxx:1797 nWhich = 0 sounds buggy, maybe you advertise your new UNO property in a generic property map, but in case of form controls, the underlying implementation doesn't handle that? Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) New commits: commit 7413c75b71cb44c5c86a297a3e02784c9f347212 Author: Michael Meeks michael.me...@collabora.com Date: Thu Jul 10 13:24:17 2014 +0100 Cleanup configure's make recommendations for stale make versions. Change-Id: Ib0c546e835bd3e6961632d4644901436061dc072 diff --git a/configure.ac b/configure.ac index 5d25cf7..490097a 100644 --- a/configure.ac +++ b/configure.ac @@ -13068,6 +13068,14 @@ fi if test $STALE_MAKE = TRUE -a $build_os = cygwin; then + +cygwin_arch=`echo $MACHTYPE | sed 's/-.*//'` +if test $cygwin_arch = x86_64; then +download_make_url=http://users.freedesktop.org/~michael/x86_64/make +else +download_make_url=http://dev-www.libreoffice.org/bin/cygwin/make +fi + cat _EOS WARNING: @@ -13078,14 +13086,15 @@ to install a pre-compiled binary make for cygwin mkdir -p /opt/lo/bin cd /opt/lo/bin -wget http://dev-www.libreoffice.org/bin/cygwin/make +wget $download_make_url chmod +x make to install from source: place yourself in a working directory of you choice. -git clone git://anongit.freedesktop.org/libreoffice/contrib/dev-tools -cd dev-tools/make-3.82-gbuild +git clone https://gerrit.libreoffice.org/p/gnu-make-lo.git +cd gnu-make-lo +autoreconf -i ./configure --prefix=/opt/lo make make install ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 80448, which changed state. Bug 80448 Summary: FILEOPEN: openGL init crashes Calc https://bugs.freedesktop.org/show_bug.cgi?id=80448 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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: 17 commits - chart2/source connectivity/source include/vbahelper include/vcl oovbaapi/ooo pyuno/source sc/source sfx2/source sw/source unoidl/source vbahelper/source vc
chart2/source/model/main/ChartModel.cxx |3 -
connectivity/source/drivers/odbc/OStatement.cxx |4 --
connectivity/source/inc/odbc/OStatement.hxx |2 -
include/vbahelper/vbashapes.hxx |3 +
include/vcl/toolbox.hxx |2 -
oovbaapi/ooo/vba/word/XSelection.idl|8 ++--
pyuno/source/module/pyuno_runtime.cxx |2 -
sc/source/filter/oox/excelfilter.cxx| 42
sc/source/ui/vba/vbaworksheets.cxx |3 +
sc/source/ui/vba/vbaworksheets.hxx |4 +-
sfx2/source/appl/app.cxx|4 ++
sfx2/source/appl/appserv.cxx|3 +
sw/source/ui/vba/vbarange.cxx |6 +--
sw/source/ui/vba/vbarange.hxx |6 +--
sw/source/ui/vba/vbaselection.cxx |8 ++--
sw/source/ui/vba/vbaselection.hxx |8 ++--
sw/source/ui/vba/vbastyles.cxx |2 -
sw/source/ui/vba/vbastyles.hxx |4 +-
unoidl/source/unoidl-check.cxx |1
unoidl/source/unoidl-read.cxx |1
vbahelper/source/vbahelper/vbashapes.cxx|3 +
vcl/generic/fontmanager/parseAFM.cxx|8 ++--
vcl/source/outdev/outdev.cxx|1
vcl/source/window/toolbox.cxx | 15
24 files changed, 85 insertions(+), 58 deletions(-)
New commits:
commit 8e0520acc72f45dbd35700dd129fe3e2dd1b6fd3
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 10 13:21:42 2014 +0100
setting WB_SCROLL on a toolbar only works from ctor
Change-Id: Iafd4d132abb63d698f8907c4aa71bd09c35babde
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9a8f7e2..f3328e4 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -480,7 +480,7 @@ public:
voidSetFloatingLines( sal_uInt16 nFloatLines );
sal_uInt16 GetFloatingLines() const;
-voidSetStyle( WinBits nNewStyle ) { mnWinStyle =
nNewStyle; }
+voidSetStyle( WinBits nNewStyle );
WinBits GetStyle() const { return mnWinStyle; }
// enable/disable undocking
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 5149136..1517c15 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4470,6 +4470,21 @@ bool ToolBox::PrepareToggleFloatingMode()
return DockingWindow::PrepareToggleFloatingMode();
}
+void ToolBox::SetStyle(WinBits nNewStyle)
+{
+mnWinStyle = nNewStyle;
+if (!ImplIsFloatingMode())
+{
+bool bOldScroll = mbScroll;
+mbScroll = (mnWinStyle WB_SCROLL) ? true : false;
+if (mbScroll != bOldScroll)
+{
+mbFormat = true;
+ImplFormat();
+}
+}
+}
+
void ToolBox::ToggleFloatingMode()
{
DockingWindow::ToggleFloatingMode();
commit afbc907de41f30988fed69c7e8eada9bfd43aef4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 10 12:31:03 2014 +0100
coverity#737268 Uncaught exception
Change-Id: Ia3cf5588892aba017991024e7890006828bf7b29
diff --git a/sc/source/filter/oox/excelfilter.cxx
b/sc/source/filter/oox/excelfilter.cxx
index 60c0318..d577e53 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -99,33 +99,33 @@ bool ExcelFilter::importDocument() throw()
if( aWorkbookPath.isEmpty() )
return false;
-/* Construct the WorkbookGlobals object referred to by every instance of
-the class WorkbookHelper, and execute the import filter by constructing
-an instance of WorkbookFragment and loading the file. */
-WorkbookGlobalsRef xBookGlob;
try
{
-xBookGlob = WorkbookHelper::constructGlobals( *this );
+/* Construct the WorkbookGlobals object referred to by every instance
of
+the class WorkbookHelper, and execute the import filter by
constructing
+an instance of WorkbookFragment and loading the file. */
+WorkbookGlobalsRef xBookGlob(WorkbookHelper::constructGlobals(*this));
+if (xBookGlob.get() importFragment(new WorkbookFragment(*xBookGlob,
aWorkbookPath)))
+{
+try
+{
+importDocumentProperties();
+}
+catch( const Exception e )
+{
+SAL_WARN(sc, exception when importing document properties
e.Message);
+}
+catch( ... )
+{
+SAL_WARN(sc, exception when importing document properties);
+}
+return true;
+}
}
catch (...)
{
}
-if ( xBookGlob.get() importFragment( new WorkbookFragment( *xBookGlob,
aWorkbookPath ) ) )
-{
-try
-{
-importDocumentProperties();
-}
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |2
cui/source/customize/cfg.cxx | 125 +--
cui/source/customize/cfg.hrc | 19 --
cui/source/customize/cfg.src | 121 --
cui/source/inc/cfg.hxx| 27 ++--
cui/uiconfig/ui/iconchangedialog.ui | 119 ++
cui/uiconfig/ui/iconselectordialog.ui | 221 ++
7 files changed, 418 insertions(+), 216 deletions(-)
New commits:
commit 9586554caec183e6c4560b4df826c747422747f5
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Mon Jul 7 16:40:59 2014 +0200
Convert MD_ICONSELECTOR and MD_ICONCHANGE to .ui
I implemented multiple row ToolBox in MD_ICONSELECTOR.
Change-Id: I0f275b2332a15f3ba37952f6a104099e4f1f1678
Reviewed-on: https://gerrit.libreoffice.org/10112
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 5ed7198..e45a0ec 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -78,6 +78,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/hyperlinkmailpage \
cui/uiconfig/ui/hyperlinknewdocpage \
cui/uiconfig/ui/hyphenate \
+ cui/uiconfig/ui/iconchangedialog \
+ cui/uiconfig/ui/iconselectordialog \
cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d88c071..bf0f657 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4747,35 +4747,34 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window
*pWindow,
const uno::Reference css::ui::XImageManager rXImageManager,
const uno::Reference css::ui::XImageManager rXParentImageManager )
:
-ModalDialog ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
-aFtDescription ( this, CUI_RES( FT_SYMBOLS ) ),
-aTbSymbol( this, CUI_RES( TB_SYMBOLS ) ),
-aFtNote ( this, CUI_RES( FT_NOTE ) ),
-aBtnOK ( this, CUI_RES( BTN_OK ) ),
-aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
-aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
-aBtnImport ( this, CUI_RES( BTN_IMPORT ) ),
-aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
-aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
+ModalDialog ( pWindow, IconSelector,
cui/ui/iconselectordialog.ui ),
m_nNextId( 0 ),
m_xImageManager ( rXImageManager ),
m_xParentImageManager( rXParentImageManager )
{
-FreeResource();
+get(pTbSymbol, symbolsToolbar);
+get(pFtNote, noteLabel);
+get(pBtnImport, importButton);
+get(pBtnDelete, deleteButton);
+
+aTbSize = pTbSymbol-LogicToPixel(Size(160, 80), MapMode(MAP_APPFONT));
+pTbSymbol-set_width_request(aTbSize.Width());
+pTbSymbol-set_height_request(aTbSize.Height());
+pTbSymbol-SetStyle(pTbSymbol-GetStyle() | WB_SCROLL | WB_LINESPACING);
typedef ::boost::unordered_map OUString,
bool,
OUStringHash,
::std::equal_to OUString ImageInfo;
-aTbSymbol.SetPageScroll( true );
+pTbSymbol-SetPageScroll( true );
bool bLargeIcons = GetImageType() css::ui::ImageType::SIZE_LARGE;
m_nExpectedSize = bLargeIcons ? 26 : 16;
if ( m_nExpectedSize != 16 )
{
-aFtNote.SetText( replaceSixteen( aFtNote.GetText(), m_nExpectedSize )
);
+pFtNote-SetText( replaceSixteen( pFtNote-GetText(), m_nExpectedSize
) );
}
uno::Reference uno::XComponentContext xComponentContext =
@@ -4802,7 +4801,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window
*pWindow,
}
else
{
-aBtnImport.Enable( false );
+pBtnImport-Enable( false );
}
aDirectory += soffice.cfg/import;
@@ -4848,11 +4847,11 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window
*pWindow,
if ( graphics.getLength() 0 )
{
Image img = Image( graphics[ 0 ] );
-aTbSymbol.InsertItem( nId, img, pConstIter-first );
+pTbSymbol-InsertItem( nId, img, pConstIter-first );
graphics[ 0 ]-acquire();
-aTbSymbol.SetItemData(
+pTbSymbol-SetItemData(
nId, static_cast void * ( graphics[ 0 ].get() ) );
++nId;
@@ -4902,14 +4901,14 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window
*pWindow,
if ( graphics.getLength() 0 )
{
Image img = Image( graphics[ 0 ] );
-aTbSymbol.InsertItem( nId, img, pConstIter-first );
+pTbSymbol-InsertItem( nId, img, pConstIter-first );
uno::Reference graphic::XGraphic xGraphic = graphics[ 0 ];
if ( xGraphic.is() )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/dmapper/ConversionHelper.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 088eef7c97dc4d496826a3f3ae4fdec7f36b6ada
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Jul 9 14:25:04 2014 +0200
Fix ignoring large twips values like MSO does (cp#187)
which was introduced in 10b4da63e3143108ba75891e9e98fdaa2f7953ab.
Since 1e47614cdb84b018a22a334dad0cdd9f0f53892c, only
convertTwipToMM100Unsigned() ignores large values, which presumably
was not the intention. At least commit message suggests so.
So, move the check back to convertTwipToMM100().
(cherry picked from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7)
Conflicts:
writerfilter/source/dmapper/ConversionHelper.cxx
Change-Id: I17040f1987e24789b9de39a837d9f7ecaed520fb
Reviewed-on: https://gerrit.libreoffice.org/10193
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 7c0c2a1..40a1a29 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -230,6 +230,10 @@ OUString ConvertMSFormatStringToSO(
sal_Int32 convertTwipToMM100(sal_Int32 _t)
{
+// It appears that MSO handles large twip values specially, probably
legacy 16bit handling,
+// anything that's bigger than 32767 appears to be simply ignored.
+if( _t = 0x8000 )
+return 0;
return TWIP_TO_MM100( _t );
}
@@ -237,11 +241,7 @@ sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t)
{
if( _t 0 )
return 0;
-// It appears that MSO handles large twip values specially, probably
legacy 16bit handling,
-// anything that's bigger than 32767 appears to be simply ignored.
-if( _t = 0x8000 )
-return 0;
-return TWIP_TO_MM100( _t );
+return convertTwipToMM100( _t );
}
sal_Int32 convertEMUToMM100(sal_Int32 _t)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb377178d60a88abc13d21707fadd1db262806ff Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 13:45:20 2014 +0100 Updated core Project: help 44176ebad23f662e45d29d7b99ccf972067c15cb diff --git a/helpcontent2 b/helpcontent2 index 57ff135..44176eb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 57ff135efcb010472bc58b57dd2749d3b488f96a +Subproject commit 44176ebad23f662e45d29d7b99ccf972067c15cb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/01/06140402.xhp |5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 44176ebad23f662e45d29d7b99ccf972067c15cb Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 13:45:20 2014 +0100 update help ids for icon selector dialog .ui conversion Change-Id: I1c602f1f349a97839ded3f3769fc072c979b64a7 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 3f7dbfd..042de0e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3031,7 +3031,6 @@ HID_SVXDLG_FILTER_WARNING,34195, HID_SVXTBX_UNDO_REDO_CTRL,34189, HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS,40019, HID_SVX_CONFIG_EVENT,40001, -HID_SVX_CONFIG_ICON_SELECTOR,40044, HID_SVX_CONFIG_NAME_SUBMENU,40045, HID_SVX_CONFIG_RENAME_MENU,40046, HID_SVX_CONFIG_RENAME_MENU_ITEM,40047, @@ -5597,8 +5596,6 @@ svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026, svx_NumericField_RID_SVX_SPLITCELLDLG_ED_COUNT,1238292482, svx_PatternField_RID_SVXPAGE_INET_PROXY_ED_DNS,703288939, svx_PushButton_DLG_CHINESETRANSLATION_PB_EDITTERMS,1078661633, -svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601, -svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589, svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901, svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_CREATE,1241813509, diff --git a/source/text/shared/01/06140402.xhp b/source/text/shared/01/06140402.xhp index 79da935..7129b1d 100644 --- a/source/text/shared/01/06140402.xhp +++ b/source/text/shared/01/06140402.xhp @@ -29,14 +29,15 @@ /topic /meta body +bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/IconSelector id=bm_id1383710 localize=false/ paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 l10n=NEWChange Icon/paragraph paragraph role=heading id=par_idN10547 xml-lang=en-US level=2 l10n=CHGIcons/paragraph paragraph role=paragraph id=par_idN1054B xml-lang=en-US l10n=NEWDisplays the available icons in %PRODUCTNAME. To replace the icon that you selected in the link href=text/shared/01/06140400.xhpCustomize/link dialog, click an icon, then click the emphOK/emph button./paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT id=bm_id1383709 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/importButton id=bm_id1383709 localize=false/ paragraph role=heading id=par_idN1055C xml-lang=en-US level=2 l10n=NEWImport/paragraph paragraph role=paragraph id=par_idN10560 xml-lang=en-US l10n=NEWahelp hid=.Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME./ahelp/paragraph paragraph role=note id=par_idN10575 xml-lang=en-US l10n=NEWYou can only import icons that are in the PNG file format and that are 16x16 or 26x26 pixels in size./paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE id=bm_id1383799 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/iconselectordialog/deleteButton id=bm_id1383799 localize=false/ paragraph role=paragraph id=par_id8224433 xml-lang=en-US l10n=NEWahelp hid=.Click to remove the selected icon from the list. Only user-defined icons can be removed./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/8576b77160240afb952e55b1f125cf703ae195
e5/8576b77160240afb952e55b1f125cf703ae195 |1 + 1 file changed, 1 insertion(+) New commits: commit 22ed8c3f21d0b1c6536d65c8d3654c7b739c1a7b Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 13:46:56 2014 +0100 Notes added by 'git notes add' diff --git a/e5/8576b77160240afb952e55b1f125cf703ae195 b/e5/8576b77160240afb952e55b1f125cf703ae195 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/e5/8576b77160240afb952e55b1f125cf703ae195 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/inc/helpid.hrc |1 - 1 file changed, 1 deletion(-) New commits: commit 919fbc4d7bbc4da16cd16fa91355d2f441f088b4 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 13:46:00 2014 +0100 drop unused helpids Change-Id: Id6e35a11711cc2c044b48050a39037119de19f0d diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 4bca5bf..e78967d 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -43,7 +43,6 @@ #define HID_HANGULDLG_SUGGESTIONS CUI_HID_HANGULDLG_SUGGESTIONS #define HID_HANGULDLG_SUGGESTIONS_GRID CUI_HID_HANGULDLG_SUGGESTIONS_GRID #define HID_HANGULDLG_SUGGESTIONS_LIST CUI_HID_HANGULDLG_SUGGESTIONS_LIST -#define HID_SVX_CONFIG_ICON_SELECTOR CUI_HID_SVX_CONFIG_ICON_SELECTOR #define HID_SVX_CONFIG_NAME_SUBMENU CUI_HID_SVX_CONFIG_NAME_SUBMENU #define HID_SVX_CONFIG_RENAME_MENU CUI_HID_SVX_CONFIG_RENAME_MENU #define HID_SVX_CONFIG_RENAME_MENU_ITEM CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/impldde.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2
Author: Herbert Dürr h...@apache.org
Date: Wed Jul 9 15:23:59 2014 +
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 501346a..3bb38ba 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -243,9 +243,14 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-
-// Server not up, try once more to start it.
-if( !bInWinExec )
+bool bForbidden = bInWinExec;
+// TODO: also check the security level
+static const char* aBadServers[] = { cmd };
+for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+// try to start the DDE server if it is not there
+if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(.exe );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 88/de6a59d9d7933b86fdcba733277aa4fbd5e132
88/de6a59d9d7933b86fdcba733277aa4fbd5e132 |1 + 1 file changed, 1 insertion(+) New commits: commit f3e72bc6bc5a31b4e888c5fc097443ba6e82100e Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 13:54:57 2014 +0100 Notes added by 'git notes add' diff --git a/88/de6a59d9d7933b86fdcba733277aa4fbd5e132 b/88/de6a59d9d7933b86fdcba733277aa4fbd5e132 new file mode 100644 index 000..a9de22e --- /dev/null +++ b/88/de6a59d9d7933b86fdcba733277aa4fbd5e132 @@ -0,0 +1 @@ +merged as: b16f164650f8345e51bf0b0c73bf9c8eee775bc2 ___ 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/ww8export/ww8export.cxx |2 +- sw/qa/extras/ww8import/ww8import.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3c25c5f8d9021936bd29bc0a59a0fc2b2c59664f Author: Luke Deller l...@deller.id.au Date: Tue Jul 8 22:44:12 2014 +1000 enable ww8import/export tests for mac Change-Id: I6b29040a2cd4ad24f18dfafb51d95d2b7627dd27 Reviewed-on: https://gerrit.libreoffice.org/10144 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 5857559..397d760 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -8,7 +8,7 @@ #include swmodeltestbase.hxx -#if !defined(MACOSX) !defined(WNT) +#if !defined(WNT) #include com/sun/star/form/validation/XValidatableFormComponent.hpp #include com/sun/star/frame/XStorable.hpp diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 147fb88..ce23780 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -8,7 +8,7 @@ #include swmodeltestbase.hxx -#if !defined(MACOSX) !defined(WNT) +#if !defined(WNT) #include com/sun/star/awt/XBitmap.hpp #include com/sun/star/graphic/XGraphic.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 2c/835e761e1e9ddb6794895e6f3538b918160dd1 6b/64ada6e3a902ac4b44fe49476514d49138d4d4
2c/835e761e1e9ddb6794895e6f3538b918160dd1 |1 + 6b/64ada6e3a902ac4b44fe49476514d49138d4d4 |1 + 2 files changed, 2 insertions(+) New commits: commit edd2024a287e2ab723a7407e37cb5b61f836ee80 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 14:05:33 2014 +0100 Notes added by 'git notes add' diff --git a/2c/835e761e1e9ddb6794895e6f3538b918160dd1 b/2c/835e761e1e9ddb6794895e6f3538b918160dd1 new file mode 100644 index 000..aad04fc --- /dev/null +++ b/2c/835e761e1e9ddb6794895e6f3538b918160dd1 @@ -0,0 +1 @@ +merged as: 13b68e24db26374ca17572de9abb429edeac32e9 commit 1e1d2d5390058f113e9b48e05b6b88097739a61f Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 14:05:19 2014 +0100 Notes added by 'git notes add' diff --git a/6b/64ada6e3a902ac4b44fe49476514d49138d4d4 b/6b/64ada6e3a902ac4b44fe49476514d49138d4d4 new file mode 100644 index 000..3178506 --- /dev/null +++ b/6b/64ada6e3a902ac4b44fe49476514d49138d4d4 @@ -0,0 +1 @@ +merged as: d1fc47793c1efbe9ff5271656283211647dd0b33 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/source
sfx2/source/appl/impldde.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit d1fc47793c1efbe9ff5271656283211647dd0b33
Author: Herbert Dürr h...@apache.org
Date: Thu Jul 10 09:11:07 2014 +
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 8a93a7e..7ec637a 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,6 +25,7 @@
#include impldde.hxx
+#include comphelper/string.hxx
#include vcl/svapp.hxx
#include vcl/fixed.hxx
#include vcl/edit.hxx
@@ -248,19 +249,20 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
// check the suitability of starting the DDE server
const SvtSecurityOptions aSecOpts;
bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (bInWinExec != false);
+bForbidden |= (comphelper::string::indexOfAny(sServer, L:./%\\) !=
-1);
static const char* aBadServers[] = { cmd, rundll32 };
for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
bForbidden |= sServer.equalsAscii(aBadServers[i]);
// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != false);
if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(.exe );
aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) 32 ) // TODO:
use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
commit 13b68e24db26374ca17572de9abb429edeac32e9
Author: Herbert Dürr h...@apache.org
Date: Wed Jul 9 15:51:49 2014 +
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 3bb38ba..8a93a7e 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -45,6 +45,8 @@
#include svl/svdde.hxx
#include sot/formats.hxx
+#include unotools/securityoptions.hxx
+
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
@@ -243,13 +245,15 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-bool bForbidden = bInWinExec;
-// TODO: also check the security level
-static const char* aBadServers[] = { cmd };
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
+bForbidden |= (bInWinExec != false);
+static const char* aBadServers[] = { cmd, rundll32 };
for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
bForbidden |= sServer.equalsAscii(aBadServers[i]);
-// try to start the DDE server if it is not there
+// try to start the DDE server if it is not there already
if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/7ea069c6342e01a50c8b068ec302574b251cbd
72/7ea069c6342e01a50c8b068ec302574b251cbd |1 + 1 file changed, 1 insertion(+) New commits: commit f73746211d1fb0ae16368fe1758b7ee8149f6ec1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 14:05:44 2014 +0100 Notes added by 'git notes add' diff --git a/72/7ea069c6342e01a50c8b068ec302574b251cbd b/72/7ea069c6342e01a50c8b068ec302574b251cbd new file mode 100644 index 000..aad04fc --- /dev/null +++ b/72/7ea069c6342e01a50c8b068ec302574b251cbd @@ -0,0 +1 @@ +merged as: 13b68e24db26374ca17572de9abb429edeac32e9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
sfx2/AllLangResTarget_sfx2.mk |1
sfx2/UIConfig_sfx.mk |1
sfx2/source/appl/app.hrc |1
sfx2/source/appl/dde.hrc | 34 --
sfx2/source/appl/dde.src | 88
sfx2/source/appl/impldde.cxx | 54 +++---
sfx2/uiconfig/ui/linkeditdialog.ui | 198 +
7 files changed, 220 insertions(+), 157 deletions(-)
New commits:
commit e56f9da481629e9e3a382029bdf41ce42531b672
Author: Szymon KÅos eszka...@gmail.com
Date: Tue Jul 8 17:25:45 2014 +0200
MD_DDE_LINKEDIT conversion to .ui
Change-Id: Id058400bad5a8b100ef5a07060ea1c5013c6e6d6
Reviewed-on: https://gerrit.libreoffice.org/10146
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 42e1661..9d7b685 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_set_include,sfx/res,\
$(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/appl/app.src \
-sfx2/source/appl/dde.src \
sfx2/source/appl/newhelp.src \
sfx2/source/appl/sfx.src \
sfx2/source/bastyp/fltfnc.src \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 489d9b0..310d6e43 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
+ sfx2/uiconfig/ui/linkeditdialog \
sfx2/uiconfig/ui/loadtemplatedialog \
sfx2/uiconfig/ui/managestylepage \
sfx2/uiconfig/ui/newstyle \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index e0c1d13..d0fff73 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -132,7 +132,6 @@
#define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213)
#define RID_SVXSTR_FORWARD_ERRMSSG (RID_SFX_APP_START + 214)
-#define MD_DDE_LINKEDIT (RID_SFX_APP_START + 1)
#endif // #ifndef _SFX_APP_HRC
diff --git a/sfx2/source/appl/dde.hrc b/sfx2/source/appl/dde.hrc
deleted file mode 100644
index c701a9e..000
--- a/sfx2/source/appl/dde.hrc
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_DDE_HRC
-#define _SFX_DDE_HRC
-
-#include app.hrc
-
-#define ED_DDE_APP 50
-#define ED_DDE_TOPIC 51
-#define ED_DDE_ITEM52
-#define FT_DDE_APP 53
-#define FT_DDE_TOPIC 54
-#define FT_DDE_ITEM55
-#define GROUP_DDE_CHG 56
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src
deleted file mode 100644
index 41ec554..000
--- a/sfx2/source/appl/dde.src
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include dde.hrc
-
-ModalDialog MD_DDE_LINKEDIT
-{
-HelpID = sfx2:ModalDialog:MD_DDE_LINKEDIT;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 223 , 74 ) ;
-Text [ en-US ] = Modify Link
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/01/02180100.xhp | 10 -- 2 files changed, 4 insertions(+), 10 deletions(-) New commits: commit 084ad682be0cd73a58d6e0481b35ae2c16fac650 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 14:20:38 2014 +0100 update help ids for dde link modify .ui conversion Change-Id: Ifb94d4653811f22b77b40f19fa36d5a71c4f96fa diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 042de0e..12e5139 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5245,13 +5245,9 @@ sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027, -sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_APP,1082214450, -sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_ITEM,1082214452, -sfx2_Edit_MD_DDE_LINKEDIT_ED_DDE_TOPIC,1082214451, sfx2_Edit_RID_URLOPEN_RID_URLOPEN_URL,1112573955, sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352, sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936, -sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352, sfx2_ModalDialog_RID_URLOPEN,1112571904, sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040, sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711, diff --git a/source/text/shared/01/02180100.xhp b/source/text/shared/01/02180100.xhp index b17d43b..7014edd 100644 --- a/source/text/shared/01/02180100.xhp +++ b/source/text/shared/01/02180100.xhp @@ -31,6 +31,7 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/sfx/ui/linkeditdialog/LinkEditDialog id=bm_id3418988 localize=false/ bookmark xml-lang=en-US branch=index id=bm_id3149877bookmark_valuelinks; modifying/bookmark_value bookmark_valuechanging; links/bookmark_value /bookmarkcommentMW changed modifying;... to changing;.../comment @@ -41,14 +42,11 @@ /section paragraph role=heading id=hd_id3149549 xml-lang=en-US level=2 l10n=U oldref=3Edit Links/paragraph paragraph role=paragraph id=par_id3153114 xml-lang=en-US l10n=U oldref=4Lets you set the properties for the selected link./paragraph -!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APP -- paragraph role=heading id=hd_id3148548 xml-lang=en-US level=3 l10n=U oldref=5Application:/paragraph -paragraph role=paragraph id=par_id3154751 xml-lang=en-US l10n=U oldref=6ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_APPLists the application that last saved the source file./ahelp/paragraph -!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPIC -- +paragraph role=paragraph id=par_id3154751 xml-lang=en-US l10n=U oldref=6ahelp hid=sfx/ui/linkeditdialog/appLists the application that last saved the source file./ahelp/paragraph paragraph role=heading id=hd_id3155338 xml-lang=en-US level=3 l10n=U oldref=7File:/paragraph -paragraph role=paragraph id=par_id3153527 xml-lang=en-US l10n=U oldref=8ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_TOPICLists the path to the source file./ahelp/paragraph -!-- removed HID SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEM -- +paragraph role=paragraph id=par_id3153527 xml-lang=en-US l10n=U oldref=8ahelp hid=sfx/ui/linkeditdialog/fileLists the path to the source file./ahelp/paragraph paragraph role=heading id=hd_id3153577 xml-lang=en-US level=3 l10n=U oldref=9Section/paragraph -paragraph role=paragraph id=par_id3146958 xml-lang=en-US l10n=U oldref=10ahelp hid=SO3:EDIT:MD_DDE_LINKEDIT:ED_DDE_ITEMLists the section that the link refers to in the source file. If you want, you can enter a new section here./ahelp/paragraph +paragraph role=paragraph id=par_id3146958 xml-lang=en-US l10n=U oldref=10ahelp hid=sfx/ui/linkeditdialog/categoryLists the section that the link refers to in the source file. If you want, you can enter a new section here./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c8533d2ac928c59107688d7848bf583a92ac9b4c Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 14:20:38 2014 +0100 Updated core Project: help 084ad682be0cd73a58d6e0481b35ae2c16fac650 diff --git a/helpcontent2 b/helpcontent2 index 44176eb..084ad68 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 44176ebad23f662e45d29d7b99ccf972067c15cb +Subproject commit 084ad682be0cd73a58d6e0481b35ae2c16fac650 ___ 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/ww8export/ww8export.cxx |3 ---
sw/qa/extras/ww8import/ww8import.cxx |4
2 files changed, 7 deletions(-)
New commits:
commit 2292f0026284b69ad3351e7a45dfc36fc41dd1a2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jul 10 15:26:52 2014 +0200
CppunitTest_sw_ww8{im,ex}port: enable on Windows
Change-Id: I503e737b00c033ff6186805724e57d445c0ab674
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 397d760..61655ee 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -8,8 +8,6 @@
#include swmodeltestbase.hxx
-#if !defined(WNT)
-
#include com/sun/star/form/validation/XValidatableFormComponent.hpp
#include com/sun/star/frame/XStorable.hpp
#include com/sun/star/drawing/XControlShape.hpp
@@ -345,7 +343,6 @@ DECLARE_WW8EXPORT_TEST(testBorderColoursExport,
bordercolours.odt)
CPPUNIT_ASSERT_BORDER_EQUAL(expectedBottom, border);
#endif
}
-#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index ce23780..15d10d2 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -8,8 +8,6 @@
#include swmodeltestbase.hxx
-#if !defined(WNT)
-
#include com/sun/star/awt/XBitmap.hpp
#include com/sun/star/graphic/XGraphic.hpp
#include com/sun/star/table/BorderLine2.hpp
@@ -462,8 +460,6 @@ DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
#endif
}
-#endif
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa xmloff/source
sw/qa/extras/odfexport/data/fdo79358.odt |binary
sw/qa/extras/odfexport/odfexport.cxx | 22 ++
xmloff/source/text/XMLSectionExport.cxx |2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit d18308cf3b25ee30815bcaae73d49b5f5b8e734e
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 10 14:46:31 2014 +0200
fdo#79358: ODF export: fix index boolean property export
Due to inverted conditional, only the default values were exported, not
the non-default ones...
(regression from 8a81f542a6ca51305c53899b7e422cbaa432)
Change-Id: I0b1fc828230695709db49e1643801842d947403c
diff --git a/sw/qa/extras/odfexport/data/fdo79358.odt
b/sw/qa/extras/odfexport/data/fdo79358.odt
new file mode 100644
index 000..a1d2572
Binary files /dev/null and b/sw/qa/extras/odfexport/data/fdo79358.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index b5010bf..dab9d5e 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -11,9 +11,11 @@
#if !defined(MACOSX) !defined(WNT)
#include com/sun/star/awt/Gradient.hpp
+#include com/sun/star/container/XIndexReplace.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/text/RelOrientation.hpp
+#include com/sun/star/text/XDocumentIndex.hpp
#include com/sun/star/drawing/TextVerticalAdjust.hpp
class Test : public SwModelTestBase
@@ -58,6 +60,26 @@ DECLARE_ODFEXPORT_TEST(testFdo38244, fdo38244.odt)
CPPUNIT_ASSERT_EQUAL(OUString(M), getPropertyOUString(xPropertySet,
Initials));
}
+DECLARE_ODFEXPORT_TEST(testFdo79358, fdo79358.odt)
+{
+// the boolean properties of the index were not exported properly
+uno::Referencetext::XDocumentIndexesSupplier xIndexSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexes(xIndexSupplier-getDocumentIndexes(), uno::UNO_QUERY);
+uno::Referencetext::XDocumentIndex xTOCIndex(xIndexes-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xTOCProps(xTOCIndex, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xTOCProps,
CreateFromOutline));
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xTOCProps,
CreateFromMarks));
+CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTOCProps,
CreateFromLevelParagraphStyles));
+// check that the source styles are preserved too while at it
+uno::Referencecontainer::XIndexReplace xLevels(
+getProperty uno::Referencecontainer::XIndexReplace (xTOCProps,
+LevelParagraphStyles));
+uno::SequenceOUString seq(1);
+seq[0] = Heading;
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(seq), xLevels-getByIndex(1));
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(uno::SequenceOUString()),
xLevels-getByIndex(2));
+}
+
DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter, first-header-footer.odt)
{
// Test import and export of the header-first token.
diff --git a/xmloff/source/text/XMLSectionExport.cxx
b/xmloff/source/text/XMLSectionExport.cxx
index adff8dd..fb5ee6f 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1608,7 +1608,7 @@ void XMLSectionExport::ExportBoolean(
// value = value ^ bInvert
// omit if value == default
-if ( (bTmp != bInvert) == bDefault )
+if ( (bTmp != bInvert) != bDefault )
{
// export non-default value (since default is omitted)
GetExport().AddAttribute(XML_NAMESPACE_TEXT,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 79358, which changed state. Bug 79358 Summary: Properties Create from of index/table are changed on save https://bugs.freedesktop.org/show_bug.cgi?id=79358 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo80555.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/dmapper/GraphicImport.cxx |4 +++-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 627d1722892b2969373836c74c84f25995c4b112
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Thu Jul 3 14:17:08 2014 +0200
fdo#80555: Set position of GraphicObjectShape objects correctly
Added a unit test for this issue.
(cherry picked from commit 816542b2bdd23423625ad4c2f0e706d5558b8ba9)
(cherry picked from commit c38be106ff1c1ff5e1b279e4ea2c710b524d23f1)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I13656f82c97e5bb8458cdc1cb47ddcc5f6d60330
Reviewed-on: https://gerrit.libreoffice.org/10060
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/fdo80555.docx
b/sw/qa/extras/ooxmlimport/data/fdo80555.docx
new file mode 100644
index 000..a15bdc1
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo80555.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f8f951f..f2051fa 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2173,6 +2173,14 @@ DECLARE_OOXMLIMPORT_TEST(testFootnote, footnote.docx)
CPPUNIT_ASSERT(aFootnote.endsWith(bar));
}
+DECLARE_OOXMLIMPORT_TEST(testFdo80555, fdo80555.docx)
+{
+uno::Referencedrawing::XShape xShape = getShape(1);
+// Shape was wrongly placed at X=0, Y=0
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3318), xShape-getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(245), xShape-getPosition().Y);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 11f5a73..6cd88a5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -777,9 +777,11 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue)
m_pImpl-applyPosition(xShapeProps);
uno::Referencelang::XServiceInfo
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
-if
(xServiceInfo-supportsService(com.sun.star.drawing.GroupShape))
+if
(xServiceInfo-supportsService(com.sun.star.drawing.GroupShape) ||
+
xServiceInfo-supportsService(com.sun.star.drawing.GraphicObjectShape))
{
// Position of the groupshape should be set after
children have been added.
+// fdo#80555: also set position for graphic shapes
here
m_xShape-setPosition(awt::Point(m_pImpl-nLeftPosition,
m_pImpl-nTopPosition));
}
m_pImpl-applyRelativePosition(xShapeProps);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sw/qa sw/source
sw/qa/extras/ww8import/data/fdo77844.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 47 +++
sw/source/filter/ww8/ww8par.cxx | 15 -
3 files changed, 60 insertions(+), 2 deletions(-)
New commits:
commit 758acdd6082fe89a4bd96fe65a0d609d511ddda5
Author: Luke Deller l...@deller.id.au
Date: Sun Jul 6 23:19:18 2014 +1000
fix fdo#77844: header wrongly enabled from .doc
The LO page style needs page headers to be turned on if the
corresponding .doc file section has a left (=even) page header or a
first page header.
However this should not be triggered in the case where a first page
header is present but hidden due to the different first page header
option being disabled. This case is fixed by this commit.
Change-Id: If3de0df45378587fdbdecc6a091d2f4b60940b43
Reviewed-on: https://gerrit.libreoffice.org/10100
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit f312ef98de57a5926be67421395544bb9d41b809)
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 025a9cf3a8ceba61d8424d7dcb029ab9607a0d73)
Reviewed-on: https://gerrit.libreoffice.org/10168
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ww8import/data/fdo77844.doc
b/sw/qa/extras/ww8import/data/fdo77844.doc
new file mode 100755
index 000..cd7368d
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo77844.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 270d665..147fb88 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -415,6 +415,53 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
getPropertysal_Int32(xSections-getByIndex(0), SectionLeftMargin));
}
+DECLARE_WW8IMPORT_TEST(testFdo77844, fdo77844.doc)
+{
+uno::Referencecontainer::XNameAccess pageStyles =
getStyles(PageStyles);
+
+// get a page cursor
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier xTextViewCursorSupplier(
+xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor xCursor(
+xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+
+// check that the first page has no header
+xCursor-jumpToFirstPage();
+OUString pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+uno::Referencestyle::XStyle pageStyle(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+bool headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+
+// check that the second page has a header
+xCursor-jumpToPage(2);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the third page has a header
+xCursor-jumpToPage(3);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(headerIsOn);
+
+// check that the fourth page has no header
+// (#if'd out as this is not yet imported correctly)
+#if 0
+xCursor-jumpToPage(4);
+pageStyleName = getPropertyOUString(xCursor, PageStyleName);
+pageStyle.set(
+pageStyles-getByName(pageStyleName), uno::UNO_QUERY);
+headerIsOn = getPropertybool(pageStyle, HeaderIsOn);
+CPPUNIT_ASSERT(!headerIsOn);
+#endif
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c3e29c3..21ee239 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2375,6 +2375,9 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const
SwPageDesc *pPrev,
long nLen;
sal_uInt8 nNumber = 5;
+// This loops through the 6 flags WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST}
+// corresponding to bit fields in grpfIhdt indicating which
+// header/footer(s) are present in this section
for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
{
if (nI grpfIhdt)
@@ -2392,6 +2395,12 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const
SwPageDesc *pPrev,
= (nI ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true:
false;
bool bUseFirst
= (nI ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true:
false;
+
+// If we are loading a first-page header/footer which is not
+// actually enabled in
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 1093b900b43d819c9a730ef6435fed0f3687a085
Author: Eike Rathke er...@redhat.com
Date: Thu Jul 10 16:13:40 2014 +0200
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index b9e3d12..df65daa 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -253,6 +253,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+// Act on implicitly propagated error, if any.
+if (nOldGlobalError)
+nGlobalError = nOldGlobalError;
+if (nGlobalError)
+bError = true;
break;
case svError:
PopError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa xmloff/source
sw/qa/extras/odfexport/data/fdo79358.odt |binary
sw/qa/extras/odfexport/odfexport.cxx | 22 ++
xmloff/source/text/XMLSectionExport.cxx |2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit eb1ffce113e9110f87de25891f82b0a5752bd59c
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 10 14:46:31 2014 +0200
fdo#79358: ODF export: fix index boolean property export
Due to inverted conditional, only the default values were exported, not
the non-default ones...
(regression from 8a81f542a6ca51305c53899b7e422cbaa432)
Change-Id: I0b1fc828230695709db49e1643801842d947403c
(cherry picked from commit d18308cf3b25ee30815bcaae73d49b5f5b8e734e)
Reviewed-on: https://gerrit.libreoffice.org/10194
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/odfexport/data/fdo79358.odt
b/sw/qa/extras/odfexport/data/fdo79358.odt
new file mode 100644
index 000..a1d2572
Binary files /dev/null and b/sw/qa/extras/odfexport/data/fdo79358.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 1284435..c0b42c0 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -11,9 +11,11 @@
#if !defined(MACOSX) !defined(WNT)
#include com/sun/star/awt/Gradient.hpp
+#include com/sun/star/container/XIndexReplace.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/text/RelOrientation.hpp
+#include com/sun/star/text/XDocumentIndex.hpp
#include com/sun/star/drawing/TextVerticalAdjust.hpp
class Test : public SwModelTestBase
@@ -58,6 +60,26 @@ DECLARE_ODFEXPORT_TEST(testFdo38244, fdo38244.odt)
CPPUNIT_ASSERT_EQUAL(OUString(M), getPropertyOUString(xPropertySet,
Initials));
}
+DECLARE_ODFEXPORT_TEST(testFdo79358, fdo79358.odt)
+{
+// the boolean properties of the index were not exported properly
+uno::Referencetext::XDocumentIndexesSupplier xIndexSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexes(xIndexSupplier-getDocumentIndexes(), uno::UNO_QUERY);
+uno::Referencetext::XDocumentIndex xTOCIndex(xIndexes-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xTOCProps(xTOCIndex, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xTOCProps,
CreateFromOutline));
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xTOCProps,
CreateFromMarks));
+CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTOCProps,
CreateFromLevelParagraphStyles));
+// check that the source styles are preserved too while at it
+uno::Referencecontainer::XIndexReplace xLevels(
+getProperty uno::Referencecontainer::XIndexReplace (xTOCProps,
+LevelParagraphStyles));
+uno::SequenceOUString seq(1);
+seq[0] = Heading;
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(seq), xLevels-getByIndex(1));
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(uno::SequenceOUString()),
xLevels-getByIndex(2));
+}
+
DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter, first-header-footer.odt)
{
// Test import and export of the header-first token.
diff --git a/xmloff/source/text/XMLSectionExport.cxx
b/xmloff/source/text/XMLSectionExport.cxx
index adff8dd..fb5ee6f 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1608,7 +1608,7 @@ void XMLSectionExport::ExportBoolean(
// value = value ^ bInvert
// omit if value == default
-if ( (bTmp != bInvert) == bDefault )
+if ( (bTmp != bInvert) != bDefault )
{
// export non-default value (since default is omitted)
GetExport().AddAttribute(XML_NAMESPACE_TEXT,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/dmapper/ConversionHelper.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 6d21e5425690732a3254722add7023ace4d3c537
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Jul 9 14:25:04 2014 +0200
Fix ignoring large twips values like MSO does (cp#187)
which was introduced in 10b4da63e3143108ba75891e9e98fdaa2f7953ab.
Since 1e47614cdb84b018a22a334dad0cdd9f0f53892c, only
convertTwipToMM100Unsigned() ignores large values, which presumably
was not the intention. At least commit message suggests so.
So, move the check back to convertTwipToMM100().
Change-Id: I17040f1987e24789b9de39a837d9f7ecaed520fb
(cherry picked from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7)
Reviewed-on: https://gerrit.libreoffice.org/10177
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index af6ea70..febe4b0 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -228,6 +228,10 @@ OUString ConvertMSFormatStringToSO(
sal_Int32 convertTwipToMM100(sal_Int32 _t)
{
+// It appears that MSO handles large twip values specially, probably
legacy 16bit handling,
+// anything that's bigger than 32767 appears to be simply ignored.
+if( _t = 0x8000 )
+return 0;
return ::convertTwipToMm100( _t );
}
@@ -235,11 +239,7 @@ sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t)
{
if( _t 0 )
return 0;
-// It appears that MSO handles large twip values specially, probably
legacy 16bit handling,
-// anything that's bigger than 32767 appears to be simply ignored.
-if( _t = 0x8000 )
-return 0;
-return ::convertTwipToMm100( _t );
+return convertTwipToMM100( _t );
}
sal_Int32 convertEMUToMM100(sal_Int32 _t)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba771af1f126f2c3b45a89e2f18689babdb77c45 Author: Michael Meeks michael.me...@collabora.com Date: Wed Jul 9 13:46:44 2014 +0100 fdo#75937 - package galaxy theme in a form we like; cf. fdo#81103. Change-Id: If920257f141a2dc4208d1fd322b875fdc8315cee Reviewed-on: https://gerrit.libreoffice.org/10171 Reviewed-by: Muthu Subramanian K muthus...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index ec74b22..35e1534 100644 --- a/configure.ac +++ b/configure.ac @@ -11563,7 +11563,7 @@ dnl === AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test x$with_theme = x -o x$with_theme = xyes; then -with_theme=crystal default hicontrast oxygen tango sifr +with_theme=crystal default galaxy hicontrast oxygen tango sifr test -z $ENABLE_RELEASE_BUILD with_theme=$with_theme tango_testing fi ___ 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/ooxmlimport/data/fdo74745.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|7 +++
2 files changed, 7 insertions(+)
New commits:
commit 6476f559070f0a7f2bb14f5f9a29d5bb10e62bb5
Author: Charu Tyagi charu.ty...@ericsson.com
Date: Tue Jul 8 14:51:37 2014 +0530
fdo#74745: Test Case for importing custom property of type date correctly
in writer.
Change-Id: I61c7ec4953269a88f3edcebc5b81b01de5b8f3fc
Reviewed-on: https://gerrit.libreoffice.org/10132
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com
diff --git a/sw/qa/extras/ooxmlimport/data/fdo74745.docx
b/sw/qa/extras/ooxmlimport/data/fdo74745.docx
new file mode 100644
index 000..7735677
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo74745.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c1916b1..954dae3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -222,6 +222,13 @@ DECLARE_OOXMLIMPORT_TEST(testFdo49940, fdo49940.docx)
CPPUNIT_ASSERT_EQUAL(OUString(First Page), aValue);
}
+DECLARE_OOXMLIMPORT_TEST(testFdo74745, fdo74745.docx)
+{
+uno::Referencetext::XTextRange paragraph = getParagraph(3);
+uno::Referencetext::XTextRange text(paragraph, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(text-getString(),OUString(09/02/14));
+}
+
DECLARE_OOXMLIMPORT_TEST(testN751077, n751077.docx)
{
/*
___
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/svrtf/svparser.cxx | 19 +++
1 file changed, 19 insertions(+)
New commits:
commit 5eb408a3bb8df204452f0b931a254dad5f0cf35b
Author: David Tardon dtar...@redhat.com
Date: Thu Jul 10 16:14:08 2014 +0200
fdo#81044 detect UTF-8 BOM too
Change-Id: I6fd041780b889e2125b916964ba27d032667dcd6
diff --git a/svtools/source/svrtf/svparser.cxx
b/svtools/source/svrtf/svparser.cxx
index 51783a6..da904a3 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -185,6 +185,25 @@ sal_Unicode SvParser::GetNextChar()
}
}
}
+else if( 0xef == c1 || 0xbb == c1 ) // check for UTF-8 BOM
+{
+rInput.ReadUChar( c2 );
+bErr = rInput.IsEof() || rInput.GetError();
+if( !bErr )
+{
+if( ( 0xef == c1 0xbb == c2 ) || ( 0xbb == c1 0xef
== c2 ) )
+{
+unsigned char c3(0);
+rInput.ReadUChar( c3 );
+bErr = rInput.IsEof() || rInput.GetError();
+if( !bErr ( 0xbf == c3 ) )
+{
+eSrcEnc = RTL_TEXTENCODING_UTF8;
+bSeekBack = false;
+}
+}
+}
+}
}
if( bSeekBack )
rInput.Seek( 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/ppt/pptimport.hxx |2 +-
oox/source/ppt/pptimport.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3beb45c9a193c66a135f0321be84c9d7e7c1a96d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 10 14:31:03 2014 +0100
coverity#1224997 Uncaught exception
and
coverity#1224996 Uncaught exception
Change-Id: I36ea602a93471d826859bef739c4165117cc4cd9
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index d304792..8ec789e 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -42,7 +42,7 @@ public:
virtual ~PowerPointImport();
// from FilterBase
-virtual bool importDocument() throw() SAL_OVERRIDE;
+virtual bool importDocument() SAL_OVERRIDE;
virtual bool exportDocument() throw() SAL_OVERRIDE;
virtual const ::oox::drawingml::Theme* getCurrentTheme() const
SAL_OVERRIDE;
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 0306ab1..62ed37f 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -75,7 +75,7 @@ PowerPointImport::~PowerPointImport()
{
}
-bool PowerPointImport::importDocument() throw()
+bool PowerPointImport::importDocument()
{
/* to activate the PPTX dumper, define the environment variable
OOO_PPTXDUMPER and insert the full path to the file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk extensions/UIConfig_spropctrlr.mk
extensions/UIConfig_sabpilot.mk |3
extensions/UIConfig_spropctrlr.mk|1
extensions/source/dbpilots/commonpagesdbp.cxx|9
extensions/source/dbpilots/commonpagesdbp.hxx|1
extensions/source/dbpilots/dbpresid.hrc | 23 -
extensions/source/dbpilots/groupboxpages.src | 142 ---
extensions/source/dbpilots/groupboxwiz.cxx | 67 ++---
extensions/source/dbpilots/groupboxwiz.hxx | 21 -
extensions/source/propctrlr/formresid.hrc|1
extensions/source/propctrlr/selectlabeldialog.cxx| 110
extensions/source/propctrlr/selectlabeldialog.hxx| 11
extensions/source/propctrlr/selectlabeldialog.src| 49 ---
extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui | 87 ++
extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui | 57
extensions/uiconfig/sabpilot/ui/optionvaluespage.ui | 124 +
extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui| 137 ++
16 files changed, 509 insertions(+), 334 deletions(-)
New commits:
commit 3eabd685956a205969c7d12b238198eba841ea69
Author: Szymon KÅos eszka...@gmail.com
Date: Tue Jul 8 23:04:09 2014 +0200
RID_DLG_SELECTLABELCONTROL and 3 tab pages conversion to .ui
Change-Id: Ia8b8f1cdaa2bc14e6d3249998e06b076ad4e6ae4
Reviewed-on: https://gerrit.libreoffice.org/10150
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index b833f4c..0456655 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -13,11 +13,14 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
extensions/uiconfig/sabpilot/ui/contentfieldpage \
extensions/uiconfig/sabpilot/ui/contenttablepage \
extensions/uiconfig/sabpilot/ui/datasourcepage \
+ extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage \
extensions/uiconfig/sabpilot/ui/fieldassignpage \
extensions/uiconfig/sabpilot/ui/fieldlinkpage \
extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage \
extensions/uiconfig/sabpilot/ui/groupradioselectionpage \
extensions/uiconfig/sabpilot/ui/invokeadminpage \
+ extensions/uiconfig/sabpilot/ui/optionsfinalpage \
+ extensions/uiconfig/sabpilot/ui/optionvaluespage \
extensions/uiconfig/sabpilot/ui/selecttablepage \
extensions/uiconfig/sabpilot/ui/selecttypepage \
extensions/uiconfig/sabpilot/ui/tableselectionpage \
diff --git a/extensions/UIConfig_spropctrlr.mk
b/extensions/UIConfig_spropctrlr.mk
index 26c84f1..87b91736 100644
--- a/extensions/UIConfig_spropctrlr.mk
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
extensions/uiconfig/spropctrlr/ui/controlfontdialog \
extensions/uiconfig/spropctrlr/ui/datatypedialog \
+ extensions/uiconfig/spropctrlr/ui/labelselectiondialog \
extensions/uiconfig/spropctrlr/ui/taborder \
))
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx
b/extensions/source/dbpilots/commonpagesdbp.cxx
index d71a167d..414b5e3 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -388,6 +388,15 @@ namespace dbp
}
+OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard*
_pParent, const OString _rID, const OUString _rUIXMLDescription )
+:OControlWizardPage(_pParent, _rID, _rUIXMLDescription)
+,m_pYes(NULL)
+,m_pNo(NULL)
+,m_pList(NULL)
+{
+}
+
+
void OMaybeListSelectionPage::announceControls(RadioButton _rYesButton,
RadioButton _rNoButton, ListBox _rSelection)
{
m_pYes = _rYesButton;
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx
b/extensions/source/dbpilots/commonpagesdbp.hxx
index b93e40e..09ccc77 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -80,6 +80,7 @@ namespace dbp
public:
OMaybeListSelectionPage( OControlWizard* _pParent, const ResId _rId );
+OMaybeListSelectionPage( OControlWizard* _pParent, const OString
_rID, const OUString _rUIXMLDescription );
protected:
DECL_LINK( OnRadioSelected, RadioButton* );
diff --git a/extensions/source/dbpilots/dbpresid.hrc
b/extensions/source/dbpilots/dbpresid.hrc
index 3e2c4e2..521f9a5 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -59,13 +59,10 @@
// tab pages
-#define RID_PAGE_DEFAULTFIELDSELECTION ( RID_PAGE_START + 3 )
-#define RID_PAGE_OPTIONVALUES
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/unodraw/unoshap2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 625d656f8f208be545ed798ae3f293d2f2d3a6ea
Author: matteocam matteo.campane...@gmail.com
Date: Thu Jul 10 15:44:18 2014 +0200
Advertised CharBackColor in form controls
Change-Id: I3fbda8c530a3268bf0ca4e03bdbb19daf7cda8da
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index a6b74b1..02c3cd6 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -680,7 +680,7 @@ SvxShapeControlPropertyMapping[] =
{ RTL_CONSTASCII_STRINGPARAM(CharKerning),
RTL_CONSTASCII_STRINGPARAM(FontKerning) },
{ RTL_CONSTASCII_STRINGPARAM(CharWordMode),
RTL_CONSTASCII_STRINGPARAM(FontWordLineMode ) },
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR),
RTL_CONSTASCII_STRINGPARAM(TextColor) },
- // { RTL_CONSTASCII_STRINGPARAM(CharBackColor) }, // FIXME(matteocam)
+{ RTL_CONSTASCII_STRINGPARAM(CharBackColor),
RTL_CONSTASCII_STRINGPARAM(CharBackColor) },
{ RTL_CONSTASCII_STRINGPARAM(CharRelief),
RTL_CONSTASCII_STRINGPARAM(FontRelief) },
{ RTL_CONSTASCII_STRINGPARAM(CharUnderlineColor),
RTL_CONSTASCII_STRINGPARAM(TextLineColor) },
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST),
RTL_CONSTASCII_STRINGPARAM(Align) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 11 --- source/text/shared/02/01170101.xhp |3 +-- source/text/shared/autopi/01120200.xhp | 15 +++ source/text/shared/autopi/01120300.xhp | 11 +-- source/text/shared/autopi/01120500.xhp |7 +++ 5 files changed, 16 insertions(+), 31 deletions(-) New commits: commit 957d5ee976dc602e7c433e2659d748f453f086ac Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 16:02:47 2014 +0100 update help ids for forms groupbox dialog .ui conversions Change-Id: Ia931c4364f8070c72b7f12e797dc098f37682c56 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 12e5139..a3513a3 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5078,15 +5078,10 @@ desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215, desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966, desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967, desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965, -extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849, extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366, extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836, -extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067, -extensions_Edit_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE,859703298, extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561, -extensions_ListBox_RID_PAGE_DEFAULTFIELDSELECTION_LB_DEFSELECTIONFIELD,859688451, extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374, -extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835, extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220, extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592, extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776, @@ -5094,20 +5089,14 @@ extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008, extensions_ModalDialog_RID_DLG_LISTCOMBOWIZARD,1396539392, extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, -extensions_ModalDialog_RID_DLG_SELECTLABELCONTROL,1090125824, extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083, extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138, -extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,859685378, -extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377, extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148, extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147, -extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864, extensions_TabPage_RID_PAGE_LCW_CONTENTSELECTION_FIELD,859766784, -extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016, -extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248, extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632, extensions_TabPage_RID_TP_LICENSE,553664512, extensions_TabPage_RID_TP_WELCOME,553697280, diff --git a/source/text/shared/02/01170101.xhp b/source/text/shared/02/01170101.xhp index e00238e..ffad7b3 100644 --- a/source/text/shared/02/01170101.xhp +++ b/source/text/shared/02/01170101.xhp @@ -214,8 +214,7 @@ paragraph xml-lang=en-US id=par_id3153223 role=paragraph l10n=U oldref=231To define one character of the label as a mnemonic, so that the user can access this control by pressing the character on the keyboard, insert a tilde (~) character in front of the character in the label./paragraph paragraph xml-lang=en-US id=par_id3154502 role=paragraph l10n=U oldref=218Only the text of a group frame can be used as the label field when using radio buttons. This text applies to all of the radio buttons of the same group./paragraph paragraph xml-lang=en-US id=par_id3148587 role=paragraph l10n=CHG oldref=219If you click on the emph.../emph button next to the text field, you will see the emphLabel Field Selection/emph dialog. Select a label from the list./paragraph -!-- removed HID PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1 -- -paragraph xml-lang=en-US id=par_id3154512 role=paragraph l10n=CHG oldref=220ahelp hid=PCR_CHECKBOX_RID_DLG_SELECTLABELCONTROL_1Check the emphNo assignment /emphbox to remove the link between a control and the assigned label field./ahelp/paragraph +paragraph xml-lang=en-US id=par_id3154512 role=paragraph l10n=CHG oldref=220ahelp hid=modules/sabpilot/ui/labelselectiondialog/LabelSelectionDialogCheck the emphNo assignment /emphbox to remove the link between a control and the assigned label field./ahelp/paragraph /section section id=Section57 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_WIDTH id=bm_id3156356 localize=false/ diff --git a/source/text/shared/autopi/01120200.xhp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9bd055be19e754bb1de136c29d9fe5c00ea14b2a Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 10 16:02:47 2014 +0100 Updated core Project: help 957d5ee976dc602e7c433e2659d748f453f086ac diff --git a/helpcontent2 b/helpcontent2 index 084ad68..957d5ee 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 084ad682be0cd73a58d6e0481b35ae2c16fac650 +Subproject commit 957d5ee976dc602e7c433e2659d748f453f086ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/outdev.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit cfca22cf7fac269aa480bbd4584142e23847e7f0 Author: Douglas Mencken dougmenc...@gmail.com Date: Wed Jul 9 04:51:58 2014 -0400 vcl/source/outdev/outdev.cxx: drop unused svsys.h header Change-Id: I21308351e86372ce938480a8514415756f9bf549 Reviewed-on: https://gerrit.libreoffice.org/10165 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index a104609..aa2cbc9 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -35,7 +35,6 @@ #include vcl/outdevstate.hxx -#include svsys.h #include salgdi.hxx #include sallayout.hxx #include salframe.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2aae58b82cb8719ff3ac42aaf0eac82fa9645614 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jul 10 17:10:18 2014 +0200 make label translatable Change-Id: I1e7703489ad9c41efbd22863fc9dbe86afee5e3e diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 32dfcac..b559ca0 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -260,7 +260,7 @@ property name=orientationvertical/property child object class=GtkButton id=help -property name=labelHe_lp/property +property name=label translatable=yesHe_lp/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: memory release in libreoffice
Hi Mahesh, On Tuesday, 2014-07-08 07:47:46 -, Mahesh Patil wrote: Libreoffice is not releasing memory after converting document to pdf. How do you measure that? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpN1xPG9nN6t.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/table-btlr-center.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 17 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx |7 ++
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
6 files changed, 35 insertions(+)
New commits:
commit c65aa400296a1a1b59b43223bdac030c749e51e3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jul 2 17:33:03 2014 +0200
bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLr
(cherry picked from commit 3325e0f206ce864730468c3556ce06760042c157)
Reviewed-on: https://gerrit.libreoffice.org/10049
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d
Reviewed-on: https://gerrit.libreoffice.org/10046
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx
new file mode 100644
index 000..79cb53e
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b55c64d..a0c09c9 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2193,6 +2193,15 @@ DECLARE_OOXMLIMPORT_TEST(testFdo80555, fdo80555.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(245), xShape-getPosition().Y);
}
+DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, table-btlr-center.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+// Cell vertical alignment was NONE, should be CENTER.
+CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER,
getPropertysal_Int16(xTable-getCellByName(A2), VertOrient));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 57bbd32..a8650a5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -28,6 +28,8 @@
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
+#include com/sun/star/text/VertOrientation.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
#include dmapperLoggers.hxx
#include TablePositionHandler.hxx
@@ -826,6 +828,21 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
aCellIterator-get()-erase(PROP_HORIZONTAL_MERGE);
}
+
+// Cell direction is not an UNO Property, either.
+const PropertyMap::const_iterator aCellDirectionIter =
aCellIterator-get()-find(PROP_CELL_DIRECTION);
+if (aCellDirectionIter != aCellIterator-get()-end())
+{
+if (aCellDirectionIter-second.getValue().getsal_Int32()
== 3)
+{
+// btLr, so map ParagraphAdjust_CENTER to
VertOrientation::CENTER.
+uno::Referencebeans::XPropertySet
xPropertySet((*m_pTableSeq)[nRow][nCell][0], uno::UNO_QUERY);
+if
(xPropertySet-getPropertyValue(ParaAdjust).getsal_Int16() ==
style::ParagraphAdjust_CENTER)
+aCellIterator-get()-Insert(PROP_VERT_ORIENT,
uno::makeAny(text::VertOrientation::CENTER));
+}
+aCellIterator-get()-erase(PROP_CELL_DIRECTION);
+}
+
pSingleCellProperties[nCell] =
aCellIterator-get()-GetPropertyValues();
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger-endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 98fa11a..8eaeccc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -330,6 +330,13 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
case NS_ooxml::LN_CT_TcPrBase_textDirection:
{
TablePropertyMapPtr pPropMap( new TablePropertyMap );
+
+// Remember the cell direction, so later in
+//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 2dccbe0593acef135b6acd3b5dc49edcf9e24f2f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Jul 10 11:16:40 2014 +0200
we need to make sure the context is current
Change-Id: Ia3d9df493899949f8de096f1cb0a3b63bffac0eb
Reviewed-on: https://gerrit.libreoffice.org/10184
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
(cherry picked from commit 606af1462d81ac5188e0a6a3a1c270a327a68fd4)
Reviewed-on: https://gerrit.libreoffice.org/10188
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 6884098..b325f1e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -346,6 +346,7 @@ void OpenGLRender::renderDebug()
void OpenGLRender::prepareToRender()
{
+aContext.makeCurrent();
aContext.setWinSize(Size(m_iWidth, m_iHeight));
glViewport(0, 0, m_iWidth, m_iHeight);
if (!m_FboID[0])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - include/svx svx/source
include/svx/Palette.hxx| 19 ++---
include/svx/PaletteManager.hxx |6 ++-
svx/source/tbxctrls/Palette.cxx| 66 +++--
svx/source/tbxctrls/PaletteManager.cxx | 51 +++--
svx/source/tbxctrls/colorwindow.hxx| 12 ++
svx/source/tbxctrls/tbcontrl.cxx | 57 +++-
6 files changed, 129 insertions(+), 82 deletions(-)
New commits:
commit 05f5059ed6d24cf31de8f824fc62d786c115b223
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Thu Jul 10 16:14:29 2014 +0200
Change SvxColorWindow_Impl to use ComboBox for palette selection
Change-Id: I0fb9b46298f45bbdf9ae9198c145b9ea5e403bbf
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index f7ced03..d31e958 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -21,6 +21,7 @@
#include rtl/ustring.hxx
#include tools/color.hxx
+#include tools/stream.hxx
class Palette
{
@@ -28,17 +29,23 @@ public:
typedef std::pairColor, OString NamedColor;
typedef std::vector NamedColor ColorList;
private:
-boolmbLoaded;
-OUStringmaFname;
-OString maName;
+boolmbLoadedPalette;
+boolmbValidPalette;
+OUStringmaFName;
+OUStringmaFPath;
+OUStringmaName;
ColorList maColors;
-void LoadPalette();
+boolReadPaletteHeader(SvFileStream rFileStream);
+voidLoadPaletteHeader();
+voidLoadPalette();
public:
-Palette(const OUString rFname);
+Palette( const OUString rFPath, const OUString rFName );
-const OString GetPaletteName();
+const OUString GetName();
const ColorListGetPaletteColors();
+
+boolIsValid();
};
#endif // INCLUDED_SVX_PALETTE_HXX
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index e1d7201..925f67b 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -37,8 +37,10 @@ public:
PaletteManager();
voidLoadPalettes();
voidReloadColorSet(SvxColorValueSet rColorSet);
-voidPrevPalette();
-voidNextPalette();
+std::vectorOUString GetPaletteList();
+voidSetPalette( sal_Int32 nPos );
+sal_Int32 GetPalette();
+
longGetColorCount();
OUStringGetPaletteName();
const Color GetLastColor();
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index aebb7f0..f84f2d5 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -18,7 +18,6 @@
*/
#include svx/Palette.hxx
-#include tools/stream.hxx
// finds first token in rStr from index, separated by whitespace
// returns position of next token in index
@@ -52,13 +51,17 @@ OString lcl_getToken(const OString rStr, sal_Int32 index)
return rStr.copy(substart, toklen);
}
-Palette::Palette(const OUString rFname) :
-mbLoaded( false ),
-maFname( rFname ){}
+Palette::Palette( const OUString rFPath, const OUString rFName ) :
+mbLoadedPalette( false ),
+mbValidPalette( false ),
+maFName( rFName ),
+maFPath( rFPath )
+{
+LoadPaletteHeader();
+}
-const OString Palette::GetPaletteName()
+const OUString Palette::GetName()
{
-LoadPalette();
return maName;
}
@@ -68,27 +71,52 @@ const Palette::ColorList Palette::GetPaletteColors()
return maColors;
}
-void Palette::LoadPalette()
+bool Palette::IsValid()
{
-if( mbLoaded ) return;
-
-mbLoaded = true;
-
-// TODO add error handling!!!
-SvFileStream aFile(maFname, STREAM_READ);
+return mbValidPalette;
+}
+bool Palette::ReadPaletteHeader(SvFileStream rFileStream)
+{
OString aLine;
+OString aName;
-aFile.ReadLine(aLine);
-if( !aLine.startsWith(GIMP Palette) ) return;
-aFile.ReadLine(aLine);
-if( aLine.startsWith(Name: , maName) )
+rFileStream.ReadLine(aLine);
+if( !aLine.startsWith(GIMP Palette) ) return false;
+rFileStream.ReadLine(aLine);
+if( aLine.startsWith(Name: , aName) )
{
-aFile.ReadLine(aLine);
+maName = OStringToOUString(aName, RTL_TEXTENCODING_ASCII_US);
+rFileStream.ReadLine(aLine);
if( aLine.startsWith(Columns: ))
-aFile.ReadLine(aLine); // we can ignore this
+rFileStream.ReadLine(aLine); // we can ignore this
+}
+else
+{
+maName = maFName;
}
+return true;
+}
+
+//TODO make this LoadPaletteHeader and set a bool if palette is incorrect
+void Palette::LoadPaletteHeader()
+{
+SvFileStream aFile(maFPath, STREAM_READ);
+mbValidPalette = ReadPaletteHeader( aFile );
+}
+void Palette::LoadPalette()
+{
+if( mbLoadedPalette ) return;
+mbLoadedPalette = true;
+
+// TODO add error handling!!!
+SvFileStream aFile(maFPath, STREAM_READ);
+mbValidPalette = ReadPaletteHeader( aFile );
+
+if(
[Libreoffice-commits] core.git: 4 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/README| 48 ++--- sw/qa/extras/ooxmlexport/data/sdt-date-charformat.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +++ sw/source/filter/ww8/docxattributeoutput.cxx | 10 +++ sw/source/filter/ww8/docxtablestyleexport.cxx |5 + sw/source/filter/ww8/docxtablestyleexport.hxx |7 ++ writerfilter/source/dmapper/DomainMapper.cxx |6 +- writerfilter/source/dmapper/SdtHelper.cxx |5 + writerfilter/source/dmapper/SdtHelper.hxx |2 9 files changed, 58 insertions(+), 34 deletions(-) New commits: commit 3bd2fa9111ac95044240d4fb80fb4f4c1426bb06 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Jul 10 17:52:30 2014 +0200 Update sw/qa/extras/README The run() method is gone since 4.2. Change-Id: Ia7a9932001dff7834e960885096468148d47738a diff --git a/sw/qa/extras/README b/sw/qa/extras/README index 01e0976..fbc6aac 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -5,9 +5,9 @@ tests. This file documents how to add new testcases to this framework. == Import tests -Import tests are the easier ones. First you need to add a new entry to the -table inside the `run()` method, so the framework will load the specified file -to `mxComponent`, which represents the UNO model of the document. +Import tests are the easier ones. First you need to use +`DECLARE_SW_IMPORT_TEST()`, so the framework will load the specified file to +`mxComponent`, which represents the UNO model of the document. The rest of the testcase is about implementing the test method asserting this document model: use the UNO API to retrieve properties, then use @@ -26,6 +26,9 @@ at the `layout.xml` file in the current directory. Once you find the needed information in that file, you can write your XPath expression to turn that into a testcase. +(Similarly, Shift-F12 produces a `nodes.xml` for the document model dump, but +it's unlikely that you'll need that in a unit test.) + == Export tests Export tests are similar. Given that test documents are easier to provide in @@ -34,14 +37,13 @@ most cases, we will do an import, then do an export (to invoke the code we want to test) and then do an import again, so we can do the testing by asserting the document model, just like we did for import tests. -Yes, this means that you can test the export code (using this framework) if the -importer is working correctly. (But that's not so bad, users usually expect a -feature to work in both the importer and the exporter.) +Yes, this means that you can only test the export code (using this framework) +if the importer is working correctly. (But that's not so bad, users usually +expect a feature to work in both the importer and the exporter.) The only difference is that in these tests the test method is called twice: once after the initial import -- so you can see if the export fails due to an -import problem in fact -- and once after the export and import. The test -method should still assert the document model only, as discussed above. +import problem in fact -- and once after the export and import. === Direct XPath assertions @@ -49,14 +51,12 @@ An other alternative is to assert the resulted export document directly. Currently this is only implemented for DOCX, which is a zipped XML, so it's possible to evaluate XPath checks. A check looks like this: -xmlDocPtr pXmlDoc = parseExport(word/document.xml); -if (!pXmlDoc) -return; -assertXPath(pXmlDoc, xpath selecting the node, attribute, value); +if (xmlDocPtr pXmlDoc = parseExport(word/document.xml)) +assertXPath(pXmlDoc, xpath selecting the node, attribute, value); It's important to check for the NULL pointer here, it's expected that it'll be NULL when the test runs first (after the first import), as there is nothing -exported yet. +exported yet. For other XPath assert variants, see the `XmlTestTools` class. == Helper methods @@ -115,7 +115,7 @@ develop quickly. With some experimenting, you'll end up with something like this: -oStyle = ThisComponent.StyleFamilies.PageStyles.Default +oStyle = ThisComponent.StyleFamilies.PageStyles.getByName(Default Style) xray oStyle.IsLandscape @@ -124,14 +124,8 @@ when later this test fails for some reason. In cpp, you typically need to be more verbose, so the code will look like: -uno::Referencestyle::XStyleFamiliesSupplier xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY); -uno::Referencecontainer::XNameAccess xStyles(xStyleFamiliesSupplier-getStyleFamilies(), uno::UNO_QUERY); -uno::Referencecontainer::XNameAccess xPageStyles(xStyles-getByName(PageStyles), uno::UNO_QUERY); -uno::Referencebeans::XPropertySet xStyle(xPageStyles-getByName(DEFAULT_STYLE), uno::UNO_QUERY); - -sal_Bool bIsLandscape = sal_False; -xStyle-getPropertyValue(IsLandscape) = bIsLandscape; -CPPUNIT_ASSERT_EQUAL(sal_True,
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/wrkwin.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 6363e1e3739cce7bc6ff6962b4021cf95fac340a Author: Douglas Mencken dougmenc...@gmail.com Date: Tue Jul 8 20:23:12 2014 -0400 vcl/source/window/wrkwin.cxx: drop unused svsys.h header Change-Id: Iad99721f6026512584c6e1cb763b81ffc6d1a625 Reviewed-on: https://gerrit.libreoffice.org/10152 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index cf06c7c..9b614ea 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -23,7 +23,6 @@ #include vcl/svapp.hxx #include vcl/wrkwin.hxx // declare system types in sysdata.hxx -#include svsys.h #include vcl/sysdata.hxx #include com/sun/star/lang/XComponent.hpp #include com/sun/star/rendering/XCanvas.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/ppt/slidefragmenthandler.hxx |2 +-
oox/source/ppt/slidefragmenthandler.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e3bd5018dcf76694841131471d9e87e414487564
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 10 16:17:16 2014 +0100
coverity#1224995 Uncaught exception
and
coverity#1224994 Uncaught exception
Change-Id: I7f25e3829dbd1e5d68561ca9853ab8fc10c79484
diff --git a/include/oox/ppt/slidefragmenthandler.hxx
b/include/oox/ppt/slidefragmenthandler.hxx
index 79ec4cb..4207263 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -34,7 +34,7 @@ namespace oox { namespace ppt {
class SlideFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
-SlideFragmentHandler( ::oox::core::XmlFilterBase rFilter, const OUString
rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation
) throw();
+SlideFragmentHandler( ::oox::core::XmlFilterBase rFilter, const OUString
rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation
);
virtual ~SlideFragmentHandler() throw();
virtual void finalizeImport() SAL_OVERRIDE;
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index 828295e..05f571e 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::container;
namespace oox { namespace ppt {
-SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase rFilter, const
OUString rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation
eShapeLocation ) throw()
+SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase rFilter, const
OUString rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation
eShapeLocation )
: FragmentHandler2( rFilter, rFragmentPath )
, mpSlidePersistPtr( pPersistPtr )
, meShapeLocation( eShapeLocation )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bitmap.cxx | 24 +---
1 file changed, 1 insertion(+), 23 deletions(-)
New commits:
commit ee36fc7add892690c95a969530ecdcfc1bc9decc
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 10 17:59:28 2014 +0200
fdo#80498: vcl: Revert fdo#74124: Scale the pictures before calling ...
... ImplDrawAlpha().
This reverts commit 3cf3700b7a903e88f5296076c40ae854bce91cdc.
It may look nicer but is unusably slow when scrolling in Writer.
Conflicts:
vcl/source/gdi/outdev2.cxx
Change-Id: I582f3f02a2f8915c244b04b2fe95b6af926396b9
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 78302b3..56c5033 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -492,29 +492,7 @@ void OutputDevice::DrawDeviceBitmap( const Point rDestPt,
const Size rDestSize
{
if (rBitmapEx.IsAlpha())
{
-Size aDestSizePixel(LogicToPixel(rDestSize));
-
-BitmapEx aScaledBitmapEx(rBitmapEx);
-Point aSrcPtPixel(rSrcPtPixel);
-Size aSrcSizePixel(rSrcSizePixel);
-
-// we have beautiful scaling algorithms, let's use them
-if (aDestSizePixel != rSrcSizePixel rSrcSizePixel.Width() != 0
rSrcSizePixel.Height() != 0)
-{
-double fScaleX = std::abs(aDestSizePixel.Width() /
double(rSrcSizePixel.Width()));
-double fScaleY = std::abs(aDestSizePixel.Height() /
double(rSrcSizePixel.Height()));
-
-aScaledBitmapEx.Scale(fScaleX, fScaleY);
-
-// Negative size values are used for mirroring, but Scale already
takes
-// care of mirroring so convert all negative values to positive.
-aSrcSizePixel = Size(std::abs(aDestSizePixel.Width()),
- std::abs(aDestSizePixel.Height()));
-
-aSrcPtPixel.X() = rSrcPtPixel.X() * fScaleX;
-aSrcPtPixel.Y() = rSrcPtPixel.Y() * fScaleY;
-}
-DrawDeviceAlphaBitmap(aScaledBitmapEx.GetBitmap(),
aScaledBitmapEx.GetAlpha(), rDestPt, rDestSize, aSrcPtPixel, aSrcSizePixel);
+DrawDeviceAlphaBitmap(rBitmapEx.GetBitmap(), rBitmapEx.GetAlpha(),
rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel);
}
else if (!!rBitmapEx)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/interpr1.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit be91c2086afef99dc9569ac6aa4835c5072bffdf
Author: Eike Rathke er...@redhat.com
Date: Thu Jul 10 16:13:40 2014 +0200
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e
(cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085)
Reviewed-on: https://gerrit.libreoffice.org/10196
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8c86e56..493080a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -255,6 +255,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+// Act on implicitly propagated error, if any.
+if (nOldGlobalError)
+nGlobalError = nOldGlobalError;
+if (nGlobalError)
+bError = true;
break;
case svError:
PopError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/interpr1.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 50b9fe07f9851160e12922feb7d96d6f7ae5b52e
Author: Eike Rathke er...@redhat.com
Date: Thu Jul 10 16:13:40 2014 +0200
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e
(cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085)
Reviewed-on: https://gerrit.libreoffice.org/10198
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a834488..a42dbad 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -255,6 +255,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+// Act on implicitly propagated error, if any.
+if (nOldGlobalError)
+nGlobalError = nOldGlobalError;
+if (nGlobalError)
+bError = true;
break;
case svError:
PopError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74124, which changed state. Bug 74124 Summary: Pictures in Writer look ugly on the screen https://bugs.freedesktop.org/show_bug.cgi?id=74124 What|Removed |Added Status|RESOLVED|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: Branch 'feature/gsoc14-personas' - cui/source
cui/source/options/personalization.cxx | 28 +++-
cui/source/options/personalization.hxx |3 +++
2 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit bba5ba8a7e02e8f35d1a5f9e65723a19fdc57d28
Author: Rachit Gupta rachitgupta1...@gmail.com
Date: Thu Jul 10 23:23:12 2014 +0530
Fixed thread related issues.
Added a data member m_bExecute which defaults to true but is set to
false when StopExecution is called. During execution, the member's value
is checked at various positions, if it is false, the execution is stopped
by returning from the execute method.
Following issues have been resolved:
* Multiple searches can be performed. The previous search is halted.
* Cancel button can be pressed in between any search or application of
the persona.
* A theme can be selected and applied by clicking on OK while the search
is being done.
Change-Id: Ic76c224ca0d317a6e1a44b3e8933a3ba50b371cb
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index e67318a..d69076e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -112,7 +112,10 @@ OUString SelectPersonaDialog::GetSelectedPersona() const
IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
{
OUString searchTerm;
-if( pButton == m_pSearchButton)
+if( m_rSearchThread.is() )
+m_rSearchThread-StopExecution();
+
+if( pButton == m_pSearchButton )
searchTerm = m_pEdit-GetText();
else
{
@@ -146,14 +149,17 @@ IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /*
pButton */ )
}
else
+{
+if( m_rSearchThread.is() )
+m_rSearchThread-StopExecution();
EndDialog( RET_OK );
+}
return 0;
}
IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*, /* pButton */ )
{
-if( m_rSearchThread.is() )
-m_rSearchThread-terminate();
+m_rSearchThread-StopExecution();
EndDialog( RET_CANCEL );
return 0;
@@ -161,6 +167,9 @@ IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*,
/* pButton */ )
IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton )
{
+if( m_rSearchThread.is() )
+m_rSearchThread-StopExecution();
+
for( sal_Int32 index = 0; index 9; index++ )
{
if( pButton == m_vResultList[index] )
@@ -526,7 +535,8 @@ SearchAndParseThread::SearchAndParseThread(
SelectPersonaDialog* pDialog,
const OUString rURL ) :
Thread( cuiPersonasSearchThread ),
m_pPersonaDialog( pDialog ),
-m_aURL( rURL )
+m_aURL( rURL ),
+m_bExecute( true )
{
}
@@ -587,6 +597,9 @@ void SearchAndParseThread::execute()
aFilter.ImportGraphic( aGraphic, aURLObj );
Bitmap aBmp = aGraphic.GetBitmap();
+if( !m_bExecute )
+return;
+
// for VCL to be able to do visual changes in the thread
SolarMutexGuard aGuard;
m_pPersonaDialog-SetImages( Image( aBmp ), nIndex++ );
@@ -594,8 +607,10 @@ void SearchAndParseThread::execute()
m_pPersonaDialog-AddPersonaSetting( aPersonaSetting );
}
-SolarMutexGuard aGuard;
+if( !m_bExecute )
+return;
+SolarMutexGuard aGuard;
sProgress = ;
m_pPersonaDialog-SetProgress( sProgress );
m_pPersonaDialog-setOptimalLayoutSize();
@@ -657,6 +672,9 @@ void SearchAndParseThread::execute()
return;
}
+if( !m_bExecute )
+return;
+
SolarMutexGuard aGuard;
aPersonaSetting = aHeaderFile + ; + aFooterFile + ; + aTextColor +
; + aAccentColor;
diff --git a/cui/source/options/personalization.hxx
b/cui/source/options/personalization.hxx
index a09226e..92ce3de 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -116,6 +116,7 @@ private:
SelectPersonaDialog *m_pPersonaDialog;
OUString m_aURL;
+bool m_bExecute;
virtual ~SearchAndParseThread();
virtual void execute() SAL_OVERRIDE;
@@ -125,6 +126,8 @@ public:
SearchAndParseThread( SelectPersonaDialog* pDialog,
const OUString rURL );
+
+void StopExecution() { m_bExecute = false; }
};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering3' - 7 commits - desktop/source include/LibreOfficeKit include/osl include/vcl libreofficekit/qa libreofficekit/source sal/osl sal/uti
Rebased ref, commits from common ancestor:
commit aef3fcd39558e424b816e5eb07a9421ab046ff0f
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 10 12:19:36 2014 +0200
Check whether Command Args are already set up before doing so.
Could already be set up e.g. if a client application is using UNO
separately, in addition to LOK.
Change-Id: I50c3230b6f2456360273902a308c303576baac10
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e1931b5..520d7ca 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -607,7 +607,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
try
{
-osl_setCommandArgs(0, NULL);
+// If we've set up the command args elsewhere then we cannot do it
+// again (as an assert will fire), this will be the case e.g.
+// for unit tests (and possibly if UNO is being used in addition
+// to LOK in an external program).
+if (!osl_areCommandArgsSet())
+{
+osl_setCommandArgs(0, NULL);
+}
initialize_uno(aAppURL);
force_c_locale();
commit 91e852a36d57e514dd4b1fb5421e9e5e19172ea4
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 10 12:17:05 2014 +0200
Introduce osl_areCommandArgsSet.
We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).
Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb
diff --git a/include/osl/process.h b/include/osl/process.h
index 7d0960e..1a9a416 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,6 +366,11 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL
osl_getCommandArgCount(void);
SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
sal_uInt32 nArg, rtl_uString **strCommandArg);
+/** Determine whether or not the command args have already been set.
+@return The command args are already set, and may not be set again.
+*/
+SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet ();
+
/** Set the command-line arguments as passed to the main-function of this
process.
Deprecated: This function is only for internal use. Passing the args from
main will
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d28f46d..b63f222 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -191,6 +191,11 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
return (result);
}
+int SAL_CALL osl_areCommandArgsSet (void)
+{
+return (g_command_args.m_nCount 0);
+}
+
/***
osl_setCommandArgs().
**/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3dd0e77..25f4e58 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -374,6 +374,12 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
/***/
+int SAL_CALL osl_areCommandArgsSet(void)
+{
+return (g_command_args.m_nCount 0);
+}
+
+
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
osl_acquireMutex (*osl_getGlobalMutex());
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 1d7d491..6e95369 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -677,6 +677,12 @@ LIBO_UDK_4.3 { # symbols available in = LibO 4.3
rtl_freeAlignedMemory;
} LIBO_UDK_4.2;
+LIBO_UDK_4.4 { # symbols available in = LibO 4.4
+global:
+osl_areCommandArgsSet;
+} LIBO_UDK_4.3;
+
+
PRIVATE_1.0 {
global:
osl_detail_ObjectRegistry_storeAddresses;
commit 857191867751824db6fcc057f4ebaa04d374cf4d
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 10 11:37:36 2014 +0200
svp clipping again: Rectangle dimensions don't map directly to B2IBox.
This is the same as in 80f3211a7aeff221718703c445be4c753e0a1067.
Change-Id: Ibb981da064b4fc97fd865be2decabd8798de7380
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 35c582d..9c1d4e5 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -259,8 +259,8 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox
aRange, SvpSalGraphi
m_aDevice = basebmp::subsetBitmapDevice( m_aOrigDevice,
basegfx::B2IBox
(aHitRect.Left(),
aHitRect.Top(),
-
aHitRect.Right(),
-
[Libreoffice-commits] core.git: include/svx
include/svx/svdoole2.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 1c01cf1ef56f63d8a827298c5e7f900b1ea37f49
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jul 10 14:23:38 2014 -0400
This forward declaration no longer needed.
Change-Id: I2b760d71651d48c2e944f9344bd115e9443aa9a2
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 9922f4c..238756b 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -39,7 +39,6 @@ namespace frame { class XModel; }
namespace svt { class EmbeddedObjectRef; }
-class SvxUnoShapeModifyListener;
class SdrOle2ObjImpl;
class SVX_DLLPUBLIC SdrOle2Obj : public SdrRectObj
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/RemoteDialogClientBox.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2eb750cdd67710eb10292654a6eda8415d528765
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 10 21:02:04 2014 +0200
Align the pin-box description better.
This layouting isn't really great -- it would probably be better
to have some sort of normal widget construction in the longer run,
but for now this makes the dialog look a bit better.
Change-Id: Id40866b68992c9fb03049903fe19d4c68936945a
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 4af291f..ab454a1 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -379,6 +379,9 @@ void ClientBox::RecalcAll()
aPos = Point( aEntryRect.Left() + GetTextWidth( sPinText ),
aEntryRect.Bottom() - TOP_OFFSET -
aPinBoxSize.Height() );
m_aPinBox.SetPosPixel( aPos );
+// The text would have it's TOP aligned with the top of
+// the pin box -- hence we push it down to align baselines.
+m_sPinTextRect += Point( 0, 4 );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/msfilter/eschesdo.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 11d6ae6df8dfff1db182ac455d4abcaf7c18ded1 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Dec 8 00:05:59 2013 +0100 fdo#80201: msfilter: fix infinite loop during export (regression from 6c5557c60f97778fd732c01f054553356ce7f258) (cherry picked from commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c) Signed-off-by: Michael Stahl mst...@redhat.com Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 25efbad..0e20dfb 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -101,6 +101,8 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject rObj, EscherProperty // for position calculations, we normalize the angle between 0 and 90 degrees if ( nAngle 0 ) nAngle = ( 36000 + nAngle ) % 36000; +if ( nAngle % 18000 == 0 ) +nAngle = 0; while ( nAngle 9000 ) nAngle = ( 18000 - ( nAngle % 18000 ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Michael S, Christian, Cedric, Stephan, Ptyl, Miklos, Jacobo, Timar, Eike, Caolan, Michael M, Bjoern, Muthu, Jan-Marek, Tibby, David, Kohei * Completed Action Items: + Developers: please submit fixes for -4-3-0 as well. + All mentors, please invite students in good standing to LibOCon! [ 3 students said they would come already ] + scripting to generate / list last week's UI changes (Cloph) [ to arrive on Saturday ] + revert partial fillattribute work on the -4-3 branch (Miklos) [ one more review appreciated for 4-3-0 ] + poke potential Boston Hackfest hosters again (Michael) [ perhaps Xamarin will host us ]. + build a 4.2.5.3 with registry fix (Cloph) [ done a build, will push it live when 4.2.6rc1 is pushed ] + invite Umesh Kadam to next ESC call (Michael) * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + submit GL3DChart disable for patch review (Markus) + try to add per-process resource limits for crashtest (Markus) + eg. bash's builtin ulimit [-SHacdflmnpstuv [limit]] etc. + setup some VM's that can be created on-demand (Cloph) * GSOC Update (Cedric) + remind mentors to invite students to the conference, TDF will pay for their travel (if they book in a timely way) + 4/10 is not a great score. + also remember to register for the conference: http://conference.libreoffice.org/2014/registration/ * Release Engineering update (Christian) + 4.2.6 RC1 being up-loaded to staging + will announce shortly. + then will push to the mirrors for general public + 4.3.0 RC3 - final deadline on Monday for this + make sure your patches are pushed reviewed in time. https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-3-0,n,z + Android / iOS remotes + patch in gerrit for gradle build-system. + will investigate that wrt. tools for new android developers + requirements (Michael) 1. reproducible - gradle allows explicit versions unlike black magic / mavern. (Cloph) 2. compliant - need to be able to re-build the same thing in future - identically + virtually no external deps (Cloph) * 2 minute Umesh / Synezip introduction (Umesh) + working on interop. of DOCX, working for last 8-10 months. + chart / and other areas. + working on combinations of shapes import / export + also working on regression tests + running scripts on random files from bugzilla + see if there is any crash / corruption etc. + working on crash/corruption issues too AI: + can you open-source those and speak on the conference (Umesh) * Mail Merge (Eilidh,Bjoern,Jan-Marek) + Multiple people looking at this (Bjoern) + no wonder it is very slow; if you use the std. way of clicking through the UI + it creates one document, then it merges the 2nd one into that re-layout with each step. + huge cost for 10k documents - some N^2. + one reason - is to remember the page number to split the document + really quite insane. + naive approach - use bookmarks to split the documents ... + could save the re-layout. + Have some examples - 16k - 20k documents (Jan Marek) + the copying of the docs gets slower slower. + https://bugs.freedesktop.org/show_bug.cgi?id=80823 + layouting is 3-4% the rest is just copying. + in the copying of the underlying document. + Primary problem cf. mail (Jan Marek) + see http://lists.freedesktop.org/archives/libreoffice/2014-July/062227.html for the gory details + loading of a document is broken: with paragraph-bound anchors. + patches in private/jmux/mailmerge-fixes branch - can create copies. + before that, copying from A-B is broken. + lots of pending patches; want to finish them and write some unit tests from test docs in mail-merge bugs. + https://bugs.freedesktop.org/show_bug.cgi?id=80926 + Bjoern's callgrind results are different (Bjoern) + with an artificial document, perhaps not representative, but showed the problem ~all in layout. + Something has changed wrt. copying the SwNodes (Jan-Marek) + performance is hard to keep good (Michael) + be great to have a test we can add to our performance tests + working on a branch: private/jmux/mailmerge-fixes + should all work on same branch ? (Bjoern) + currently doing re-factoring elsewhere (Ellie) + breaking down the massive / monolithic mail merge fn. + mail-merge is now working
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 3ffb06e76be9be7499f12973139949ddbf6297b9
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 10 22:47:27 2014 +0200
fdo#80410: sw: DOCX export: support DOCX embedded objects
Change-Id: Ifa9e12eee4139a9c9c5d17a349ff3511c62b3ea8
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddd2379..168fa9d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4455,7 +4455,12 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
sFileExtension = docm;
}
-//Implementation for embedded Word 97-2003 document was missing
+else if (sProgID == Word.Document.12)
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.wordprocessingml.document;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+sFileExtension = docx;
+}
else if( sProgID == Word.Document.8 )
{
sMediaType = application/msword;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/container/embeddedobjectcontainer.cxx | 27 +---
1 file changed, 2 insertions(+), 25 deletions(-)
New commits:
commit d5dd1216804afae35d7fe7dbb1d37b0ca1fcce88
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jul 10 20:09:15 2014 -0400
Use OUStringHash here.
Change-Id: I37625fb421e5b20f299fbc9d5ac74c31de3c
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 9286ec8..d614c1a 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -47,32 +47,9 @@
using namespace ::com::sun::star;
-namespace comphelper
-{
-
-struct hashObjectName_Impl
-{
-size_t operator()(const OUString Str) const
-{
-return (size_t)Str.hashCode();
-}
-};
-
-struct eqObjectName_Impl
-{
-bool operator()(const OUString Str1, const OUString Str2) const
-{
-return ( Str1 == Str2 );
-}
-};
+namespace comphelper {
-typedef boost::unordered_map
-
-OUString,
-::com::sun::star::uno::Reference com::sun::star::embed::XEmbeddedObject
,
-hashObjectName_Impl,
-eqObjectName_Impl
-
+typedef boost::unordered_mapOUString, uno::Reference
embed::XEmbeddedObject, OUStringHash
EmbeddedObjectContainerNameMap;
struct EmbedImpl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LibreOffice 4.2.5 RC1 test builds available
Hi *, for the upcoming new version 4.2.6, the builds for rc1 are now available on pre-releases. See https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.6_release for the complete schedule. (one additional rc is planned for 4.2.6) Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.5 final (rc2) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-6-release-4.2.6.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 4.2.6 RC1 test builds available
Hi *, for the upcoming new version 4.2.6, the builds for rc1 are now available on pre-releases. See https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.6_release for the complete schedule. (one additional rc is planned for 4.2.6) Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.5 final (rc2) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-6-release-4.2.6.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] minutes of ESC call ...
* Present: + Michael S, Christian, Cedric, Stephan, Ptyl, Miklos, Jacobo, Timar, Eike, Caolan, Michael M, Bjoern, Muthu, Jan-Marek, Tibby, David, Kohei * Completed Action Items: + Developers: please submit fixes for -4-3-0 as well. + All mentors, please invite students in good standing to LibOCon! [ 3 students said they would come already ] + scripting to generate / list last week's UI changes (Cloph) [ to arrive on Saturday ] + revert partial fillattribute work on the -4-3 branch (Miklos) [ one more review appreciated for 4-3-0 ] + poke potential Boston Hackfest hosters again (Michael) [ perhaps Xamarin will host us ]. + build a 4.2.5.3 with registry fix (Cloph) [ done a build, will push it live when 4.2.6rc1 is pushed ] + invite Umesh Kadam to next ESC call (Michael) * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + submit GL3DChart disable for patch review (Markus) + try to add per-process resource limits for crashtest (Markus) + eg. bash's builtin ulimit [-SHacdflmnpstuv [limit]] etc. + setup some VM's that can be created on-demand (Cloph) * GSOC Update (Cedric) + remind mentors to invite students to the conference, TDF will pay for their travel (if they book in a timely way) + 4/10 is not a great score. + also remember to register for the conference: http://conference.libreoffice.org/2014/registration/ * Release Engineering update (Christian) + 4.2.6 RC1 being up-loaded to staging + will announce shortly. + then will push to the mirrors for general public + 4.3.0 RC3 - final deadline on Monday for this + make sure your patches are pushed reviewed in time. https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-3-0,n,z + Android / iOS remotes + patch in gerrit for gradle build-system. + will investigate that wrt. tools for new android developers + requirements (Michael) 1. reproducible - gradle allows explicit versions unlike black magic / mavern. (Cloph) 2. compliant - need to be able to re-build the same thing in future - identically + virtually no external deps (Cloph) * 2 minute Umesh / Synezip introduction (Umesh) + working on interop. of DOCX, working for last 8-10 months. + chart / and other areas. + working on combinations of shapes import / export + also working on regression tests + running scripts on random files from bugzilla + see if there is any crash / corruption etc. + working on crash/corruption issues too AI: + can you open-source those and speak on the conference (Umesh) * Mail Merge (Eilidh,Bjoern,Jan-Marek) + Multiple people looking at this (Bjoern) + no wonder it is very slow; if you use the std. way of clicking through the UI + it creates one document, then it merges the 2nd one into that re-layout with each step. + huge cost for 10k documents - some N^2. + one reason - is to remember the page number to split the document + really quite insane. + naive approach - use bookmarks to split the documents ... + could save the re-layout. + Have some examples - 16k - 20k documents (Jan Marek) + the copying of the docs gets slower slower. + https://bugs.freedesktop.org/show_bug.cgi?id=80823 + layouting is 3-4% the rest is just copying. + in the copying of the underlying document. + Primary problem cf. mail (Jan Marek) + see http://lists.freedesktop.org/archives/libreoffice/2014-July/062227.html for the gory details + loading of a document is broken: with paragraph-bound anchors. + patches in private/jmux/mailmerge-fixes branch - can create copies. + before that, copying from A-B is broken. + lots of pending patches; want to finish them and write some unit tests from test docs in mail-merge bugs. + https://bugs.freedesktop.org/show_bug.cgi?id=80926 + Bjoern's callgrind results are different (Bjoern) + with an artificial document, perhaps not representative, but showed the problem ~all in layout. + Something has changed wrt. copying the SwNodes (Jan-Marek) + performance is hard to keep good (Michael) + be great to have a test we can add to our performance tests + working on a branch: private/jmux/mailmerge-fixes + should all work on same branch ? (Bjoern) + currently doing re-factoring elsewhere (Ellie) + breaking down the massive / monolithic mail merge fn. + mail-merge is now working
[Libreoffice-qa] Request for assistance with bibliography, index, and mail merge writer bugs
Hi All, Sorry to bother you all again, but bibliography, index and mail merge bugs are above my level, so i'd appreciate any assistants putting them to bed. - bibliography - https://bugs.freedesktop.org/show_bug.cgi?id=76967 https://bugs.freedesktop.org/show_bug.cgi?id=80753 - mail merge - https://bugs.freedesktop.org/show_bug.cgi?id=80810 - index - https://bugs.freedesktop.org/show_bug.cgi?id=73573 I'm happy to report that there are less than 50 unconfirmed writer bugs from jan 1st that have less than 6 comments and are not enhancement requests. -- Regards, Jay Philips ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 81132] Removal of formatting options from the right-click context menu
https://bugs.freedesktop.org/show_bug.cgi?id=81132 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #4 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #1) I am strongly against this removal. Why do you want we impose the user only one way to access a function? Redundancy is a good thing there, some users could easier find the function in a toolbar, others in a menu and the last in the contextual menu. Basically I agree here. Of course, when the holy grail of the UI forcing proper use of styles is invented, I'll change my opinion here ;) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81135] EDITING: Superfluous paste option.
https://bugs.freedesktop.org/show_bug.cgi?id=81135 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||c...@nouenoff.nl Ever confirmed|0 |1 --- Comment #1 from Cor Nouws c...@nouenoff.nl --- Hi klsu, thanks for your report here. I think this is covered also in another issue. Looking at - bug 43442 - bug 69750 - bug 79116 Any preference? Cheers, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81133] EDITING: Improper handling of navigation within range selection.
https://bugs.freedesktop.org/show_bug.cgi?id=81133 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #1 from Cor Nouws c...@nouenoff.nl --- hi klsu, Did you have the opportunity to check this on a recent version, i.e. 4.2.5 or 4.3.0 AFAIAA, this has been subject to change recently. thanks, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81146] New: Avoid corruption of registrymodifications.xcu
https://bugs.freedesktop.org/show_bug.cgi?id=81146 Priority: medium Bug ID: 81146 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Avoid corruption of registrymodifications.xcu Severity: enhancement Classification: Unclassified OS: All Reporter: kumaras...@gmail.com Hardware: x86-64 (AMD64) Status: NEW Version: 4.1.6.2 release Component: Libreoffice Product: LibreOffice Situation: When I experience a system crash or power cut, there's a chance that I lose settings in registrymodifications.xcu. (A new file is created upon reload.) This seems to happen when the file is being written, and the chances of it is greater when AutoSave is set more frequently. It has happen to me a few times before. Now I have it backed up regularly, thus it can be restored. However, this can be very annoying for non-power users. Request: EITHER Isolate the AutoSave from registrymodifications.xcu OR (at least) Have LO run AutoSave only if indeed changes have been made to the doc. (This shouldn't be difficult as LO already has the ability to detect changes since last save. The change of color in the Save icon indicates so.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81141] Extension AltSearch: Do not work in libreoffice 4.3.0.2, and can not be removed
https://bugs.freedesktop.org/show_bug.cgi?id=81141 Jay Philips philip...@hotmail.com changed: What|Removed |Added CC||philip...@hotmail.com --- Comment #1 from Jay Philips philip...@hotmail.com --- Hi Kevin, I was able to remove it successfully on 4.3.0.2 on Windows 7. I installed it both in 'only for me' and 'for all users' modes and was able to uninstall it successfully. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81147] New: Assertion failure when Right-clicking and selecting Area... on a graphic in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=81147 Priority: medium Bug ID: 81147 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Assertion failure when Right-clicking and selecting Area... on a graphic in Writer Severity: critical Classification: Unclassified OS: Linux (All) Reporter: t...@iki.fi Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Libreoffice Product: LibreOffice Open a Writer document, add a rectangle, right-click on it, select Area... It crashes with an ssertion failure: include/rtl/ref.hxx:166: reference_type *rtl::ReferenceXColorList::operator-() const [reference_type = XColorList]: Assertion `m_pBody != 0' failed -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81147] Assertion failure when Right-clicking and selecting Area... on a graphic in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=81147 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Blocks||79641 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Depends on||81147 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81147] Assertion failure when right-clicking and selecting Area... on a graphic in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=81147 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Summary|Assertion failure when |Assertion failure when |Right-clicking and |right-clicking and |selecting Area... on a |selecting Area... on a |graphic in Writer |graphic in Writer -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81147] Assertion failure when right-clicking and selecting Area... on a graphic in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=81147 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Version|4.2.0.0.alpha0+ Master |4.4.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81148] New: Transparency gradients for graphics are displayed completely wrong on Linux
https://bugs.freedesktop.org/show_bug.cgi?id=81148 Priority: medium Bug ID: 81148 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Transparency gradients for graphics are displayed completely wrong on Linux Severity: normal Classification: Unclassified OS: Linux (All) Reporter: t...@iki.fi Hardware: Other Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: graphics stack Product: LibreOffice In current master: Open a fresh Draw document, add a rectangle, right-click and choose Area..., choose the Transparency tab, select Gradient, click OK. The result are a couple of horizontal bands inside the rectangle inside of a gradient. Works as it should on OS X and Windows. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Depends on||81148 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81148] Transparency gradients for graphics are displayed completely wrong on Linux
https://bugs.freedesktop.org/show_bug.cgi?id=81148 Tor Lillqvist t...@iki.fi changed: What|Removed |Added Blocks||79641 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81114] Format paintbrush does not work
https://bugs.freedesktop.org/show_bug.cgi?id=81114 --- Comment #2 from buzan...@gmail.com --- Created attachment 102519 -- https://bugs.freedesktop.org/attachment.cgi?id=102519action=edit Testfile that fails to use format paintbrush -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81149] New: VIEWING: Video plays in wrong location
https://bugs.freedesktop.org/show_bug.cgi?id=81149 Priority: medium Bug ID: 81149 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Video plays in wrong location Severity: normal Classification: Unclassified OS: All Reporter: matthew.hir...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.5.2 release Component: Presentation Product: LibreOffice In the attached libreoffice Imperss presentation, there is a single slide with two videos placed near the center of the screen horizontally. When this presentation is displayed (f5), the right hand video plays displaced upwards and to the left of where it is placed on the slide. I am running libreoffice-4.2.5.2-1.fc20.x86_64 on Fedora 20 Linux. I've seen this bug on two different systems with different video drivers, both running Fedora 20. The problem has something to do with the text boxes on the slide. Deleting one causes the second video to move to a new location when presented. Deleting both puts the videos in the correct location. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81141] Extension AltSearch: Do not work in libreoffice 4.3.0.2, and can not be removed
https://bugs.freedesktop.org/show_bug.cgi?id=81141 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Hardware|Other |x86 (IA32) OS|All |Windows (All) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
