LibreOffice Gerrit News 2013-09-04
Moin! * Open changes on master for project core changed in the last 25 hours: + improve performance of copyArea in Ios in https://gerrit.libreoffice.org/5707 from Tsahi Glik @ CloudOn + writerfilter: corrected define for debug output in https://gerrit.libreoffice.org/5800 from Andres Gomez + vcl/pdfwriter: export linear/axial gradients as PDF gradients in https://gerrit.libreoffice.org/5799 from Pierre-Eric Pelloux-Prayer + Print images in grayscale when printing using the Black White. in https://gerrit.libreoffice.org/5798 from Brian Fraser + Use the user specific tmp directory for firebird. in https://gerrit.libreoffice.org/5797 from Andrzej J.R. Hunt + delete code that was commented out in https://gerrit.libreoffice.org/5795 from Philipp Riemer + adjust code to layout in https://gerrit.libreoffice.org/5794 from Philipp Riemer + fdo#39468: Translate German comments (first part) in include/svl/filerec. in https://gerrit.libreoffice.org/5793 from Philipp Riemer + remove filerec.hxx inclusion where not needed in https://gerrit.libreoffice.org/5792 from Philipp Riemer + String to OUString in https://gerrit.libreoffice.org/5790 from Thomas Arnhold + calc export test on cell values, strings formulas in https://gerrit.libreoffice.org/5698 from Laurent Godard + Remove more unused methods in https://gerrit.libreoffice.org/5789 from Marcos Souza + Windows registry configuration backend in https://gerrit.libreoffice.org/5770 from Janos Farago + svx: new InteropGrabBag UNO prop in Shape service in https://gerrit.libreoffice.org/5769 from Andres Gomez + oox: Enhancing the debugging output in https://gerrit.libreoffice.org/5768 from Andres Gomez * Merged changes on master for project core changed in the last 25 hours: + Upgrade the bundled OpenSSL to 1.0.1e in https://gerrit.libreoffice.org/5718 from Tor Lillqvist + XubString-OUString in https://gerrit.libreoffice.org/5782 from Caolán McNamara + String to OUString in https://gerrit.libreoffice.org/5776 from Matteo Casalin + fdo#68877: Select ? as Elements window do in https://gerrit.libreoffice.org/5780 from Marcos Souza + Fix HTML closing tags order for slide notes. in https://gerrit.libreoffice.org/5771 from Artur Dryomov + startcenter: Add tooltips for thumbnails with long filenames in https://gerrit.libreoffice.org/5756 from Krisztian Pinter + Remove more unused methods in https://gerrit.libreoffice.org/5757 from Marcos Souza * 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: + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + fdo#66279 - MathML export: use the operator dictionary in https://gerrit.libreoffice.org/4671 from Frédéric Wang + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + fix for text watermark in https://gerrit.libreoffice.org/5568 from Adam CloudOn + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn + fdo#66577: non-fractional widths with Core Text in https://gerrit.libreoffice.org/5023 from Khaled Hosny Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e279f6efdf582812825d0ed388511b21c676f56
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 3 17:27:44 2013 +0200
fdo#68731: vcl: fix path for bundled fonts on Windows
WinSalGraphics::GetDevFontList(): remove the obsolete Basis from
the search path to find the bundled fonts.
(cherry picked from commit c91f7082180d1ca90467891f3b7ca9a3e845d9e7)
Conflicts:
vcl/win/source/gdi/salgdi3.cxx
Change-Id: I7d7d650243592944e3339dd75caf29f2b2fe6670
Reviewed-on: https://gerrit.libreoffice.org/5796
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 59fb0e6..fca7cc7 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2183,7 +2183,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList*
pFontList )
osl_getExecutableFile( aPath.pData );
aPath = aPath.copy( 0, aPath.lastIndexOf('/') );
String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') );
-aFontDirUrl += String(
RTL_CONSTASCII_USTRINGPARAM(/Basis/share/fonts/truetype) );
+aFontDirUrl += OUString(/share/fonts/truetype);
// collect fonts in font path that could not be registered
osl::Directory aFontDir( aFontDirUrl );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl
include/svl/filerec.hxx |4
1 file changed, 4 deletions(-)
New commits:
commit 5fe4829b5dd35bf2026e531ba4e634cc616fb658
Author: Philipp Riemer ruderphil...@gmail.com
Date: Tue Sep 3 19:51:29 2013 +0200
delete code that was commented out
Change-Id: I1d6e96a3cd26ada7911ee4a538e9441050ca75bc
Reviewed-on: https://gerrit.libreoffice.org/5795
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 5aeb0b9..4f8172c 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -629,8 +629,6 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter
sal_uInt32 nSize // Gro\se der Daten in Bytes
)
: _pStream( pStream ),
-// _nTag( uninitialized ),
-// _nStarPos( uninitialized ),
_bHeaderOk(true)
{
DBG_ASSERT( nTag != 0 nTag != 0xFF, invalid Tag );
@@ -751,8 +749,6 @@ inline sal_uInt32 SfxSingleRecordWriter::Close( bool
bSeekToEndOfRec )
SfxMiniRecordWriter::Close( bSeekToEndOfRec );
#endif
-// Record war bereits geschlossen
-// nRet = 0;
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 133 ++---
1 file changed, 81 insertions(+), 52 deletions(-)
New commits:
commit 02988a7a97dab7619d4f33e83385cce3982dc6e0
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Sep 2 13:57:41 2013 +0200
sw/paint: replace bools by enum in DrawGraphic method
This change has 2 purposes:
* fix gradient background when writing pdf. Before a gradient filled
frame would be displayed as white (or transparent), because the transp.
rendering mode was taking precedence over the gradient one.
* making the code more readable by grouping multiple conditions in
an enum.
Change-Id: I5a30756b72be5eabf364c67e175c7b9d22bfa1c0
Reviewed-on: https://gerrit.libreoffice.org/5759
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 55e1952..afba1d64 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2013,9 +2013,24 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// ( background color is transparent OR
/// background graphic is transparent and background color is
no fill
/// )
-bool bDrawTransparent = bConsiderBackgroundTransparency
-( ( aColor.GetTransparency() != 0) ||
-bTransparentGrfWithNoFillBackgrd );
+
+enum DrawStyle {
+Default,
+Transparent,
+Gradient
+} eDrawStyle = DrawStyle::Default;
+
+// Gradient and transparency are mutually exclusive (need to check
gradient first)
+if (pFillStyleItem pFillStyleItem-GetValue() == XFILL_GRADIENT
pFillGradientItem)
+{
+eDrawStyle = DrawStyle::Gradient;
+}
+else if (bConsiderBackgroundTransparency
+( ( aColor.GetTransparency() != 0) ||
+bTransparentGrfWithNoFillBackgrd ) )
+{
+eDrawStyle = DrawStyle::Transparent;
+}
// #i75614# reset draw mode in high contrast mode in order to get fill
color set
const sal_uLong nOldDrawMode = pOutDev-GetDrawMode();
@@ -2028,15 +2043,20 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// OD 06.08.2002 #99657# - if background region have to be drawn
/// transparent, set only the RGB values of the background color as
/// the fill color for the output device.
-if ( bDrawTransparent )
-{
-if( pOutDev-GetFillColor() != aColor.GetRGBColor() )
-pOutDev-SetFillColor( aColor.GetRGBColor() );
-}
-else
+switch (eDrawStyle)
{
-if( pOutDev-GetFillColor() != aColor )
-pOutDev-SetFillColor( aColor );
+case DrawStyle::Transparent:
+{
+if( pOutDev-GetFillColor() != aColor.GetRGBColor() )
+pOutDev-SetFillColor( aColor.GetRGBColor() );
+break;
+}
+default:
+{
+if( pOutDev-GetFillColor() != aColor )
+pOutDev-SetFillColor( aColor );
+break;
+}
}
// #i75614#
@@ -2044,57 +2064,66 @@ void DrawGraphic( const SvxBrushItem *pBrush,
pOutDev-SetDrawMode( nOldDrawMode );
/// OD 02.09.2002 #99657#
-if ( bDrawTransparent )
+switch (eDrawStyle)
{
-/// background region have to be drawn transparent.
-/// Thus, create a poly-polygon from the region and draw it with
-/// the corresponding transparency precent.
-PolyPolygon aDrawPoly( rOut.SVRect() );
-if ( aGrf.HasArea() )
+case DrawStyle::Transparent:
{
-if ( !bGrfIsTransparent )
+/// background region have to be drawn transparent.
+/// Thus, create a poly-polygon from the region and draw it
with
+/// the corresponding transparency precent.
+PolyPolygon aDrawPoly( rOut.SVRect() );
+if ( aGrf.HasArea() )
{
-/// substract area of background graphic from draw area
-/// OD 08.10.2002 #103898# - consider only that part of the
-/// graphic area that is overlapping with draw area.
-SwRect aTmpGrf = aGrf;
-aTmpGrf.Intersection( rOut );
-if ( aTmpGrf.HasArea() )
+if ( !bGrfIsTransparent )
{
-Polygon aGrfPoly( aTmpGrf.SVRect() );
-aDrawPoly.Insert( aGrfPoly );
+/// substract area of background graphic from draw
[Libreoffice-commits] core.git: cui/inc cui/source svl/source svx/source
cui/inc/pch/precompiled_cui.hxx|1 - cui/source/dialogs/cuifmsearch.cxx |1 - svl/source/items/style.cxx |1 - svx/source/form/fmsrccfg.cxx |1 - 4 files changed, 4 deletions(-) New commits: commit 387666fbd751561b53b5c7072e85551d22fced74 Author: Philipp Riemer ruderphil...@gmail.com Date: Tue Sep 3 19:19:41 2013 +0200 remove filerec.hxx inclusion where not needed Change-Id: Ia5a65cb53580ed1ed7535a787f4f762da5a43d43 Reviewed-on: https://gerrit.libreoffice.org/5792 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 965a275..74a9e8c 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -407,7 +407,6 @@ #include svl/ctloptions.hxx #include svl/eitem.hxx #include svl/filenotation.hxx -#include svl/filerec.hxx #include svl/flagitem.hxx #include svl/intitem.hxx #include svl/itemiter.hxx diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 96faf47..ad3304c 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -26,7 +26,6 @@ #include osl/mutex.hxx #include sfx2/app.hxx #include cuires.hrc -#include svl/filerec.hxx #include svx/fmsrccfg.hxx #include svx/fmsrcimp.hxx #include fmsearch.hrc diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1c04655..2695577 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -27,7 +27,6 @@ #include svl/itemset.hxx #include svl/itempool.hxx #include poolio.hxx -#include svl/filerec.hxx #include svl/itemiter.hxx #include svl/style.hxx #include unotools/syslocale.hxx diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index e2c78a2..c74e4df 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -18,7 +18,6 @@ */ #include svx/fmsrccfg.hxx -#include svl/filerec.hxx #include com/sun/star/i18n/TransliterationModules.hpp #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/xmloff xmloff/source
include/xmloff/xmlmultiimagehelper.hxx |2 -
xmloff/source/core/xmlmultiimagehelper.cxx |4 +--
xmloff/source/draw/ximpshap.cxx|5 ++--
xmloff/source/text/XMLTextFrameContext.cxx | 30 +++--
4 files changed, 34 insertions(+), 7 deletions(-)
New commits:
commit 11c465ef8205cf946b3c0810f7305fa9dd6c0bc0
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 3 00:32:08 2013 +0200
fdo#68839: ODF import: fix name of multi-image frame
When multiple image child elements are inside a frame, each one is
imported and gets unique name via SwDoc::SetFlyName(). But the
retained one is not necessarily the first one, which is the only one
that may have the original name.
Also the solveMultipleImages needs to return a smart pointer, as nothing
else keeps the image contexts alive.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6
(cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35)
Reviewed-on: https://gerrit.libreoffice.org/5777
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/xmloff/xmlmultiimagehelper.hxx
b/include/xmloff/xmlmultiimagehelper.hxx
index 7a7e2ab..050eff7 100644
--- a/include/xmloff/xmlmultiimagehelper.hxx
+++ b/include/xmloff/xmlmultiimagehelper.hxx
@@ -44,7 +44,7 @@ public:
/// see imlementation for evtl. changing weights and/or adding filetypes.
///
/// @returns import context of the selected image
-const SvXMLImportContext* solveMultipleImages();
+SvXMLImportContextRef solveMultipleImages();
/// add a content to the remembered image import contexts
void addContent(const SvXMLImportContext rSvXMLImportContext);
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx
b/xmloff/source/core/xmlmultiimagehelper.cxx
index 5159720..98aaef7 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -89,9 +89,9 @@ MultiImageImportHelper::~MultiImageImportHelper()
}
}
-const SvXMLImportContext* MultiImageImportHelper::solveMultipleImages()
+SvXMLImportContextRef MultiImageImportHelper::solveMultipleImages()
{
-const SvXMLImportContext* pContext(0);
+SvXMLImportContextRef pContext;
if(maImplContextVector.size() 1)
{
// multiple child contexts were imported, decide which is the most
valuable one
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 1906703..b8d3deb 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3566,8 +3566,9 @@ void SdXMLFrameShapeContext::StartElement(const
uno::Reference xml::sax::XAttri
void SdXMLFrameShapeContext::EndElement()
{
// solve if multiple image child contexts were imported
-const SvXMLImportContext* const pSelectedContext(solveMultipleImages());
-const SdXMLGraphicObjectShapeContext* pShapeContext( dynamic_castconst
SdXMLGraphicObjectShapeContext*( pSelectedContext ) );
+SvXMLImportContextRef const pSelectedContext(solveMultipleImages());
+const SdXMLGraphicObjectShapeContext* pShapeContext(
+dynamic_castconst
SdXMLGraphicObjectShapeContext*(pSelectedContext));
if ( pShapeContext !maShapeId.isEmpty() )
{
// fdo#64512 and fdo#60075 - make sure *this* shape is
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 4c268e6..3ca7e86 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -370,6 +370,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
const OUString sTextBoxServiceName;
const OUString sGraphicServiceName;
+OUString m_sOrigName;
OUString sName;
OUString sStyleName;
OUString sNextName;
@@ -447,6 +448,8 @@ public:
void SetDesc( const OUString rDesc );
+void SetName();
+
::com::sun::star::text::TextContentAnchorType GetAnchorType() const {
return eAnchorType; }
const ::com::sun::star::uno::Reference
@@ -901,6 +904,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
sStyleName = rValue;
break;
case XML_TOK_TEXT_FRAME_NAME:
+m_sOrigName = rValue;
sName = rValue;
break;
case XML_TOK_TEXT_FRAME_FRAME_NAME:
@@ -1284,6 +1288,19 @@ void XMLTextFrameContext_Impl::SetHyperlink( const
OUString rHRef,
}
}
+void XMLTextFrameContext_Impl::SetName()
+{
+ReferenceXNamed xNamed(xPropSet, UNO_QUERY);
+if (xNamed.is())
+{
+OUString const name(xNamed-getName());
+if (name != m_sOrigName)
+{
+xNamed-setName(m_sOrigName);
+}
+}
+}
+
// Implement Title/Description Elements UI (#i73249#)
void XMLTextFrameContext_Impl::SetTitle( const OUString rTitle )
{
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/filter/html/css1atr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d0f56a10fbbe6e4c86248ff763f4c3806c7b387
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Sep 3 18:57:42 2013 +0400
fix html export of line spacing
regression from 84931eb8aeeb55a2570edb24f5c2d3409f9c2398
Change-Id: Ifcedcd34721a1ca162495f57ad36cfc6859ab0c4
(cherry picked from commit 3103306f4753f546f881cfc6bcdb357d4e1857d8)
Reviewed-on: https://gerrit.libreoffice.org/5791
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 5a348e4..b791c6500 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2899,7 +2899,7 @@ static Writer OutCSS1_SvxLineSpacing( Writer rWrt,
const SfxPoolItem rHt )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
else if( nPrcHeight )
{
-OString sHeight(OString(nPrcHeight) + %);
+OString sHeight(OString::number(nPrcHeight) + %);
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl
include/svl/filerec.hxx | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) New commits: commit e1c732c1b45b07ad2fc414d85e725d6498c949a2 Author: Philipp Riemer ruderphil...@gmail.com Date: Tue Sep 3 19:50:46 2013 +0200 adjust code to layout Change-Id: Ia2eeb93fa1eb08c31b9b016c4cb15263633ab518 Reviewed-on: https://gerrit.libreoffice.org/5794 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 4f8172c..7ace888 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -201,22 +201,19 @@ protected: sal_uInt8 _nPreTag; // in den Header zu schreibendes 'Pre-Tag' public: -inline SfxMiniRecordWriter( SvStream *pStream, - sal_uInt8 nTag ); +inline SfxMiniRecordWriter( SvStream *pStream, sal_uInt8 nTag ); inline SfxMiniRecordWriter( SvStream *pStream, sal_uInt8 nTag, sal_uInt32 nSize ); - inline ~SfxMiniRecordWriter(); inline SvStream operator*() const; inline void Reset(); - -sal_uInt32 Close( bool bSeekToEndOfRec = true ); +sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: -// not implementend, not allowed -SfxMiniRecordWriter( const SfxMiniRecordWriter ); +/// not implementend, not allowed +SfxMiniRecordWriter( const SfxMiniRecordWriter ); SfxMiniRecordWriter operator=(const SfxMiniRecordWriter); }; @@ -272,7 +269,7 @@ public: SfxMiniRecordReader( SvStream *pStream, sal_uInt8 nTag ); inline ~SfxMiniRecordReader(); -inline sal_uInt8GetTag() const; +inline sal_uInt8GetTag() const; inline bool IsValid() const; inline SvStreamoperator*() const; @@ -280,8 +277,8 @@ public: inline void Skip(); private: -// not implementend, not allowed -SfxMiniRecordReader( const SfxMiniRecordReader ); +/// not implementend, not allowed +SfxMiniRecordReader( const SfxMiniRecordReader ); SfxMiniRecordReader operator=(const SfxMiniRecordReader); }; @@ -489,7 +486,7 @@ public: voidNewContent(); -virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); +virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /* [Beschreibung] @@ -588,11 +585,11 @@ public: ~SfxMultiRecordReader(); boolGetContent(); -inline sal_uInt16 GetContentTag(); -inline sal_uInt8GetContentVersion() const; +inline sal_uInt16 GetContentTag(); +inline sal_uInt8GetContentVersion() const; inline bool HasContentVersion( sal_uInt16 nVersion ) const; -inline sal_uInt32 ContentCount() const; +inline sal_uInt32 ContentCount() const; }; /* [Beschreibung] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 184 -
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 43 +-
chart2/source/controller/dialogs/tp_AxisLabel.src | 187 -
chart2/uiconfig/ui/tp_axisLabel.ui| 425 ++
5 files changed, 536 insertions(+), 304 deletions(-)
New commits:
commit 07aade88b05c3388b3344b8c244b0815b61ac141
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Wed Sep 4 10:52:43 2013 +0300
tp_axisLabel.ui widgets
Change-Id: I279d2989e6a3a8f0aa279c5aa8eb13251a6052da
Reviewed-on: https://gerrit.libreoffice.org/5801
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index ea08c58..999547c 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
chart2/uiconfig/ui/steppedlinesdlg \
chart2/uiconfig/ui/titlerotationtabpage \
+ chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_SeriesToAxis \
))
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 606052f..59ad0b5 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -36,30 +36,7 @@ namespace chart
{
SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet
rInAttrs ) :
-SfxTabPage( pParent, SchResId( TP_AXIS_LABEL ), rInAttrs ),
-
-aCbShowDescription( this, SchResId( CB_AXIS_LABEL_SCHOW_DESCR ) ),
-
-aFlOrder( this, SchResId( FL_AXIS_LABEL_ORDER ) ),
-aRbSideBySide( this, SchResId( RB_AXIS_LABEL_SIDEBYSIDE ) ),
-aRbUpDown( this, SchResId( RB_AXIS_LABEL_UPDOWN ) ),
-aRbDownUp( this, SchResId( RB_AXIS_LABEL_DOWNUP ) ),
-aRbAuto( this, SchResId( RB_AXIS_LABEL_AUTOORDER ) ),
-
-aFlSeparator( this, SchResId( FL_SEPARATOR ) ),
-aFlTextFlow( this, SchResId( FL_AXIS_LABEL_TEXTFLOW ) ),
-aCbTextOverlap( this, SchResId( CB_AXIS_LABEL_TEXTOVERLAP ) ),
-aCbTextBreak( this, SchResId( CB_AXIS_LABEL_TEXTBREAK ) ),
-
-aFlOrient( this, SchResId( FL_AXIS_LABEL_ORIENTATION ) ),
-aCtrlDial( this, SchResId( CT_AXIS_LABEL_DIAL ) ),
-aFtRotate( this, SchResId( FT_AXIS_LABEL_DEGREES ) ),
-aNfRotate( this, SchResId( NF_AXIS_LABEL_ORIENT ) ),
-aCbStacked( this, SchResId( PB_AXIS_LABEL_TEXTSTACKED ) ),
-aOrientHlp( aCtrlDial, aNfRotate, aCbStacked ),
-
-m_aFtTextDirection( this, SchResId( FT_AXIS_TEXTDIR ) ),
-m_aLbTextDirection( this, SchResId( LB_AXIS_TEXTDIR ),
m_aFtTextDirection ),
+SfxTabPage( pParent,
AxisLabelTabPage,modules/schart/ui/tp_axisLabel.ui, rInAttrs ),
m_bShowStaggeringControls( true ),
@@ -69,22 +46,39 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent,
const SfxItemSet rIn
m_bHasInitialStacking( true ),
m_bComplexCategories( false )
{
-FreeResource();
-
-aCbStacked.EnableTriState( sal_False );
-aOrientHlp.AddDependentWindow( aFlOrient );
-aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
-
-aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage,
ToggleShowLabel ) );
-
-// Make the fixed line separator vertical.
-aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT);
+get(m_pCbShowDescription, showlabelsCB);
+get(m_pFlOrder, orderL);
+get(m_pRbSideBySide, tile);
+get(m_pRbUpDown, odd);
+get(m_pRbDownUp, even);
+get(m_pRbAuto, auto);
+get(m_pFlTextFlow, textflowL);
+get(m_pCbTextOverlap, overlapCB);
+get(m_pCbTextBreak, breakCB);
+get(m_pFlOrient, labelTextOrient);
+get(m_pCtrlDial,dialCtrl);
+get(m_pFtRotate,degreeL);
+get(m_pNfRotate,OrientDegree);
+get(m_pCbStacked,stackedCB);
+get(m_pFtTextDirection,textdirL);
+get(m_pLbTextDirection,textdirLB);
+get(m_pFtABCD,labelABCD);
+m_pCtrlDial-SetText(m_pFtABCD-GetText());
+m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate,
*m_pCbStacked);
+m_pOrientHlp-Enable( sal_True );
+
+
+m_pCbStacked-EnableTriState( sal_False );
+m_pOrientHlp-AddDependentWindow( *m_pFlOrient );
+m_pOrientHlp-AddDependentWindow( *m_pFtRotate, STATE_CHECK );
+
+m_pCbShowDescription-SetClickHdl( LINK( this, SchAxisLabelTabPage,
ToggleShowLabel ) );
Construct();
}
SchAxisLabelTabPage::~SchAxisLabelTabPage()
-{}
+{delete m_pOrientHlp;}
void SchAxisLabelTabPage::Construct()
{
@@ -98,16 +92,16 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent,
const SfxItemSet rAtt
sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet rOutAttrs )
{
bool bStacked = false;
-
[Libreoffice-commits] core.git: 2 commits - chart2/source chart2/uiconfig sw/source
chart2/source/controller/inc/HelpIds.hrc |6 chart2/uiconfig/ui/tp_axisLabel.ui | 286 +++ sw/source/core/text/inftxt.hxx |2 sw/source/core/text/porfld.cxx |2 sw/source/core/text/porftn.hxx | 18 - sw/source/core/text/porhyph.hxx | 23 +- sw/source/core/text/porlay.hxx |4 sw/source/core/text/txtftn.cxx | 22 +- sw/source/core/text/txthyph.cxx | 14 - 9 files changed, 183 insertions(+), 194 deletions(-) New commits: commit 3e2c8d7c7bd116fe67914d93cb0ea5cb6d5a7c23 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 09:57:17 2013 +0100 discard unused HIDs now Change-Id: Ia2009331a2df849ed5ace0c6c5f7f2b8e53e1555 diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index fde7e24..c80fea9 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -44,12 +44,6 @@ #define HID_SCH_TBI_DATA_INSERT_TEXT_COL CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL #define HID_SCH_TBX_DATA CHART2_HID_SCH_TBX_DATA -#define HID_SCH_ALIGNMENT_CTR_DIAL CHART2_HID_SCH_ALIGNMENT_CTR_DIAL -#define HID_SCH_ALIGNMENT_STACKED CHART2_HID_SCH_ALIGNMENT_STACKED -#define HID_SCH_ALIGNMENT_DEGREES CHART2_HID_SCH_ALIGNMENT_DEGREES - -#define HID_SCH_TP_AXIS_LABEL CHART2_HID_SCH_TP_AXIS_LABEL - #define HID_SCH_CHART_AUTO_FORMAT CHART2_HID_SCH_CHART_AUTO_FORMAT #define HID_SCH_LB_BAR_GEOMETRY CHART2_HID_SCH_LB_BAR_GEOMETRY #define HID_SCH_DLG_RANGES CHART2_HID_SCH_DLG_RANGES diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui index 2f63f76..6165003 100644 --- a/chart2/uiconfig/ui/tp_axisLabel.ui +++ b/chart2/uiconfig/ui/tp_axisLabel.ui @@ -1,13 +1,18 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- + object class=GtkAdjustment id=adjustmentSpinDegrees +property name=upper359/property +property name=step_increment5/property + /object object class=GtkBox id=AxisLabelTabPage property name=visibleTrue/property property name=can_focusFalse/property -property name=orientationvertical/property property name=hexpandTrue/property property name=vexpandTrue/property property name=border_width6/property +property name=orientationvertical/property property name=spacing12/property child object class=GtkCheckButton id=showlabelsCB @@ -15,7 +20,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=activeTrue/property @@ -31,6 +35,8 @@ object class=GtkBox id=box2 property name=visibleTrue/property property name=can_focusFalse/property +property name=spacing18/property +property name=homogeneousTrue/property child object class=GtkFrame id=frame1 property name=visibleTrue/property @@ -41,22 +47,22 @@ object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property -property name=left_padding12/property property name=hexpandTrue/property property name=vexpandTrue/property property name=top_padding6/property +property name=left_padding12/property child object class=GtkBox id=box3 property name=visibleTrue/property property name=can_focusFalse/property property name=orientationvertical/property +property name=spacing6/property child object class=GtkRadioButton id=tile property name=label translatable=yes_Tile/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=activeTrue/property @@ -75,7 +81,6 @@ property name=visibleTrue/property property name=can_focusTrue/property
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 --- source/text/schart/01/05020201.xhp | 44 - 2 files changed, 20 insertions(+), 33 deletions(-) New commits: commit 0c4fc80ae026bce6476e321cc023575c318c7650 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 10:07:08 2013 +0100 update help ids for chart axis page .ui conversion Change-Id: I4cba66c506c4075661689192490ee97c10853bc3 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c0b525d..df827af 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3113,7 +3113,6 @@ HID_SCH_TITLE_SUB,63361, HID_SCH_TITLE_X,63362, HID_SCH_TITLE_Y,63363, HID_SCH_TITLE_Z,63364, -HID_SCH_TP_AXIS_LABEL,63322, HID_SCH_TRENDLINE_RB_EXPONENTIAL,63378, HID_SCH_TRENDLINE_RB_LINEAR,63376, HID_SCH_TRENDLINE_RB_LOGARITHMIC,63377, @@ -5687,9 +5686,6 @@ chart2_CheckBox_TP_3D_SCENEAPPEARANCE_CB_OBJECTLINES,551879681, chart2_CheckBox_TP_3D_SCENEAPPEARANCE_CB_SHADING,551879682, chart2_CheckBox_TP_3D_SCENEGEOMETRY_CBX_PERSPECTIVE,551863297, chart2_CheckBox_TP_3D_SCENEGEOMETRY_CBX_RIGHT_ANGLED_AXES,551863298, -chart2_CheckBox_TP_AXIS_LABEL_CB_AXIS_LABEL_SCHOW_DESCR,551945217, -chart2_CheckBox_TP_AXIS_LABEL_CB_AXIS_LABEL_TEXTBREAK,551945228, -chart2_CheckBox_TP_AXIS_LABEL_CB_AXIS_LABEL_TEXTOVERLAP,551945227, chart2_CheckBox_TP_AXIS_POSITIONS_CB_AXIS_BETWEEN_CATEGORIES,551683073, chart2_CheckBox_TP_AXIS_POSITIONS_CB_MAJOR_GRID,551683078, chart2_CheckBox_TP_AXIS_POSITIONS_CB_MINOR_GRID,551683079, @@ -5735,7 +5731,6 @@ chart2_ImageButton_TP_RANGECHOOSER_IB_RANGE,551808513, chart2_ListBox_TP_3D_SCENEAPPEARANCE_LB_SCHEME,551882242, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_AMBIENTLIGHT,551898625, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_LIGHTSOURCE,551898626, -chart2_ListBox_TP_AXIS_LABEL_LB_AXIS_TEXTDIR,551947796, chart2_ListBox_TP_AXIS_POSITIONS_LB_CROSSES_OTHER_AXIS_AT,551685633, chart2_ListBox_TP_AXIS_POSITIONS_LB_PLACE_LABELS,551685634, chart2_ListBox_TP_AXIS_POSITIONS_LB_PLACE_TICKS,551685638, @@ -5756,10 +5751,6 @@ chart2_PushButton_TP_DATA_SOURCE_BTN_ADD,551850526, chart2_PushButton_TP_DATA_SOURCE_BTN_DOWN,551850646, chart2_PushButton_TP_DATA_SOURCE_BTN_REMOVE,551850536, chart2_PushButton_TP_DATA_SOURCE_BTN_UP,551850636, -chart2_RadioButton_TP_AXIS_LABEL_RB_AXIS_LABEL_AUTOORDER,551944721, -chart2_RadioButton_TP_AXIS_LABEL_RB_AXIS_LABEL_DOWNUP,551944720, -chart2_RadioButton_TP_AXIS_LABEL_RB_AXIS_LABEL_SIDEBYSIDE,551944718, -chart2_RadioButton_TP_AXIS_LABEL_RB_AXIS_LABEL_UPDOWN,551944719, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y,551780866, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868, diff --git a/source/text/schart/01/05020201.xhp b/source/text/schart/01/05020201.xhp index 3eb3849..6a12250 100644 --- a/source/text/schart/01/05020201.xhp +++ b/source/text/schart/01/05020201.xhp @@ -28,7 +28,8 @@ /meta body section id=ausrichtung -bookmark xml-lang=en-US branch=modules/schart/ui/titlerotationtabpage/TitleRotationTabPage id=bm_id8467056 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/titlerotationtabpage/TitleRotationTabPage id=bm_id8467056 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_axisLabel/AxisLabelTabPage id=bm_id8467056 localize=false/ paragraph role=heading id=hd_id3149656 xml-lang=en-US level=1 l10n=U oldref=1link href=text/schart/01/05020201.xhp name=AlignmentAlignment/link/paragraphcommentnew name: Label/comment paragraph role=paragraph id=par_id3156422 xml-lang=en-US l10n=U oldref=2Modifies the alignment of axes or title labels./paragraph /section @@ -36,9 +37,9 @@ section id=howtoget embed href=text/schart/00/0004.xhp#frttyab/ /section -bookmark xml-lang=en-US branch=hid/chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR id=bm_id8467055 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_axisLabel/showlabelsCB id=bm_id8467055 localize=false/ paragraph role=heading id=hd_id3145750 xml-lang=en-US level=2 l10n=U oldref=71Show labels/paragraph -paragraph role=paragraph id=par_id3154319 xml-lang=en-US l10n=U oldref=72ahelp hid=SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCRSpecifies whether to show or hide the axis labels./ahelp/paragraph +paragraph role=paragraph id=par_id3154319 xml-lang=en-US l10n=U oldref=72ahelp hid=modules/schart/ui/tp_axisLabel/showlabelsCBSpecifies whether to show or hide the axis labels./ahelp/paragraph bookmark xml-lang=en-US branch=hid/.uno:ToggleAxisDescr id=bm_id3150012 localize=false/ paragraph role=paragraph id=par_id3147436 xml-lang=en-US l10n=CHG oldref=75variable id=sytextbeschrahelp hid=.uno:ToggleAxisDescrTheemph AxesTitle On/Off /emphicon on the emphFormatting/emph bar switches the labeling of all axes on or off./ahelp /variable/paragraph @@ -47,50 +48,45 @@ paragraph role=heading id=hd_id3150717 xml-lang=en-US level=2 l10n=U oldref=4Rotate
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9beb480833a4ba66033953327b7163495390dedf Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 10:07:08 2013 +0100 Updated core Project: help 0c4fc80ae026bce6476e321cc023575c318c7650 diff --git a/helpcontent2 b/helpcontent2 index fdae1bb..0c4fc80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fdae1bb5ed104b443f19ed026dd2b7d9f67cafdb +Subproject commit 0c4fc80ae026bce6476e321cc023575c318c7650 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_export-test.cxx | 80 ++
1 file changed, 80 insertions(+)
New commits:
commit 673881b8fbdc3e0b66d7042221ff9532a49fc044
Author: Laurent Godard lgodard.li...@laposte.net
Date: Fri Aug 30 17:19:11 2013 +0200
calc export test on cell values, strings formulas
Change-Id: I5e55da683423a461638b2235e25d5556fd77221a
Reviewed-on: https://gerrit.libreoffice.org/5698
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index c26d115..bd69cc1 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -29,6 +29,8 @@
#include formulacell.hxx
#include tokenarray.hxx
#include editutil.hxx
+#include scopetools.hxx
+#include cellvalue.hxx
#include svx/svdoole2.hxx
#include tabprotection.hxx
@@ -64,6 +66,8 @@ public:
void testNamedRangeBugfdo62729();
void testRichTextExportODS();
+void testCellValuesExportODS();
+
void testInlineArrayXLS();
void testEmbeddedChartXLS();
void testFormulaReferenceXLS();
@@ -81,6 +85,7 @@ public:
CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729);
CPPUNIT_TEST(testRichTextExportODS);
+CPPUNIT_TEST(testCellValuesExportODS);
CPPUNIT_TEST(testInlineArrayXLS);
CPPUNIT_TEST(testEmbeddedChartXLS);
CPPUNIT_TEST(testFormulaReferenceXLS);
@@ -564,6 +569,81 @@ void ScExportTest::testRichTextExportODS()
xNewDocSh3-DoClose();
}
+void ScExportTest::testCellValuesExportODS()
+{
+// Start with an empty document
+ScDocShellRef xOrigDocSh = loadDoc(empty., ODS);
+ScDocument* pDoc = xOrigDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+CPPUNIT_ASSERT_MESSAGE(This document should at least have one sheet.,
pDoc-GetTableCount() 0);
+
+// set a value double
+pDoc-SetValue(ScAddress(0,0,0), 2.0); // A1
+
+// set a formula
+pDoc-SetValue(ScAddress(2,0,0), 3.0); // C1
+pDoc-SetValue(ScAddress(3,0,0), 3); // D1
+pDoc-SetString(ScAddress(4,0,0), =10*C1/4); // E1
+pDoc-SetValue(ScAddress(5,0,0), 3.0); // F1
+pDoc-SetString(ScAddress(7,0,0), =SUM(C1:F1)); //H1
+
+// set a string
+pDoc-SetString(ScAddress(0,2,0), a simple line); //A3
+
+// set a digit string
+pDoc-SetString(ScAddress(0,4,0), '12); //A5
+// set a contiguous value
+pDoc-SetValue(ScAddress(0,5,0), 12.0); //A6
+// set acontiguous string
+pDoc-SetString(ScAddress(0,6,0), a string); //A7
+// set a contiguous formula
+pDoc-SetString(ScAddress(0,7,0), =$A$6); //A8
+
+// save and reload
+ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, ODS);
+xOrigDocSh-DoClose();
+CPPUNIT_ASSERT(xNewDocSh.Is());
+pDoc = xNewDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+CPPUNIT_ASSERT_MESSAGE(Reloaded document should at least have one
sheet., pDoc-GetTableCount() 0);
+
+// check value
+CPPUNIT_ASSERT_EQUAL(2.0, pDoc-GetValue(0,0,0));
+CPPUNIT_ASSERT_EQUAL(3.0, pDoc-GetValue(2,0,0));
+CPPUNIT_ASSERT_EQUAL(3.0, pDoc-GetValue(3,0,0));
+CPPUNIT_ASSERT_EQUAL(7.5, pDoc-GetValue(4,0,0));
+CPPUNIT_ASSERT_EQUAL(3.0, pDoc-GetValue(5,0,0));
+
+// check formula
+if (!checkFormula(*pDoc, ScAddress(4,0,0), 10*C1/4))
+CPPUNIT_FAIL(Wrong formula =10*C1/4);
+if (!checkFormula(*pDoc, ScAddress(7,0,0), SUM(C1:F1)))
+CPPUNIT_FAIL(Wrong formula =SUM(C1:F1));
+CPPUNIT_ASSERT_EQUAL(16.5, pDoc-GetValue(7,0,0));
+
+// check string
+ScRefCellValue aCell;
+aCell.assign(*pDoc, ScAddress(0,2,0));
+CPPUNIT_ASSERT_EQUAL( CELLTYPE_STRING, aCell.meType );
+
+// check for an empty cell
+aCell.assign(*pDoc, ScAddress(0,3,0));
+CPPUNIT_ASSERT_EQUAL( CELLTYPE_NONE, aCell.meType);
+
+// check a digit string
+aCell.assign(*pDoc, ScAddress(0,4,0));
+CPPUNIT_ASSERT_EQUAL( CELLTYPE_STRING, aCell.meType);
+
+//check contiguous values
+CPPUNIT_ASSERT_EQUAL( 12.0, pDoc-GetValue(0,5,0) );
+CPPUNIT_ASSERT_EQUAL( OUString(a string), pDoc-GetString(0,6,0) );
+if (!checkFormula(*pDoc, ScAddress(0,7,0), $A$6))
+CPPUNIT_FAIL(Wrong formula =$A$6);
+CPPUNIT_ASSERT_EQUAL( pDoc-GetValue(0,5,0), pDoc-GetValue(0,7,0) );
+
+xNewDocSh-DoClose();
+}
+
namespace {
void checkMatrixRange(ScDocument rDoc, const ScRange rRange)
___
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/docshell/docshel4.cxx |4 ++--
sd/source/ui/view/DocumentRenderer.cxx |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit bcbb20b0efc608653bd680565542f5d804755c8f
Author: Brian Fraser andthebr...@softfrog.ca
Date: Tue Sep 3 11:57:24 2013 -0700
Print images in grayscale when printing using the Black White.
Black and white color option found in Impress at
File--Print--Libreoffice Impress tab
Before change, images are printed in pure white, and hence
missing from the printouts.
Should resolve bug 62838, and is contributed under the LGPLv3+ / MPL.
Change-Id: I29e291c2f2baf95b5725b862625f6a206e4cb8ba
Reviewed-on: https://gerrit.libreoffice.org/5798
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 5fa8a76..839c761 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -116,11 +116,11 @@ SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate)
sal_uInt16 nQuality = aPrintItem.GetOptionsPrint().GetOutputQuality();
sal_uLong nMode = DRAWMODE_DEFAULT;
-
+// 1 == Grayscale, 2 == Black White (with grayscale images)
if( nQuality == 1 )
nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT
| DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT;
else if( nQuality == 2 )
-nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL |
DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP | DRAWMODE_WHITEGRADIENT;
+nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL |
DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT;
mpPrinter-SetDrawMode( nMode );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index b98b55a..89141cd 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1507,15 +1507,15 @@ private:
switch (mpOptions-GetOutputQuality())
{
-case 1:
+case 1: // Grayscale
aInfo.mnDrawMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL
| DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP
| DRAWMODE_GRAYGRADIENT;
break;
-case 2:
+case 2: // Black White
aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL
-| DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP
+| DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP
| DRAWMODE_WHITEGRADIENT;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl ucb/source vcl/headless vcl/inc vcl/unx
include/vcl/sysdata.hxx |2
ucb/source/cacher/cachedcontentresultset.cxx | 180 +--
ucb/source/cacher/cachedcontentresultset.hxx |3
vcl/headless/svpdummies.cxx |4
vcl/headless/svpframe.cxx|4
vcl/inc/headless/svpdummies.hxx |2
vcl/inc/unx/gtk/gtkobject.hxx|2
vcl/inc/unx/salframe.h |2
vcl/inc/unx/salobj.h |2
vcl/inc/win/salobj.h |2
vcl/unx/generic/window/salframe.cxx |4
vcl/unx/generic/window/salobj.cxx|6
vcl/unx/gtk/window/gtkobject.cxx |2
vcl/unx/gtk/window/gtksalframe.cxx |2
14 files changed, 112 insertions(+), 105 deletions(-)
New commits:
commit ed87e4c4b09d0f623c350528a4f6a6d049735bd1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 3 23:14:40 2013 +0200
Replace XROW_GETXXX macro with template
Change-Id: Ibd476f9a60dcc15be3b330d738faf56781998dfc
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index 52e7d2f..0c692fd 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -42,74 +42,70 @@ using namespace cppu;
#define COMSUNSTARUCBCCRS_DEFAULT_FETCH_SIZE 256
#define COMSUNSTARUCBCCRS_DEFAULT_FETCH_DIRECTION FetchDirection::FORWARD
-//--
-//--
-//define for getXXX methods of interface XRow
-//--
-//--
+//if you change this function template please pay attention to
+//function getObject, where this is similar implemented
+
+templatetypename T T CachedContentResultSet::rowOriginGet(
+T (SAL_CALL css::sdbc::XRow::* f)(sal_Int32), sal_Int32 columnIndex)
+{
+impl_EnsureNotDisposed();
+ReacquireableGuard aGuard( m_aMutex );
+sal_Int32 nRow = m_nRow;
+sal_Int32 nFetchSize = m_nFetchSize;
+sal_Int32 nFetchDirection = m_nFetchDirection;
+if( !m_aCache.hasRow( nRow ) )
+{
+if( !m_aCache.hasCausedException( nRow ) )
+{
+if( !m_xFetchProvider.is() )
+{
+OSL_FAIL( broadcaster was disposed already );
+throw SQLException();
+}
+aGuard.clear();
+if( impl_isForwardOnly() )
+applyPositionToOrigin( nRow );
-//if you change this macro please pay attention to
-//function ::getObject, where this is similar implemented
-
-#define XROW_GETXXX( getXXX, Type ) \
-impl_EnsureNotDisposed(); \
-ReacquireableGuard aGuard( m_aMutex ); \
-sal_Int32 nRow = m_nRow;\
-sal_Int32 nFetchSize = m_nFetchSize;\
-sal_Int32 nFetchDirection = m_nFetchDirection; \
-if( !m_aCache.hasRow( nRow ) ) \
-{ \
-if( !m_aCache.hasCausedException( nRow ) ) \
-{ \
-if( !m_xFetchProvider.is() )\
-{ \
-OSL_FAIL( broadcaster was disposed already ); \
-throw SQLException(); \
-} \
-aGuard.clear(); \
-if( impl_isForwardOnly() ) \
-applyPositionToOrigin( nRow ); \
-\
-impl_fetchData( nRow, nFetchSize, nFetchDirection ); \
-} \
-aGuard.reacquire(); \
-if( !m_aCache.hasRow( nRow ) ) \
-{ \
-m_bLastReadWasFromCache = sal_False;\
-aGuard.clear(); \
-applyPositionToOrigin( nRow ); \
-impl_init_xRowOrigin(); \
-return m_xRowOrigin-getXXX( columnIndex ); \
-} \
-} \
-const Any rValue = m_aCache.getAny( nRow, columnIndex );\
-Type aRet = Type(); \
-m_bLastReadWasFromCache = sal_True; \
-m_bLastCachedReadWasNull = !( rValue = aRet );\
-/* Last chance. Try type converter service... */\
-if ( m_bLastCachedReadWasNull
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/sfx2
include/sfx2/passwd.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d83630190890969d6a668205d058c69983875a8c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Sep 4 10:31:18 2013 +0100
revert stray OUString-String conversion
introduced accidentally by a8af548c3be5a42cec7177c60c6d421d2dbc35b4
Change-Id: Ib99e5373a14e95f331ef9f00b9b392633f02d700
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index b0efa7b..1f10c74 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -73,7 +73,7 @@ private:
voidSetPasswdText();
public:
-SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL);
+SfxPasswordDialog(Window* pParent, const String* pGroupText = NULL);
String GetUser() const
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - starmath/source svx/source sw/source
starmath/source/ElementsDockingWindow.cxx |6 +++---
starmath/source/document.cxx |8
starmath/source/node.cxx |2 +-
starmath/source/parse.cxx |2 +-
svx/source/accessibility/AccessibleEmptyEditSource.cxx |2 +-
sw/source/core/layout/paintfrm.cxx | 14 +++---
6 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 77eeece2e744df7f2290ba2738cee95ef367133a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Sep 4 11:04:51 2013 +0100
c++11 and c++03 have different enum namespacing behaviour
Change-Id: I899d1ad9e26feb7fcf83c137e4e68628cfdceec8
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index afba1d64..9209f7f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2018,18 +2018,18 @@ void DrawGraphic( const SvxBrushItem *pBrush,
Default,
Transparent,
Gradient
-} eDrawStyle = DrawStyle::Default;
+} eDrawStyle = Default;
// Gradient and transparency are mutually exclusive (need to check
gradient first)
if (pFillStyleItem pFillStyleItem-GetValue() == XFILL_GRADIENT
pFillGradientItem)
{
-eDrawStyle = DrawStyle::Gradient;
+eDrawStyle = Gradient;
}
else if (bConsiderBackgroundTransparency
( ( aColor.GetTransparency() != 0) ||
bTransparentGrfWithNoFillBackgrd ) )
{
-eDrawStyle = DrawStyle::Transparent;
+eDrawStyle = Transparent;
}
// #i75614# reset draw mode in high contrast mode in order to get fill
color set
@@ -2045,7 +2045,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// the fill color for the output device.
switch (eDrawStyle)
{
-case DrawStyle::Transparent:
+case Transparent:
{
if( pOutDev-GetFillColor() != aColor.GetRGBColor() )
pOutDev-SetFillColor( aColor.GetRGBColor() );
@@ -2066,7 +2066,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// OD 02.09.2002 #99657#
switch (eDrawStyle)
{
-case DrawStyle::Transparent:
+case Transparent:
{
/// background region have to be drawn transparent.
/// Thus, create a poly-polygon from the region and draw it
with
@@ -2103,12 +2103,12 @@ void DrawGraphic( const SvxBrushItem *pBrush,
break;
}
-case DrawStyle::Gradient:
+case Gradient:
{
pOutDev-DrawGradient(rOut.SVRect(),
pFillGradientItem-GetGradientValue().VclGradient());
break;
}
-case DrawStyle::Default:
+case Default:
default:
{
SwRegionRects aRegion( rOut, 4 );
commit e4b2e9fa7822b5ccc25435101059d0f3ddae08d2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Sep 4 10:41:41 2013 +0100
remove intermediate Strings on res loading
Change-Id: I5ae2f445bb2c0e3fa3dd42f972dae54dfee42cc8
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 2d01c2d..b90f4fa 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -509,7 +509,7 @@
SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
for (sal_uInt16 i = 0; i sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
{
-maElementListBox.InsertEntry(OUString(SmResId(aCategories[i])));
+maElementListBox.InsertEntry(SM_RESSTR(aCategories[i]));
}
maElementListBox.SetSelectHdl(LINK(this, SmElementsDockingWindow,
ElementSelectedHandle));
@@ -520,7 +520,7 @@
SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
maElementsControl.SetTextColor( Color( COL_BLACK ) );
maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow,
SelectClickHdl));
-
maElementListBox.SelectEntry(OUString(SmResId(RID_CATEGORY_UNARY_BINARY_OPERATORS)));
+
maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
FreeResource();
@@ -555,7 +555,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle,
ListBox*, pList)
for (sal_uInt16 i = 0; i sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
{
sal_uInt16 aCurrentCategory = aCategories[i];
-OUString aCurrentCategoryString = OUString(SmResId(aCurrentCategory));
+OUString aCurrentCategoryString = SM_RESSTR(aCurrentCategory);
if (aCurrentCategoryString == pList-GetSelectEntry())
{
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 77/bc1a81ce91b5b9781e235206d73ffe70464244
77/bc1a81ce91b5b9781e235206d73ffe70464244 |1 + 1 file changed, 1 insertion(+) New commits: commit ee81c54bc3c369c5c46050fb869e7cbe7b7fa31f Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:08:07 2013 +0100 Notes added by 'git notes add' diff --git a/77/bc1a81ce91b5b9781e235206d73ffe70464244 b/77/bc1a81ce91b5b9781e235206d73ffe70464244 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/77/bc1a81ce91b5b9781e235206d73ffe70464244 @@ -0,0 +1 @@ +ignore: fixed ___ 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' - dd/f11a2391f74f7553895bc7479a3962fd30437f
dd/f11a2391f74f7553895bc7479a3962fd30437f |1 + 1 file changed, 1 insertion(+) New commits: commit c8565153242ebe8a35bd4c0b522c18093a85c5ff Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:11:55 2013 +0100 Notes added by 'git notes add' diff --git a/dd/f11a2391f74f7553895bc7479a3962fd30437f b/dd/f11a2391f74f7553895bc7479a3962fd30437f new file mode 100644 index 000..fc4d724 --- /dev/null +++ b/dd/f11a2391f74f7553895bc7479a3962fd30437f @@ -0,0 +1 @@ +prefer: 1c22545edf9085b9f2656ca92781158b6b123db3 ___ 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' - b3/5a90bca7d1e5b26854467da07e4714f5c1e27b
b3/5a90bca7d1e5b26854467da07e4714f5c1e27b |1 + 1 file changed, 1 insertion(+) New commits: commit b4a4ad768b662a3c64a967276fcbea8dc50f1f2d Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:12:51 2013 +0100 Notes added by 'git notes add' diff --git a/b3/5a90bca7d1e5b26854467da07e4714f5c1e27b b/b3/5a90bca7d1e5b26854467da07e4714f5c1e27b new file mode 100644 index 000..fc4d724 --- /dev/null +++ b/b3/5a90bca7d1e5b26854467da07e4714f5c1e27b @@ -0,0 +1 @@ +prefer: 1c22545edf9085b9f2656ca92781158b6b123db3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5381977e455e8e919fda2cb0947d799ed8fec8a Author: Eike Rathke er...@redhat.com Date: Wed Sep 4 12:13:14 2013 +0200 Updated core Project: translations 54fd99cf0cda479641a91bb9e7f2ebe8a8384b1c diff --git a/translations b/translations index 567bb94..54fd99c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 567bb9410fe82204fd990f2ef92fe530a7ef45bc +Subproject commit 54fd99cf0cda479641a91bb9e7f2ebe8a8384b1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-13'
Tag 'suse-4.0-13' created by Andras Timar andras.ti...@collabora.com at 2013-09-04 11:16 -0700 suse-4.0-13 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-13'
Tag 'suse-4.0-13' created by Andras Timar andras.ti...@collabora.com at 2013-09-04 11:15 -0700 suse-4.0-13 Changes since suse-4.0-12-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-13'
Tag 'suse-4.0-13' created by Andras Timar andras.ti...@collabora.com at 2013-09-04 11:16 -0700 suse-4.0-13 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-13'
Tag 'suse-4.0-13' created by Andras Timar andras.ti...@collabora.com at 2013-09-04 11:16 -0700 suse-4.0-13 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ 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' - 4a/3cec343391c976ec545c98bd26b0a617a6cdce
4a/3cec343391c976ec545c98bd26b0a617a6cdce |1 + 1 file changed, 1 insertion(+) New commits: commit 09db5c181b646e8cbebc439f5886e94a71f6b030 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:17:50 2013 +0100 Notes added by 'git notes add' diff --git a/4a/3cec343391c976ec545c98bd26b0a617a6cdce b/4a/3cec343391c976ec545c98bd26b0a617a6cdce new file mode 100644 index 000..8a2345e --- /dev/null +++ b/4a/3cec343391c976ec545c98bd26b0a617a6cdce @@ -0,0 +1 @@ +ignore: fixed ___ 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' - a3/a4dd6303afe2e81cdfece18826196a3b2615b7
a3/a4dd6303afe2e81cdfece18826196a3b2615b7 |1 + 1 file changed, 1 insertion(+) New commits: commit 7045d5fcbcf7870afe5a31bda583f409682de7c8 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:26:09 2013 +0100 Notes added by 'git notes add' diff --git a/a3/a4dd6303afe2e81cdfece18826196a3b2615b7 b/a3/a4dd6303afe2e81cdfece18826196a3b2615b7 new file mode 100644 index 000..43b17a1 --- /dev/null +++ b/a3/a4dd6303afe2e81cdfece18826196a3b2615b7 @@ -0,0 +1 @@ +reject: these are fixed size in word as well, and if the same fonts are used the same behaviour occurs ___ 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' - c0/a58cf8ccfb4d37b7bd8e008b0f5f0d617bceb3
c0/a58cf8ccfb4d37b7bd8e008b0f5f0d617bceb3 |1 + 1 file changed, 1 insertion(+) New commits: commit 752b533f335dbd4a2addb6f96923b96002f8c400 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:27:40 2013 +0100 Notes added by 'git notes add' diff --git a/c0/a58cf8ccfb4d37b7bd8e008b0f5f0d617bceb3 b/c0/a58cf8ccfb4d37b7bd8e008b0f5f0d617bceb3 new file mode 100644 index 000..c178e9a --- /dev/null +++ b/c0/a58cf8ccfb4d37b7bd8e008b0f5f0d617bceb3 @@ -0,0 +1 @@ +prefer: 8943478b8d34216d3f2d64dfccd48d181d1a0f91 ___ 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' - 65/409fefdc76adab22868c276d345c599432beaa
65/409fefdc76adab22868c276d345c599432beaa |1 + 1 file changed, 1 insertion(+) New commits: commit dfb5c84ec6b0c3f3c1a4888d221cd28e24997467 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:28:56 2013 +0100 Notes added by 'git notes add' diff --git a/65/409fefdc76adab22868c276d345c599432beaa b/65/409fefdc76adab22868c276d345c599432beaa new file mode 100644 index 000..8a2345e --- /dev/null +++ b/65/409fefdc76adab22868c276d345c599432beaa @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18nlangtag/qa i18nlangtag/source include/i18nlangtag instsetoo_native/util l10ntools/source setup_native/source solenv/inc svtools/source
i18nlangtag/qa/cppunit/test_languagetag.cxx | 17 -
i18nlangtag/source/isolang/isolang.cxx | 50 ++--
i18nlangtag/source/isolang/mslangid.cxx | 12 +--
include/i18nlangtag/lang.h |4 -
instsetoo_native/util/pack.lst |6 -
l10ntools/source/ulfconv/msi-encodinglist.txt |2
setup_native/source/packinfo/spellchecker_selection.txt |2
solenv/inc/langlist.mk |2
svtools/source/misc/langtab.src |2
9 files changed, 59 insertions(+), 38 deletions(-)
New commits:
commit 8d4cd0751516631bcd5c6fabf1eb07d64bb72f17
Author: Eike Rathke er...@redhat.com
Date: Wed Sep 4 12:15:33 2013 +0200
renamed ca-XV to ca-valencia and activated ca-ES-valencia, fdo#59867 related
Build Catalan-Valencian as ca-valencia instead of ca-XV private-use.
Introduced LANGUAGE_CATALAN_VALENCIAN 0x0803 mapping to ca-ES-valencia,
preserving old ca-XV and qcv-ES mappings to now
LANGUAGE_CATALAN_VALENCIAN and LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN
0x8003 to ca-ES-valencia.
Removed special !bUserInterfaceSelection treatment from
MsLangId::getReplacementForObsoleteLanguage() and added the usual
obsolete replacement instead.
Change-Id: I2fdd8b0bac55d4b4ae2cbf3c3645f09fefec9b6e
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 915d5cb..d0145cf 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -153,12 +153,7 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Language == qlt );
CPPUNIT_ASSERT( aLocale.Country == ES );
CPPUNIT_ASSERT( aLocale.Variant == s_ca_ES_valencia );
-/* TODO: conversion doesn't know this yet, once it does activate test.
*/
-#if 0
-CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() ==
LANGUAGE_USER_CATALAN_VALENCIAN );
-#else
-CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() == LANGUAGE_SYSTEM );
-#endif
+CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() ==
LANGUAGE_CATALAN_VALENCIAN );
CPPUNIT_ASSERT( ca_ES_valencia.isValidBcp47() == true );
CPPUNIT_ASSERT( ca_ES_valencia.isIsoLocale() == false );
CPPUNIT_ASSERT( ca_ES_valencia.isIsoODF() == false );
@@ -172,12 +167,7 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == ca-valencia);
CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == ca-ES);
CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[3] == ca);
-/* TODO: conversion doesn't know this yet, once it does activate test.
*/
-#if 0
CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() ==
ca-ES-valencia);
-#else
-CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() == ca-ES);
-#endif
}
{
@@ -200,12 +190,7 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( ca_valencia_Fallbacks.size() == 2);
CPPUNIT_ASSERT( ca_valencia_Fallbacks[0] == ca-valencia);
CPPUNIT_ASSERT( ca_valencia_Fallbacks[1] == ca);
-/* TODO: conversion doesn't know this yet, once it does activate test.
*/
-#if 0
CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() ==
ca-ES-valencia);
-#else
-CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() == ca-ES);
-#endif
}
{
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 1b6e3c4..53e6126 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -66,6 +66,7 @@ struct Bcp47CountryEntry
LanguageTypemnLang;
const sal_Char* mpBcp47;
sal_CharmaCountry[3];
+const sal_Char* mpFallback;
/** Obtain a language tag string with '-' separator. */
OUString getTagString() const;
@@ -322,9 +323,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_BELARUSIAN, be, BY },
{ LANGUAGE_CATALAN, ca, ES }, // Spain (default)
{ LANGUAGE_CATALAN, ca, AD }, // Andorra
-{ LANGUAGE_USER_CATALAN_VALENCIAN, ca, XV }, //
XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in
document content!
-{ LANGUAGE_CATALAN,qcv, ES }, // qcv: ISO 639-3
reserved-for-local-use; UI localization quirk only, do not use in document
content!
-//{ LANGUAGE_USER_CATALAN_VALENCIAN, ca, ES }, // In case MS
format files escaped into the wild, map them back.
+{ LANGUAGE_CATALAN_VALENCIAN, ca, XV }, // XV: ISO 3166
user-assigned; old workaround for UI localization only, in case it escaped to
document content
+{ LANGUAGE_CATALAN_VALENCIAN, qcv, ES }, // qcv: ISO 639-3
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/394fcf30920767a9a35caf5623b7ee6cad52cc
ce/394fcf30920767a9a35caf5623b7ee6cad52cc |1 + 1 file changed, 1 insertion(+) New commits: commit 03ea2459896709ab746e13d70471a3518041b91a Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:29:43 2013 +0100 Notes added by 'git notes add' diff --git a/ce/394fcf30920767a9a35caf5623b7ee6cad52cc b/ce/394fcf30920767a9a35caf5623b7ee6cad52cc new file mode 100644 index 000..8a2345e --- /dev/null +++ b/ce/394fcf30920767a9a35caf5623b7ee6cad52cc @@ -0,0 +1 @@ +ignore: fixed ___ 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' - 99/1151127f0cb6ea0480a96e879a44dca1a14ffc
99/1151127f0cb6ea0480a96e879a44dca1a14ffc |1 + 1 file changed, 1 insertion(+) New commits: commit 96bd1d35a6ee16d97043b7bb66ca031ce8c9d778 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:31:10 2013 +0100 Notes added by 'git notes add' diff --git a/99/1151127f0cb6ea0480a96e879a44dca1a14ffc b/99/1151127f0cb6ea0480a96e879a44dca1a14ffc new file mode 100644 index 000..8a2345e --- /dev/null +++ b/99/1151127f0cb6ea0480a96e879a44dca1a14ffc @@ -0,0 +1 @@ +ignore: fixed ___ 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 - 50/47a8fdeb5643f7a715334e44ceb59814e6b2a0 b9/ccab4ebe62ca973fb36f8f898b0c7933480ee4
50/47a8fdeb5643f7a715334e44ceb59814e6b2a0 |1 + b9/ccab4ebe62ca973fb36f8f898b0c7933480ee4 |1 + 2 files changed, 2 insertions(+) New commits: commit 73d2fdde7e9a0c0e8f5c6053fa7e240dd7e01bc6 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:30:45 2013 +0100 Notes added by 'git notes add' diff --git a/50/47a8fdeb5643f7a715334e44ceb59814e6b2a0 b/50/47a8fdeb5643f7a715334e44ceb59814e6b2a0 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/50/47a8fdeb5643f7a715334e44ceb59814e6b2a0 @@ -0,0 +1 @@ +ignore: fixed commit dc2fb34ec173f7eccad1d2b918d04df06b51fd19 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:30:33 2013 +0100 Notes added by 'git notes add' diff --git a/b9/ccab4ebe62ca973fb36f8f898b0c7933480ee4 b/b9/ccab4ebe62ca973fb36f8f898b0c7933480ee4 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/b9/ccab4ebe62ca973fb36f8f898b0c7933480ee4 @@ -0,0 +1 @@ +ignore: fixed ___ 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' - 45/07626527ad337a985bde1af07e858087ff3c5d
45/07626527ad337a985bde1af07e858087ff3c5d |1 + 1 file changed, 1 insertion(+) New commits: commit b5a5e88f3a4d43c4b30e97a84ddf57e033c68c2a Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:30:55 2013 +0100 Notes added by 'git notes add' diff --git a/45/07626527ad337a985bde1af07e858087ff3c5d b/45/07626527ad337a985bde1af07e858087ff3c5d new file mode 100644 index 000..8a2345e --- /dev/null +++ b/45/07626527ad337a985bde1af07e858087ff3c5d @@ -0,0 +1 @@ +ignore: fixed ___ 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 - 9a/c06d8167f252ef4d52ac616ff10e7992ef3c5d e1/7056a265b0d4e51e81c989327811934c627b0b
9a/c06d8167f252ef4d52ac616ff10e7992ef3c5d |1 + e1/7056a265b0d4e51e81c989327811934c627b0b |1 + 2 files changed, 2 insertions(+) New commits: commit 6bec3e75bad0c81c16f26cbf989f2db08f886ecc Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:32:59 2013 +0100 Notes added by 'git notes add' diff --git a/9a/c06d8167f252ef4d52ac616ff10e7992ef3c5d b/9a/c06d8167f252ef4d52ac616ff10e7992ef3c5d new file mode 100644 index 000..8a2345e --- /dev/null +++ b/9a/c06d8167f252ef4d52ac616ff10e7992ef3c5d @@ -0,0 +1 @@ +ignore: fixed commit da6c4b6e48ad7038696372737eecd61eb5502fb3 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:32:51 2013 +0100 Notes added by 'git notes add' diff --git a/e1/7056a265b0d4e51e81c989327811934c627b0b b/e1/7056a265b0d4e51e81c989327811934c627b0b new file mode 100644 index 000..8a2345e --- /dev/null +++ b/e1/7056a265b0d4e51e81c989327811934c627b0b @@ -0,0 +1 @@ +ignore: fixed ___ 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 - 8e/cc31effba690a237fda9d7b075cfb56417489c ff/abffb96b51a7ff0536305c255062c085b7a7f8
8e/cc31effba690a237fda9d7b075cfb56417489c |1 + ff/abffb96b51a7ff0536305c255062c085b7a7f8 |1 + 2 files changed, 2 insertions(+) New commits: commit 5806038aa8b8341ef99a7cba768eae2ab23833c6 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:33:17 2013 +0100 Notes added by 'git notes add' diff --git a/8e/cc31effba690a237fda9d7b075cfb56417489c b/8e/cc31effba690a237fda9d7b075cfb56417489c new file mode 100644 index 000..8a2345e --- /dev/null +++ b/8e/cc31effba690a237fda9d7b075cfb56417489c @@ -0,0 +1 @@ +ignore: fixed commit 05d8e76f03adc899e2155542c6690563e7b5ec43 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:33:07 2013 +0100 Notes added by 'git notes add' diff --git a/ff/abffb96b51a7ff0536305c255062c085b7a7f8 b/ff/abffb96b51a7ff0536305c255062c085b7a7f8 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/ff/abffb96b51a7ff0536305c255062c085b7a7f8 @@ -0,0 +1 @@ +ignore: fixed ___ 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 - 1a/fc90da18d3047a7e4709bce7b94e0d12e817f8 9f/69b9630bbb34f0ccb64ae95864495123c89be2
1a/fc90da18d3047a7e4709bce7b94e0d12e817f8 |1 + 9f/69b9630bbb34f0ccb64ae95864495123c89be2 |1 + 2 files changed, 2 insertions(+) New commits: commit f3629b1ae7334581b5d31fd81d1dd998f67e9bb0 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:33:36 2013 +0100 Notes added by 'git notes add' diff --git a/9f/69b9630bbb34f0ccb64ae95864495123c89be2 b/9f/69b9630bbb34f0ccb64ae95864495123c89be2 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/9f/69b9630bbb34f0ccb64ae95864495123c89be2 @@ -0,0 +1 @@ +ignore: fixed commit dcddc359e874abe23de946dd2f3b83307584c7c7 Author: Caolán McNamara caol...@redhat.com Date: Wed Sep 4 11:33:26 2013 +0100 Notes added by 'git notes add' diff --git a/1a/fc90da18d3047a7e4709bce7b94e0d12e817f8 b/1a/fc90da18d3047a7e4709bce7b94e0d12e817f8 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/1a/fc90da18d3047a7e4709bce7b94e0d12e817f8 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/gcach_ftyp.cxx | 61 +++---
vcl/generic/glyphs/gcach_ftyp.hxx |2 -
2 files changed, 19 insertions(+), 44 deletions(-)
New commits:
commit 655a62ad569b08c6d0b5639624e33d40594bedf2
Author: Khaled Hosny khaledho...@eglug.org
Date: Wed Sep 4 11:28:14 2013 +0200
FT_Size API is available since FreeType 2.0.5
We require at least 2.0.9 right now anyway, so no drop the dlsym hacks.
This is essentially a revert of a36dab4a598c4ac168c7ef1df4d061613e40e416
from 2003.
Change-Id: Id9bca2962f25d92f1707bc3d1efc054ffd22c714
Reviewed-on: https://gerrit.libreoffice.org/5803
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 3dbb5cd..44f00c6 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -50,12 +50,12 @@
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include FT_OUTLINE_H
+#include FT_SIZES_H
#include FT_TRUETYPE_TABLES_H
#include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_IDS_H
#ifdef ANDROID
-#include FT_SIZES_H
#include FT_SYNTHESIS_H
#endif
@@ -122,14 +122,10 @@ static void InitGammaTable()
static FT_Library aLibFT = 0;
-// #110607# enable linking with old FT versions
+// enable linking with old FT versions
static int nFTVERSION = 0;
-static FT_Error (*pFTNewSize)(FT_Face,FT_Size*);
-static FT_Error (*pFTActivateSize)(FT_Size);
-static FT_Error (*pFTDoneSize)(FT_Size);
void (*pFTEmbolden)(FT_GlyphSlot);
static FT_UInt (*pFT_Face_GetCharVariantIndex)(FT_Face, FT_ULong, FT_ULong);
-static bool bEnableSizeFT = false;
typedef ::boost::unordered_mapconst char*, boost::shared_ptrFtFontFile,
rtl::CStringHash, rtl::CStringEqual FontFileList;
@@ -348,11 +344,8 @@ void FtFontInfo::InitHashes() const
FT_FaceRec_* FtFontInfo::GetFaceFT()
{
-// get faceFT once/multiple depending on availability of SizeFT APIs
-if( (mnRefCount++ = 0) || !bEnableSizeFT )
+if (!maFaceFT mpFontFile-Map())
{
-if( !mpFontFile-Map() )
-return NULL;
FT_Error rc = FT_New_Memory_Face( aLibFT,
(FT_Byte*)mpFontFile-GetBuffer(),
mpFontFile-GetFileSize(), mnFaceNum, maFaceFT );
@@ -360,6 +353,7 @@ FT_FaceRec_* FtFontInfo::GetFaceFT()
maFaceFT = NULL;
}
+ ++mnRefCount;
return maFaceFT;
}
@@ -388,12 +382,11 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
// ---
-void FtFontInfo::ReleaseFaceFT( FT_FaceRec_* pFaceFT )
+void FtFontInfo::ReleaseFaceFT()
{
-// release last/each depending on SizeFT availability
-if( (--mnRefCount = 0) || !bEnableSizeFT )
+if (--mnRefCount = 0)
{
-FT_Done_Face( pFaceFT );
+FT_Done_Face( maFaceFT );
maFaceFT = NULL;
mpFontFile-Unmap();
}
@@ -487,23 +480,15 @@ FreetypeManager::FreetypeManager()
// system FreeType code (which *is* present in a system library,
// libskia.so, but is not a public API, and in fact does crash the
// app if used).
-pFTNewSize = FT_New_Size;
-pFTActivateSize = FT_Activate_Size;
-pFTDoneSize = FT_Done_Size;
pFTEmbolden = FT_GlyphSlot_Embolden;
pFT_Face_GetCharVariantIndex = FT_Face_GetCharVariantIndex;
nFTVERSION = FTVERSION;
#else
#ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
// Get version of freetype library to enable workarounds.
-pFTNewSize = (FT_Error(*)(FT_Face,FT_Size*))(sal_IntPtr)dlsym(
RTLD_DEFAULT, FT_New_Size );
-pFTActivateSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT,
FT_Activate_Size );
-pFTDoneSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT,
FT_Done_Size );
pFTEmbolden = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT,
FT_GlyphSlot_Embolden );
pFT_Face_GetCharVariantIndex = (FT_UInt(*)(FT_Face, FT_ULong,
FT_ULong))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_Face_GetCharVariantIndex );
-bEnableSizeFT = (pFTNewSize!=NULL) (pFTActivateSize!=NULL)
(pFTDoneSize!=NULL);
-
FT_Int nMajor = 0, nMinor = 0, nPatch = 0;
FT_Library_Version(aLibFT, nMajor, nMinor, nPatch);
nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch;
@@ -541,8 +526,7 @@ FreetypeManager::FreetypeManager()
FT_Face ServerFont::GetFtFace() const
{
-if( maSizeFT )
-pFTActivateSize( maSizeFT );
+FT_Activate_Size( maSizeFT );
return maFaceFT;
}
@@ -683,12 +667,8 @@ ServerFont::ServerFont( const FontSelectPattern rFSD,
FtFontInfo* pFI )
if( (mnWidth 0) || (mfStretch +64.0) || (mfStretch -64.0) )
return;
-// perf: use maSizeFT if available
-if( bEnableSizeFT )
-{
-pFTNewSize( maFaceFT, maSizeFT );
-pFTActivateSize( maSizeFT );
-}
+FT_New_Size( maFaceFT, maSizeFT );
+
[Libreoffice-commits] core.git: configure.ac vcl/generic
configure.ac |5 --
vcl/generic/glyphs/gcach_ftyp.cxx | 79 +++---
2 files changed, 18 insertions(+), 66 deletions(-)
New commits:
commit 190506425ce28e345222c08065e2d08003a85cb0
Author: Khaled Hosny khaledho...@eglug.org
Date: Wed Sep 4 12:44:37 2013 +0200
Require FreeType = 2.2.0
That should be older than what RHEL-5 have, so closer to our real
baseline. Cleanup checks for older FreeType as a side effect.
Change-Id: I10dc6a3064b6be88cd7bdc72c501d50df4a2613b
Reviewed-on: https://gerrit.libreoffice.org/5804
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 193d639..3da20ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7682,9 +7682,8 @@ if test $test_freetype = yes; then
# * soname
# FreeType's docs/VERSION.DLL provides a table mapping between the three
#
-# 9.4.3 is 2.1.5; the first FreeType release to provide a freetype2.pc file
-# XXX: replace this with a real minimum required version
-PKG_CHECK_MODULES( FREETYPE, freetype2 = 9.4.3 )
+# 9.9.3 is 2.2.0
+PKG_CHECK_MODULES(FREETYPE, freetype2 = 9.9.3)
FREETYPE_CFLAGS=$(printf '%s' $FREETYPE_CFLAGS | sed -e
s/-I/${ISYSTEM?}/g)
SYSTEM_FREETYPE=YES
fi
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 44f00c6..b627a28 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -51,26 +51,21 @@
#include FT_GLYPH_H
#include FT_OUTLINE_H
#include FT_SIZES_H
+#include FT_SYNTHESIS_H
#include FT_TRUETYPE_TABLES_H
#include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_IDS_H
-#ifdef ANDROID
-#include FT_SYNTHESIS_H
-#endif
-
#ifndef FT_RENDER_MODE_MONO // happens in the MACOSX build
#define FT_RENDER_MODE_MONO ft_render_mode_mono
#endif
#include rtl/instance.hxx
+#ifdef ANDROID
#define FTVERSION (1000*FREETYPE_MAJOR + 100*FREETYPE_MINOR + FREETYPE_PATCH)
+#endif
-#if FTVERSION = 2200
typedef const FT_Vector* FT_Vector_CPtr;
-#else // FTVERSION 2200
-typedef FT_Vector* FT_Vector_CPtr;
-#endif
#include vector
@@ -124,7 +119,6 @@ static FT_Library aLibFT = 0;
// enable linking with old FT versions
static int nFTVERSION = 0;
-void (*pFTEmbolden)(FT_GlyphSlot);
static FT_UInt (*pFT_Face_GetCharVariantIndex)(FT_Face, FT_ULong, FT_ULong);
typedef ::boost::unordered_mapconst char*, boost::shared_ptrFtFontFile,
rtl::CStringHash, rtl::CStringEqual FontFileList;
@@ -480,22 +474,17 @@ FreetypeManager::FreetypeManager()
// system FreeType code (which *is* present in a system library,
// libskia.so, but is not a public API, and in fact does crash the
// app if used).
-pFTEmbolden = FT_GlyphSlot_Embolden;
pFT_Face_GetCharVariantIndex = FT_Face_GetCharVariantIndex;
nFTVERSION = FTVERSION;
#else
#ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included
// Get version of freetype library to enable workarounds.
-pFTEmbolden = (void(*)(FT_GlyphSlot))(sal_IntPtr)dlsym( RTLD_DEFAULT,
FT_GlyphSlot_Embolden );
pFT_Face_GetCharVariantIndex = (FT_UInt(*)(FT_Face, FT_ULong,
FT_ULong))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_Face_GetCharVariantIndex );
FT_Int nMajor = 0, nMinor = 0, nPatch = 0;
FT_Library_Version(aLibFT, nMajor, nMinor, nPatch);
nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch;
-// disable artificial emboldening with the Freetype API for older versions
-if( nFTVERSION 2110 )
-pFTEmbolden = NULL;
// disable FT_Face_GetCharVariantIndex for older versions
// https://bugzilla.mozilla.org/show_bug.cgi?id=618406#c8
if( nFTVERSION 2404 )
@@ -1245,8 +1234,8 @@ void ServerFont::InitGlyphData( int nGlyphIndex,
GlyphData rGD ) const
}
const bool bOriginallyZeroWidth = (maFaceFT-glyph-metrics.horiAdvance ==
0);
-if( mbArtBold pFTEmbolden )
-(*pFTEmbolden)( maFaceFT-glyph );
+if (mbArtBold)
+FT_GlyphSlot_Embolden(maFaceFT-glyph);
const int nCharWidth = bOriginallyZeroWidth ? 0 : lcl_GetCharWidth(
maFaceFT, mfStretch, nGlyphFlags );
rGD.SetCharWidth( nCharWidth );
@@ -1255,8 +1244,6 @@ void ServerFont::InitGlyphData( int nGlyphIndex,
GlyphData rGD ) const
rc = FT_Get_Glyph( maFaceFT-glyph, pGlyphFT );
ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
-if( mbArtBold pFTEmbolden (nFTVERSION 2200) ) // #i71094#
workaround staircase bug
-pGlyphFT-advance.y = 0;
rGD.SetDelta( (pGlyphFT-advance.x + 0x8000) 16, -((pGlyphFT-advance.y
+ 0x8000) 16) );
FT_BBox aBbox;
@@ -1294,11 +1281,8 @@ bool ServerFont::GetGlyphBitmap1( int nGlyphIndex,
RawBitmap rRawBitmap ) const
FT_Int nLoadFlags = mnLoadFlags;
// #i70930# force mono-hinting for monochrome text
-if( nFTVERSION = 2110 ) //#i71947# unless it looks worse
-{
-nLoadFlags =
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 03fe1dc6ff8fbc1091515825d04a87778c22757d
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Sep 4 13:09:36 2013 +0200
startcenter: Fix template buttons breaking when used with k.board
Change-Id: I14a6b5610b4cb337101403bbbf5c5d70af012c54
Reviewed-on: https://gerrit.libreoffice.org/5806
Reviewed-by: Krisztian Pinter pin.termina...@gmail.com
Tested-by: Krisztian Pinter pin.termina...@gmail.com
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index bece1f6..3b66cc9 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -525,6 +525,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpWriterShowTemplateButton-Hide();
mpWriterTemplateThumbnails-Show();
mpWriterShowRecentButton-Show();
+mpWriterShowRecentButton-GrabFocus();
}
else if( pButton == mpWriterShowRecentButton )
{
@@ -532,6 +533,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpWriterShowRecentButton-Hide();
mpWriterRecentThumbnails-Show();
mpWriterShowTemplateButton-Show();
+mpWriterShowTemplateButton-GrabFocus();
}
// calc
else if( pButton == mpCalcShowTemplateButton )
@@ -540,6 +542,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpCalcShowTemplateButton-Hide();
mpCalcTemplateThumbnails-Show();
mpCalcShowRecentButton-Show();
+mpCalcShowRecentButton-GrabFocus();
}
else if( pButton == mpCalcShowRecentButton )
{
@@ -547,6 +550,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpCalcShowRecentButton-Hide();
mpCalcRecentThumbnails-Show();
mpCalcShowTemplateButton-Show();
+mpCalcShowTemplateButton-GrabFocus();
}
// impress
else if( pButton == mpImpressShowTemplateButton )
@@ -555,6 +559,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpImpressShowTemplateButton-Hide();
mpImpressTemplateThumbnails-Show();
mpImpressShowRecentButton-Show();
+mpImpressShowRecentButton-GrabFocus();
}
else if( pButton == mpImpressShowRecentButton )
{
@@ -562,6 +567,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpImpressShowRecentButton-Hide();
mpImpressRecentThumbnails-Show();
mpImpressShowTemplateButton-Show();
+mpImpressShowTemplateButton-GrabFocus();
}
// draw
else if( pButton == mpDrawShowTemplateButton )
@@ -570,6 +576,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpDrawShowTemplateButton-Hide();
mpDrawTemplateThumbnails-Show();
mpDrawShowRecentButton-Show();
+mpDrawShowRecentButton-GrabFocus();
}
else if( pButton == mpDrawShowRecentButton )
{
@@ -577,6 +584,7 @@ IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*,
pButton )
mpDrawShowRecentButton-Hide();
mpDrawRecentThumbnails-Show();
mpDrawShowTemplateButton-Show();
+mpDrawShowTemplateButton-GrabFocus();
}
return 0;
}
___
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/dialog/backingwindow.cxx | 80 +--
sfx2/source/dialog/backingwindow.hxx | 18 +++
2 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 055d21a1e32555e1415ac40ba0a931d851a7d8db
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Sep 4 12:59:37 2013 +0200
startcenter: Rename variables
Change-Id: I3137502e6ee3c4c4dce6ac1b99325f5e8c771e02
Reviewed-on: https://gerrit.libreoffice.org/5805
Reviewed-by: Krisztian Pinter pin.termina...@gmail.com
Tested-by: Krisztian Pinter pin.termina...@gmail.com
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index e951291..bece1f6 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -104,15 +104,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpInfoButton, info);
get(mpTplRepButton, add_temp);
-get(mpShowWriterTemplateButton, show_writer_template);
-get(mpShowCalcTemplateButton, show_calc_template);
-get(mpShowImpressTemplateButton,show_impress_template);
-get(mpShowDrawTemplateButton, show_draw_template);
+get(mpWriterShowTemplateButton, show_writer_template);
+get(mpCalcShowTemplateButton, show_calc_template);
+get(mpImpressShowTemplateButton,show_impress_template);
+get(mpDrawShowTemplateButton, show_draw_template);
-get(mpShowWriterRecentButton, show_writer_recent);
-get(mpShowCalcRecentButton, show_calc_recent);
-get(mpShowImpressRecentButton, show_impress_recent);
-get(mpShowDrawRecentButton, show_draw_recent);
+get(mpWriterShowRecentButton, show_writer_recent);
+get(mpCalcShowRecentButton, show_calc_recent);
+get(mpImpressShowRecentButton, show_impress_recent);
+get(mpDrawShowRecentButton, show_draw_recent);
get( mpAllRecentThumbnails, all_recent);
get( mpWriterRecentThumbnails, writer_recent);
@@ -279,13 +279,13 @@ void BackingWindow::initControls()
setupExternalLink( mpTplRepButton );
setupTemplateView( mpWriterTemplateThumbnails, FILTER_APP_WRITER,
- mpShowWriterRecentButton,mpShowWriterTemplateButton
);
+ mpWriterShowRecentButton,mpWriterShowTemplateButton
);
setupTemplateView( mpCalcTemplateThumbnails,FILTER_APP_CALC,
- mpShowCalcRecentButton, mpShowCalcTemplateButton );
+ mpCalcShowRecentButton, mpCalcShowTemplateButton );
setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS,
- mpShowImpressRecentButton,
mpShowImpressTemplateButton );
+ mpImpressShowRecentButton,
mpImpressShowTemplateButton );
setupTemplateView( mpDrawTemplateThumbnails,FILTER_APP_DRAW,
- mpShowDrawRecentButton, mpShowDrawTemplateButton );
+ mpDrawShowRecentButton, mpDrawShowTemplateButton );
Resize();
}
@@ -519,64 +519,64 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*, pButton )
{
// writer
-if( pButton == mpShowWriterTemplateButton )
+if( pButton == mpWriterShowTemplateButton )
{
mpWriterRecentThumbnails-Hide();
+mpWriterShowTemplateButton-Hide();
mpWriterTemplateThumbnails-Show();
-mpShowWriterTemplateButton-Hide();
-mpShowWriterRecentButton-Show();
+mpWriterShowRecentButton-Show();
}
-else if( pButton == mpShowWriterRecentButton )
+else if( pButton == mpWriterShowRecentButton )
{
-mpWriterRecentThumbnails-Show();
mpWriterTemplateThumbnails-Hide();
-mpShowWriterTemplateButton-Show();
-mpShowWriterRecentButton-Hide();
+mpWriterShowRecentButton-Hide();
+mpWriterRecentThumbnails-Show();
+mpWriterShowTemplateButton-Show();
}
// calc
-else if( pButton == mpShowCalcTemplateButton )
+else if( pButton == mpCalcShowTemplateButton )
{
mpCalcRecentThumbnails-Hide();
+mpCalcShowTemplateButton-Hide();
mpCalcTemplateThumbnails-Show();
-mpShowCalcTemplateButton-Hide();
-mpShowCalcRecentButton-Show();
+mpCalcShowRecentButton-Show();
}
-else if( pButton == mpShowCalcRecentButton )
+else if( pButton == mpCalcShowRecentButton )
{
-mpCalcRecentThumbnails-Show();
mpCalcTemplateThumbnails-Hide();
-mpShowCalcTemplateButton-Show();
-mpShowCalcRecentButton-Hide();
+mpCalcShowRecentButton-Hide();
+mpCalcRecentThumbnails-Show();
+mpCalcShowTemplateButton-Show();
}
// impress
-else if( pButton == mpShowImpressTemplateButton )
+else if( pButton == mpImpressShowTemplateButton )
[Libreoffice-commits] core.git: configure.ac
configure.ac | 14 --
1 file changed, 14 deletions(-)
New commits:
commit 290bfcd2fdb44a52943f6fdc134d2565cbb83db3
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 5 10:24:35 2013 +0100
Remove unneeded configure.ac firebird parts.
Change-Id: I2a6997d62d4e12d67261fbfe07e71fbd816cde04
Reviewed-on: https://gerrit.libreoffice.org/5807
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org
diff --git a/configure.ac b/configure.ac
index 3da20ce..2f20dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8405,20 +8405,6 @@ if test x$enable_firebird_sdbc = xyes; then
SYSTEM_FIREBIRD=NO
FIREBIRD_CFLAGS=-I${WORKDIR}/UnpackedTarball/firebird/include
FIREBIRD_LIBS=-lfbembed
-dnl FIREBIRD_LIBS=-L${OUTDIR}/lib -lfbclient
-
-dnl TODO: Checking to build IBPP in case we want to use it for the
SDBC driver
-
-dnl dnl HP-UX atomic routines are in atomic library, not standard C
library.
-dnl dnl If we can't find atomic routines in vendor library, look for
atomic_ops.
-dnl AC_SEARCH_LIBS(atomic_inc, atomic,,
-dnl AC_CHECK_LIB(atomic_ops, main))
-
-dnl dnl check for tommath presence
-dnl save_LIBS=$LIBS
-dnl AC_CHECK_HEADER(tommath.h,,AC_MSG_ERROR(Include file for tommath
not found - please install development tommath package))
-dnl AC_CHECK_LIB(tommath, mp_init, TOMMATH_LIBS=-ltommath,
AC_MSG_ERROR(Library tommath not found - please install development tommath
package))
-dnl LIBS=$save_LIBS
BUILD_TYPE=$BUILD_TYPE FIREBIRD
ENABLE_FIREBIRD_SDBC=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - connectivity/source include/sal scaddins/source svx/source ucbhelper/source
connectivity/source/commontools/BlobHelper.cxx | 13 ++-
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 36
--
connectivity/source/sdbcx/VUser.cxx| 10 +-
include/sal/types.h| 28 +++
scaddins/source/analysis/analysishelper.cxx| 10 +-
scaddins/source/analysis/financial.cxx | 31 +++-
svx/source/form/fmdmod.cxx |8 ++
ucbhelper/source/client/content.cxx|7 +
8 files changed, 88 insertions(+), 55 deletions(-)
New commits:
commit d868e2d2e38ee8f0a1427dd2de5c0fc547b28506
Author: Tor Lillqvist t...@collabora.com
Date: Wed Sep 4 14:59:02 2013 +0300
WaE: Unreachable code: Use SAL_WNOUNREACHABLE_CODE_PUSH/POP
Cleaner than my first attempt.
This reverts commit 9c0ba0ba41cb3b814cc8bf7a33abf1245d4b241e.
Change-Id: Iec9da427ab2a92cb0765f73af14d83a37f765290
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index 850f56e..e36207b 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1057,6 +1057,9 @@ sal_Bool Content::isFolder()
}
//=
+
+SAL_WNOUNREACHABLE_CODE_PUSH
+
sal_Bool Content::isDocument()
throw( CommandAbortedException, RuntimeException, Exception )
{
@@ -1072,13 +1075,13 @@ sal_Bool Content::isDocument()
get() ) ),
m_xImpl-getEnvironment() );
-#if !(defined(_MSC_VER) defined(ENABLE_LTO))
// Unreachable - cancelCommandExecution always throws an exception,
// But some compilers complain...
return sal_False;
-#endif
}
+SAL_WNOUNREACHABLE_CODE_POP
+
//=
//=
//
commit 5326020f85b67faab34bca5c605b6070c6c4bef0
Author: Tor Lillqvist t...@collabora.com
Date: Wed Sep 4 14:39:05 2013 +0300
WaE: Unreachable code: Use SAL_WNOUNREACHABLE_CODE_PUSH/POP
Cleaner than my first attempt.
This reverts commit aa4868de78b3a3893722f7a079f4d05e18abd8db.
Change-Id: I9c92be72e69292731983a53fc2de29ba333071c9
diff --git a/connectivity/source/commontools/BlobHelper.cxx
b/connectivity/source/commontools/BlobHelper.cxx
index 5135072..fff3e09 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -46,20 +46,25 @@ BlobHelper::BlobHelper(const
::com::sun::star::uno::Sequence sal_Int8 _val)
return new ::comphelper::SequenceInputStream(m_aValue);
}
//
-
+
+// The return after a call to throwFeatureNotImplementedException()
+// (which always throws) will be detected as unreachable when doing
+// global inlining.
+
+SAL_WNOUNREACHABLE_CODE_PUSH
+
::sal_Int64 SAL_CALL BlobHelper::position( const
::com::sun::star::uno::Sequence ::sal_Int8 /*pattern*/, ::sal_Int64
/*start*/ ) throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
::dbtools::throwFeatureNotImplementedException( XBlob::position, *this );
-#if !(defined(_MSC_VER) defined(ENABLE_LTO))
return 0;
-#endif
}
//
-
::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XBlob /*pattern*/,
::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
::dbtools::throwFeatureNotImplementedException( XBlob::positionOfBlob,
*this );
-#if !(defined(_MSC_VER) defined(ENABLE_LTO))
return 0;
-#endif
}
+SAL_WNOUNREACHABLE_CODE_POP
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 7ebd380..6217626 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -323,21 +323,23 @@ sal_Bool SAL_CALL
ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException
return m_bEOF;
}
// -
+
+SAL_WNOUNREACHABLE_CODE_PUSH
+
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException,
RuntimeException)
{
::dbtools::throwFunctionSequenceException(*this);
-#if !(defined(_MSC_VER) defined(ENABLE_LTO))
return sal_False;
-#endif
}
// -
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException,
RuntimeException)
{
[Libreoffice-commits] core.git: 4 commits - codemaker/source cppuhelper/source cppu/source idlc/source include/typelib offapi/UnoApi_offapi.mk udkapi/com udkapi/type_reference udkapi/UnoApi_udkapi.mk
codemaker/source/cppumaker/cpputype.cxx |7 +-
cppu/source/threadpool/current.cxx |2
cppu/source/typelib/static_types.cxx|3 -
cppu/source/typelib/typelib.cxx | 22 +---
cppuhelper/source/tdmgr.cxx |4 -
idlc/source/scanner.l |3 -
include/typelib/typedescription.h | 23 +---
include/typelib/uik.h |2
offapi/UnoApi_offapi.mk |8 ---
udkapi/UnoApi_udkapi.mk |3 -
udkapi/com/sun/star/modules.idl | 83
udkapi/com/sun/star/udk-modules.idl | 83
udkapi/com/sun/star/uno/Uik.idl | 10 +--
udkapi/type_reference/udkapi.rdb|binary
14 files changed, 123 insertions(+), 130 deletions(-)
New commits:
commit 45b2346dcf6b695feb7ebeeb70e50b1c048853b6
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 4 14:34:26 2013 +0200
No need to list documentation-only module.idl files in UnoApi_*.mk
...doxygen still picks them up, as it traverses the complete udkapi/ and
offapi/
soruce trees. (And rename udk-modules.idl to modules.idl for consistency.)
Change-Id: Ic52c333756810c285059f03edc207a0913ead160
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5d1a6d9..de408c0 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -481,9 +481,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/xslt,\
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\
- modules \
-))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\
Accessible \
AccessibleContext \
@@ -822,7 +819,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing
TextProperties \
TextShape \
TransparencyGradientTable \
- modules \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\
BaseStorage \
@@ -839,7 +835,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
FormController \
FormControllerDispatcher \
PropertyBrowserController \
- modules \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\
BindableControlModel \
@@ -1037,9 +1032,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/present
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\
BitmapCanvas \
))
-$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\
- modules \
-))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\
DataProviderHandler \
ReportComponentHandler \
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 8a89327..8a99513 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -27,9 +27,6 @@ $(eval $(call gb_UnoApi_set_include,udkapi,\
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
- udk-modules \
-))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
PropertySet \
))
diff --git a/udkapi/com/sun/star/udk-modules.idl
b/udkapi/com/sun/star/modules.idl
similarity index 100%
rename from udkapi/com/sun/star/udk-modules.idl
rename to udkapi/com/sun/star/modules.idl
commit e03211460a2d2451135527107c7ddbd2e93acba9
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 4 14:28:15 2013 +0200
[API CHANGE] Fix deprecated struct css.uno.Uik member identifiers
UNOIDL identifiers starting with a lowercase letter and containing hyphens
are
reserved for the implementation. It would be good to be able to enforce
that in
code parsing UNOIDL files, but some existing identifiers violate that.
In the case of the published, deprecated css.uno.Uik, the change is
incompatible
in theory but arguably irrelevant in practice.
Change-Id: I61f66e2d73c6aca5498ae566758893b546eb81d5
diff --git a/udkapi/com/sun/star/uno/Uik.idl b/udkapi/com/sun/star/uno/Uik.idl
index f3a6358..82f6a7a 100644
--- a/udkapi/com/sun/star/uno/Uik.idl
+++ b/udkapi/com/sun/star/uno/Uik.idl
@@ -32,23 +32,23 @@ published struct Uik
{
/** specifies a 4 byte data block.
*/
-unsigned long m_Data1;
+unsigned long Data1;
/** specifies a 2 byte data block.
*/
-unsigned short m_Data2;
+unsigned short Data2;
/** specifies a 2 byte data block.
*/
-unsigned short m_Data3;
+unsigned short Data3;
/** specifies a 4 byte data block.
*/
-unsigned long m_Data4;
+unsigned long Data4;
/** specifies a 4 byte data block.
*/
-unsigned long m_Data5;
+unsigned long Data5;
};
diff --git
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d1047ff82d4320e2217a9dc7a50c94d2769 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Sep 5 12:40:38 2013 +0100 Force removal of UNZIP_DIR when unpacking zip (gbuild). mv only moves non-hidden files out of UNZIP_DIR, hence removal of UNZIP_DIR can fail if there are hidden files remaining. This assumes that hidden files aren't actually needed for our purposes. This is a problem e.g. for libatomic_ops which contains a .gitignore in it's top directory, causing the removal of UNZIP_DIR to fail. Change-Id: Ia4a621b90bc4cc5fc15dd2a3ecc209734abc6269 Reviewed-on: https://gerrit.libreoffice.org/5808 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index fdebcb9..8079472 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -44,7 +44,7 @@ unzip \ $(if $(filter-out 0,$(UNPACKED_STRIP_COMPONENTS)),\ UNZIP_DIR=`ls $(UNPACKED_DIR)` \ mv $(UNPACKED_DIR)/$$UNZIP_DIR/* $(UNPACKED_DIR) \ -rmdir $(UNPACKED_DIR)/$$UNZIP_DIR \ +rm -rf $(UNPACKED_DIR)/$$UNZIP_DIR \ ) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/sheet/_NamedRange.idl | 59 --
offapi/type_reference/offapi.rdb |binary
3 files changed, 60 deletions(-)
New commits:
commit ced8703387cb49094b0a74b09a145cbf57883215
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 4 15:10:53 2013 +0200
[API CHANGE] Remove long-deprecated css.sheet._NamedRange constants group
...it had been deprecated at least since late OOo times, with the
css.sheet.NamedRangeFlag constant group as replacement. (UNOIDL identifiers
starting with an underscore are illegal. It would be good to be able to
enforce
that in code parsing UNOIDL files, but some existing identifiers like this
one
violate that.)
Change-Id: Ib8067dee47cec46356065b7b70cc6b47b97e5bc0
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index de408c0..01b2db9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3522,7 +3522,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
XViewPanesSupplier \
XViewSplitable \
XVolatileResult \
- _NamedRange \
))
$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\
SmartTagRecognizerMode \
diff --git a/offapi/com/sun/star/sheet/_NamedRange.idl
b/offapi/com/sun/star/sheet/_NamedRange.idl
deleted file mode 100644
index 2596b7d..000
--- a/offapi/com/sun/star/sheet/_NamedRange.idl
+++ /dev/null
@@ -1,59 +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 __com_sun_star_sheet__NamedRange_idl__
-#define __com_sun_star_sheet__NamedRange_idl__
-
-
- module com { module sun { module star { module sheet {
-
-
-/** @deprecated
-@see com::sun::star::sheet::NamedRangeFlag
- */
-published constants _NamedRange
-{
-
-/** The range contains filter criteria.
- */
-const long FILTER_CRITERIA = 1;
-
-
-/** The range can be used as a print range.
- */
-const long PRINT_AREA = 2;
-
-
-/** The range can be used as column headers for printing.
- */
-const long COLUMN_HEADER = 4;
-
-
-/** The range can be used as row headers for printing.
- */
-const long ROW_HEADER = 8;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb
index dec9b44..9c0eae1 100644
Binary files a/offapi/type_reference/offapi.rdb and
b/offapi/type_reference/offapi.rdb differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal oox/source
include/sal/log-areas.dox|1
oox/source/drawingml/graphicshapecontext.cxx | 15 ++--
oox/source/drawingml/shape.cxx | 32 +--
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit d52e46c418c150b7ace2de313252120981fe0959
Author: Andres Gomez ago...@igalia.com
Date: Tue Aug 20 15:50:01 2013 +0300
oox: Enhancing the debugging output
Change-Id: Ifc055befd5d7436d44e95ce105c52f3c4f061796
Reviewed-on: https://gerrit.libreoffice.org/5768
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index c1d8cf7..3d08cf1 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -131,6 +131,7 @@ certain functionality.
@li @c filter.ms - escher import/export
@li @c filter.xslt - xslt import/export
@li @c oox.cscode - see oox/source/drawingml/customshapes/README
+@li @c oox.drawingml - DrawingML
@li @c oox.ppt - pptx filter
@li @c oox.storage - ZipStorage class
@li @c oox.xmlstream - XmlStream class
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index 0def785..73882f8 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -232,13 +232,14 @@ ContextHandlerRef
DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
getFragmentPathFromRelId( msLo ),
getFragmentPathFromRelId( msQs ),
getFragmentPathFromRelId( msCs ));
-OSL_TRACE(diagram added shape %s of type %s, size (%d,%d,%d,%d),
- OUSTRING_TO_CSTR( mpShapePtr-getName() ),
- OUSTRING_TO_CSTR( mpShapePtr-getServiceName() ),
- mpShapePtr-getPosition().X,
- mpShapePtr-getPosition().Y,
- mpShapePtr-getSize().Width,
- mpShapePtr-getSize().Height);
+SAL_INFO(oox.drawingml, OSL_THIS_FUNC
+ diagram added shape mpShapePtr-getName()
+ of type mpShapePtr-getServiceName()
+ , size ( mpShapePtr-getPosition().X
+ , mpShapePtr-getPosition().Y
+ , mpShapePtr-getSize().Width
+ , mpShapePtr-getSize().Height
+ ));
break;
}
default:
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f065d1b..ee9d9de 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -200,7 +200,7 @@ void Shape::addShape(
const awt::Rectangle* pShapeRect,
ShapeIdMap* pShapeMap )
{
-SAL_INFO(oox, OSL_THIS_FUNC id: msId);
+SAL_INFO(oox.drawingml, OSL_THIS_FUNC id: msId);
try
{
@@ -238,7 +238,7 @@ bool Shape::getLockedCanvas()
void Shape::applyShapeReference( const Shape rReferencedShape, bool bUseText )
{
-SAL_INFO(oox, apply shape reference: rReferencedShape.msId to
shape id: msId);
+SAL_INFO(oox, OSL_THIS_FUNC apply shape reference:
rReferencedShape.msId to shape id: msId);
if ( rReferencedShape.mpTextBody.get() bUseText )
mpTextBody = TextBodyPtr( new TextBody(
*rReferencedShape.mpTextBody.get() ) );
@@ -309,16 +309,16 @@ void Shape::addChildren(
aChildTransformation.scale(1/(maChSize.Width ? maChSize.Width : 1.0),
1/(maChSize.Height ? maChSize.Height : 1.0));
aChildTransformation *= aTransformation;
-OSL_TRACE(parent matrix:\n%f %f %f\n%f %f %f\n%f %f %f,
- aChildTransformation.get(0, 0),
- aChildTransformation.get(0, 1),
- aChildTransformation.get(0, 2),
- aChildTransformation.get(1, 0),
- aChildTransformation.get(1, 1),
- aChildTransformation.get(1, 2),
- aChildTransformation.get(2, 0),
- aChildTransformation.get(2, 1),
- aChildTransformation.get(2, 2));
+SAL_INFO(oox.drawingml, OSL_THIS_FUNC parent matrix:\n
+ aChildTransformation.get(0, 0)
+ aChildTransformation.get(0, 1)
+ aChildTransformation.get(0, 2) \n
+ aChildTransformation.get(1, 0)
+ aChildTransformation.get(1, 1)
+ aChildTransformation.get(1, 2)
+ aChildTransformation.get(2, 0)
+ aChildTransformation.get(2, 1)
+ aChildTransformation.get(2, 2));
std::vector ShapePtr ::iterator aIter( rMaster.maChildren.begin() );
while( aIter != rMaster.maChildren.end() ) {
@@ -339,7 +339,7 @@ Reference XShape Shape::createAndInsert(
FillProperties rShapeOrParentShapeFillProps )
{
bool bIsEmbMedia = false;
-SAL_INFO(oox, OSL_THIS_FUNC id: msId);
+SAL_INFO(oox.drawingml, OSL_THIS_FUNC id: msId);
awt::Rectangle aShapeRectHmm( maPosition.X /
[Libreoffice-commits] help.git: source/text
source/text/swriter/guide/border_character.xhp |1 + 1 file changed, 1 insertion(+) New commits: commit 32c171278a4aa94023069fb264c9192fbe056e6e Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Wed Sep 4 15:50:28 2013 +0200 Note about character border merge Change-Id: I90e64fead00f83e92937955464d2dc0bd2ddb66c diff --git a/source/text/swriter/guide/border_character.xhp b/source/text/swriter/guide/border_character.xhp index 55be150..2bd0830 100644 --- a/source/text/swriter/guide/border_character.xhp +++ b/source/text/swriter/guide/border_character.xhp @@ -25,6 +25,7 @@ /bookmark paragraph xml-lang=en-US id=hd_id3116136 role=heading level=1variable id=border_characterlink href=text/swriter/guide/border_character.xhp name=Defining Borders for CharactersDefining Borders for Characters/link /variable/paragraph + paragraph xml-lang=en-US id=par_id3148413 role=warningIf two adjacent text ranges' all border properties are identical (same style, width, color, padding and shadow), then those two ranges will be considered to be part of the same border group and rendered within the same border in the document./paragraph paragraph xml-lang=en-US id=hd_id3110503 role=heading level=2To Set a Predefined Border Style/paragraph list type=ordered listitem ___ 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 97515d3aa26518d67a90b68a9e767cd7972ff472 Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Wed Sep 4 15:50:28 2013 +0200 Updated core Project: help 32c171278a4aa94023069fb264c9192fbe056e6e diff --git a/helpcontent2 b/helpcontent2 index 0c4fc80..32c1712 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0c4fc80ae026bce6476e321cc023575c318c7650 +Subproject commit 32c171278a4aa94023069fb264c9192fbe056e6e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libcmis compile failure
Hi, currently some tinderboxes are red. It seems libcmis encounters a bug in boost=1.49: https://svn.boost.org/trac/boost/ticket/6785 read_json does not compile on GCC 4.7.0 with std=c++11. Quoting the report: It compiles successfully on 4.7.0 with -std=c++98. So, should we add this flag for libcmis? Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AllLangResTarget.mk | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) New commits: commit a97e46f0024e99312dd16d14b0501404babcdd8d Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Aug 30 12:47:20 2013 +0200 dont duplicate res-files in solver/ anymore, if using gb_RUNNABLE_INSTDIR Change-Id: Ibdf452253e5d4a5882594277bdf86eb96e68b1e3 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 55a8d57..c127dfb 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -367,7 +367,13 @@ gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RES,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_unittest_target,$*)) + rm -f \ + $(call gb_ResTarget_get_target,$*) \ + $(call gb_ResTarget_get_imagelist_target,$*) \ + $(if $(gb_RUNNABLE_INSTDIR),, \ + $(call gb_ResTarget_get_outdir_target,$*) \ + ) \ + $(call gb_ResTarget_get_unittest_target,$*)) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) @@ -399,18 +405,21 @@ define gb_ResTarget_ResTarget $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2) $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3) $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2) -$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) $(call gb_ResTarget_get_unittest_target,$(1)) +$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_unittest_target,$(1)) $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1)) $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) - $(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +ifeq ($(gb_RUNNABLE_INSTDIR),) +$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) +$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) +$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir +$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +endif + endef define gb_ResTarget_add_file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com offapi/org
offapi/com/sun/star/awt/XAnimatedImages.idl| 32 +- offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl |4 - offapi/com/sun/star/document/XDocumentEventBroadcaster.idl | 22 +++--- offapi/com/sun/star/document/XUndoManager.idl | 10 +-- offapi/com/sun/star/document/XUndoManagerListener.idl | 22 +++--- offapi/com/sun/star/form/XGridControl.idl |4 - offapi/com/sun/star/form/XGridControlListener.idl |2 offapi/com/sun/star/form/runtime/XFilterController.idl | 24 +++ offapi/com/sun/star/form/runtime/XFilterControllerListener.idl |6 - offapi/com/sun/star/form/runtime/XFormController.idl |6 - offapi/com/sun/star/form/runtime/XFormControllerContext.idl|2 offapi/com/sun/star/inspection/XPropertyHandler.idl|6 - offapi/com/sun/star/logging/XCsvLogFormatter.idl |4 - offapi/com/sun/star/scanner/XScannerManager.idl|8 +- offapi/com/sun/star/scanner/XScannerManager2.idl |2 offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl |4 - offapi/com/sun/star/sdb/XRowSetChangeListener.idl |2 offapi/com/sun/star/util/XModeChangeApproveListener.idl|2 offapi/com/sun/star/util/XModeChangeBroadcaster.idl|8 +- offapi/com/sun/star/util/XModeChangeListener.idl |2 offapi/org/freedesktop/PackageKit/XModify.idl |2 offapi/org/freedesktop/PackageKit/XQuery.idl |4 - 22 files changed, 89 insertions(+), 89 deletions(-) New commits: commit e76b2053b4c5520ec880fb4fa0031a7ff2ca9ee5 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Sep 4 16:50:24 2013 +0200 Fix UNOIDL interface method parameter identifiers UNOIDL identifiers starting with a lowercase letter and containing underscores are reserved for the implementation. It would be good to be able to enforce that in code parsing UNOIDL files, but some existing identifiers violate that. So at least change any violating method parameter identifiers here. While that is theoretically an incompatible change for published interfaces, it practically does not matter at all. Change-Id: I5eff17b5dd5e2e92984184127c4fe1712d62c9dd diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl index 4f7aa50..722a001 100644 --- a/offapi/com/sun/star/awt/XAnimatedImages.idl +++ b/offapi/com/sun/star/awt/XAnimatedImages.idl @@ -70,17 +70,17 @@ interface XAnimatedImages /** returns the URLs of the image set with the given index -@param i_index +@param iIndex the index of the set those image URLs are to be retrieved. Must be greater than or equal to code0/code, and smaller than the value returned by getImageSetCount(). @throws ::com::sun::star::lang::IndexOutOfBoundsException -if the codei_index/code is not a valid index. +if the codeiIndex/code is not a valid index. */ sequence string getImageSet ( -[in] long i_index +[in] long iIndex ) raises ( @@ -89,20 +89,20 @@ interface XAnimatedImages /** sets the URLs of the image set with the given index -@param i_index +@param iIndex the index at which a new image set should be inserted. Must be greater than or equal to code0/code, and smaller than or equal to the value returned by getImageSetCount(). -@param i_imageURLs +@param iImageURLs the URLs for the images for the given set. Will be resolved using a com::sun::star::graphic::GraphicProvider. @throws ::com::sun::star::lang::IndexOutOfBoundsException -if the codei_index/code is not a valid index. +if the codeiIndex/code is not a valid index. */ void insertImageSet ( -[in] long i_index, -[in] sequence string i_imageURLs +[in] long iIndex, +[in] sequence string iImageURLs ) raises ( @@ -111,21 +111,21 @@ interface XAnimatedImages /** replaces the image set given by index with a new one -@param i_index +@param iIndex the index of the set those image URLs are to be replaced. Must be greater than or equal to code0/code, and smaller than the value returned by getImageSetCount(). -@param i_imageURLs +@param iImageURLs the URLs for the images for the given set. Will be resolved using a com::sun::star::graphic::GraphicProvider. @throws ::com::sun::star::lang::IndexOutOfBoundsException -if the codei_index/code is not a valid index. +if the codeiIndex/code is
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo68787.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
writerfilter/source/dmapper/DomainMapper.cxx | 16
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 ++
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
writerfilter/source/dmapper/PropertyMap.cxx |3 +++
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 15 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |3 +++
writerfilter/source/ooxml/model.xml |2 +-
11 files changed, 56 insertions(+), 4 deletions(-)
New commits:
commit 330b860205c7ba69dd6603f65324d0f89ad9cd5f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Sep 4 16:08:49 2013 +0200
fdo#68787 DOCX import: handle when w:separator is missing for footnotes
There were two problems here:
1) OOXML has no way to explicitly disable the footnote separator, what
is does is that it omits the w:separator/ element in that case. We
didn't parse that previously -- now we do, and if it's missing, the
separator is disabled.
2) The footnote stream isn't read by the importer, only when the main
stream references the footnote one, the relevant part of it is parsed.
At the moment we always parse the first (special, separator) entry in
the footnote stream, that may be optimized later if it becomes a
bottleneck.
Change-Id: Ie588270a212fc90fc41095029a362cfd832b24f8
diff --git a/sw/qa/extras/ooxmlimport/data/fdo68787.docx
b/sw/qa/extras/ooxmlimport/data/fdo68787.docx
new file mode 100644
index 000..c47b809
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo68787.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 973f3b1..bfae9a3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -131,6 +131,7 @@ public:
void testTableStyleParprop();
void testTablePagebreak();
void testFdo68607();
+void testFdo68787();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -228,6 +229,7 @@ void Test::run()
{table-style-parprop.docx, Test::testTableStyleParprop},
{table-pagebreak.docx, Test::testTablePagebreak},
{fdo68607.docx, Test::testFdo68607},
+{fdo68787.docx, Test::testFdo68787},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1540,6 +1542,13 @@ void Test::testFdo68607()
CPPUNIT_ASSERT(getPages() 1);
}
+void Test::testFdo68787()
+{
+uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+// This was 25, the 'lack of w:separator' - '0 line width' mapping was
missing.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xPageStyle,
FootnoteLineRelativeWidth));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 261d99c..0dc4667 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1465,6 +1465,11 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
if (pSectionContext != NULL)
pSectionContext-SetPageNumber(nIntValue);
break;
+case NS_ooxml::LN_CT_FtnEdn_type:
+// This is the separator footnote, ignore its linebreak.
+if (static_castsal_uInt32(nIntValue) ==
NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)
+m_pImpl-m_bIgnoreNextPara = true;
+break;
default:
{
#if OSL_DEBUG_LEVEL 0
@@ -3728,6 +3733,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
m_pImpl-m_pSdtHelper-createDateControl(sText);
return;
}
+else if (len == 1 sText[0] == 0x03)
+{
+// This is the uFtnEdnSep, remember that the document has a separator.
+m_pImpl-m_bHasFtnSep = true;
+return;
+}
try
{
@@ -3735,6 +3746,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
if(len == 1 (sText[0] == 0x0d || sText[0] == 0x07))
{
+if (m_pImpl-m_bIgnoreNextPara)
+{
+m_pImpl-m_bIgnoreNextPara = false;
+return;
+}
PropertyMapPtr pContext =
m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH);
if (pContext
m_pImpl-GetSettingsTable()-GetSplitPgBreakAndParaMark())
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index
[Libreoffice-commits] core.git: 2 commits - filter/source vcl/source
filter/source/graphicfilter/itiff/itiff.cxx |5 -
vcl/source/control/throbber.cxx |1 -
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit dc86610d16a561ff1a0455d5fef157431f9271e3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Sep 4 16:33:43 2013 +0200
fdo#68210: Make tiff import work again with merged-libs
- there was a symbol mismatch for dynamic loading
- while this fixes fdo#68210, similar fixes are likely needed for the other
dynamically loaded functionality
Change-Id: I7e4d6baf256dbe7b145dcbc118b4cac2075e07f5
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 7b47690..71bd7e0 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1358,7 +1358,10 @@ sal_Bool TIFFReader::ReadTIFF(SvStream rTIFF, Graphic
rGraphic )
//== GraphicImport - the exported function
-#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS)
+// this needs to be kept in sync with
+// ImpFilterLibCacheEntry::GetImportFunction() from
+// vcl/source/filter/graphicfilter.cxx
+#if defined(DISABLE_DYNLOADING)
#define GraphicImport itiGraphicImport
#endif
commit 2349713c72be2ce4069fa5be3062a18fd9318587
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Sep 4 16:28:07 2013 +0200
remove macro breaking 'make vcl debug=T'
Change-Id: I694480dc876f5990f5904cf39b15ea0c60ea816d
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 457bb2e..bc4063f 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -174,7 +174,6 @@ void Throbber::initImages()
}
catch( const Exception )
{
-DBG_UNHANDLED_EXCEPTION();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/egif/egif.cxx |5 - filter/source/graphicfilter/eos2met/eos2met.cxx |5 - filter/source/graphicfilter/epbm/epbm.cxx |5 - filter/source/graphicfilter/epgm/epgm.cxx |5 - filter/source/graphicfilter/epict/epict.cxx |5 - filter/source/graphicfilter/eppm/eppm.cxx |5 - filter/source/graphicfilter/eps/eps.cxx |5 - filter/source/graphicfilter/eras/eras.cxx |5 - filter/source/graphicfilter/etiff/etiff.cxx |9 - filter/source/graphicfilter/expm/expm.cxx |9 - filter/source/graphicfilter/idxf/idxf.cxx |5 - filter/source/graphicfilter/ieps/ieps.cxx |5 - filter/source/graphicfilter/ios2met/ios2met.cxx |5 - filter/source/graphicfilter/ipbm/ipbm.cxx |5 - filter/source/graphicfilter/ipcd/ipcd.cxx |5 - filter/source/graphicfilter/ipcx/ipcx.cxx |5 - filter/source/graphicfilter/ipict/ipict.cxx |5 - filter/source/graphicfilter/ipsd/ipsd.cxx |5 - filter/source/graphicfilter/iras/iras.cxx |5 - filter/source/graphicfilter/itga/itga.cxx |5 - 20 files changed, 80 insertions(+), 28 deletions(-) New commits: commit 3a021c00d9b27e6bcafbfaf8bf7b36cdd40768e2 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Sep 4 16:53:35 2013 +0200 fdo#68210 related: make other filters work again too - see dc86610d16a561ff1a0455d5fef157431f9271e3 for details Change-Id: I6041ca10f58335187928995368db673c1ce22e7b diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 708e7b5..74b82a6 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -558,7 +558,10 @@ void GIFWriter::WriteTerminator() // -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport egiGraphicExport #endif diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index fc9efad..780e5e4 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2553,7 +2553,10 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile rMTF, SvStream rTargetStream, //== GraphicExport - the exported Function -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport emeGraphicExport #endif diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index d59c1ad..7fc5743 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -189,7 +189,10 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // - -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport epbGraphicExport #endif diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 912fdd3..40ee4c5 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -213,7 +213,10 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // - -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport epgGraphicExport #endif diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 8af1c52..60419f7 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2266,7 +2266,10 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile rMTF, SvStream rTargetStrea //== GraphicExport - the exported Function -#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) +// this needs to be kept in sync with +// ImpFilterLibCacheEntry::GetImportFunction() from +// vcl/source/filter/graphicfilter.cxx +#if defined(DISABLE_DYNLOADING) #define GraphicExport eptGraphicExport #endif diff --git a/filter/source/graphicfilter/eppm/eppm.cxx
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/frmcrsr.cxx |4 +---
sw/source/core/text/guess.cxx |8 +++-
sw/source/core/text/porlin.hxx|1 -
sw/source/core/text/porrst.cxx|3 +--
sw/source/core/txtnode/fntcap.cxx |4 +---
sw/source/core/txtnode/ndtxt.cxx |6 +++---
6 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit 41d229b23c462cbee52bd5af01180009c8670746
Author: Caolán McNamara caol...@redhat.com
Date: Wed Sep 4 12:17:22 2013 +0100
XubString-OUString
Change-Id: I72b2678c79401320c355c7b6635a6180b01202f1
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index cc77a91..c3021e4 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1518,9 +1518,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData rFill ) const
SwTwips nSpace = 0;
if( FILL_TAB != rFill.Mode() )
{
-static sal_Char const sDoubleSpace[] = ;
-const XubString aTmp( sDoubleSpace,
RTL_TEXTENCODING_MS_1252 );
-
+const OUString aTmp( );
SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTmp, 0, 2 );
nSpace = pFnt-_GetTxtSize( aDrawInf ).Width()/2;
}
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index ae5a8ff..ac7ec40 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -537,25 +537,23 @@ bool SwTxtGuess::AlternativeSpelling( const
SwTxtFormatInfo rInf,
const xub_StrLen nPos )
{
// get word boundaries
-xub_StrLen nWordLen;
-
Boundary aBound =
g_pBreakIt-GetBreakIter()-getWordBoundary( rInf.GetTxt(), nPos,
g_pBreakIt-GetLocale( rInf.GetFont()-GetLanguage() ),
WordType::DICTIONARY_WORD, sal_True );
nBreakStart = (xub_StrLen)aBound.startPos;
-nWordLen = static_castxub_StrLen(aBound.endPos - nBreakStart);
+sal_Int32 nWordLen = aBound.endPos - nBreakStart;
// if everything else fails, we want to cut at nPos
nCutPos = nPos;
-XubString aTxt( rInf.GetTxt().copy( nBreakStart, nWordLen ) );
+OUString aTxt( rInf.GetTxt().copy( nBreakStart, nWordLen ) );
// check, if word has alternative spelling
Reference XHyphenator xHyph( ::GetHyphenator() );
OSL_ENSURE( xHyph.is(), Hyphenator is missing);
//! subtract 1 since the UNO-interface is 0 based
-xHyphWord = xHyph-queryAlternativeSpelling( OUString(aTxt),
+xHyphWord = xHyph-queryAlternativeSpelling( aTxt,
g_pBreakIt-GetLocale( rInf.GetFont()-GetLanguage() ),
nPos - nBreakStart, rInf.GetHyphValues() );
return xHyphWord.is() xHyphWord-isAlternativeSpelling();
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 12f275b..68b93d7 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -25,7 +25,6 @@
#include libxml/xmlwriter.h
#endif
-class XubString;
class SwTxtSizeInfo;
class SwTxtPaintInfo;
class SwTxtFormatInfo;
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 74901cd..cfc9552 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -164,8 +164,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo rInf )
const
if( rInf.GetFont()-IsPaintBlank() )
{
-static sal_Char const sDoubleSpace[] = ;
-XubString aTxtDouble( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
+OUString aTxtDouble( );
//
SwRect aClipRect;
rInf.CalcRect( *this, aClipRect, 0 );
diff --git a/sw/source/core/txtnode/fntcap.cxx
b/sw/source/core/txtnode/fntcap.cxx
index 5a82414..f0e6e04 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -317,8 +317,6 @@ void SwDoDrawCapital::Do()
void SwDoDrawCapital::DrawSpace( Point rPos )
{
-static sal_Char const sDoubleSpace[] = ;
-
long nDiff = rInf.GetPos().X() - rPos.X();
Point aPos( rPos );
@@ -343,7 +341,7 @@ void SwDoDrawCapital::DrawSpace( Point rPos )
{
rInf.ApplyAutoColor();
GetOut().DrawStretchText( aPos, nDiff,
-XubString( sDoubleSpace, RTL_TEXTENCODING_MS_1252 ), 0, 2 );
+OUString( ), 0, 2 );
}
rPos.X() = rInf.GetPos().X() + rInf.GetWidth();
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index d0cd25a..f22047e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3067,15 +3067,15 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode rDestNd,
const SwIndex* pDestIdx,
{
case RES_TXTATR_FIELD:
{
-XubString const aExpand(
+OUString const aExpand(
static_castSwTxtFld
const*(pHt)-GetFld().GetFld()
[Libreoffice-commits] core.git: sw/qa sw/source
dev/null |binary
sw/qa/extras/ooxmlexport/data/fdo68787.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 -
sw/source/filter/ww8/docxattributeoutput.cxx | 12 +++-
5 files changed, 20 insertions(+), 10 deletions(-)
New commits:
commit 3f2774c771fc54757364ed50fab9b4753d067371
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Sep 4 17:19:47 2013 +0200
fdo#68787 DOCX export: handle zero width footnote separator
Change-Id: Ieb1d8d1f8609558b4af06630b603a51da3e665f4
diff --git a/sw/qa/extras/ooxmlimport/data/fdo68787.docx
b/sw/qa/extras/ooxmlexport/data/fdo68787.docx
similarity index 100%
rename from sw/qa/extras/ooxmlimport/data/fdo68787.docx
rename to sw/qa/extras/ooxmlexport/data/fdo68787.docx
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1445ccc..5dc83f5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -115,6 +115,7 @@ public:
void testBnc834035();
void testFdo68418();
void testA4AndBorders();
+void testFdo68787();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -206,6 +207,7 @@ void Test::run()
{bnc834035.odt, Test::testBnc834035},
{fdo68418.docx, Test::testFdo68418},
{a4andborders.docx, Test::testA4AndBorders},
+{fdo68787.docx, Test::testFdo68787},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1264,6 +1266,13 @@ void Test::testA4AndBorders()
CPPUNIT_ASSERT_EQUAL_MESSAGE(Incorrect Page Height (mm), sal_Int32(297),
getPropertysal_Int32(xPageStyle, Height) / 100);
}
+void Test::testFdo68787()
+{
+uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+// This was 25, the 'lack of w:separator' - '0 line width' mapping was
missing.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xPageStyle,
FootnoteLineRelativeWidth));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bfae9a3..973f3b1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -131,7 +131,6 @@ public:
void testTableStyleParprop();
void testTablePagebreak();
void testFdo68607();
-void testFdo68787();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -229,7 +228,6 @@ void Test::run()
{table-style-parprop.docx, Test::testTableStyleParprop},
{table-pagebreak.docx, Test::testTablePagebreak},
{fdo68607.docx, Test::testFdo68607},
-{fdo68787.docx, Test::testFdo68787},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1542,13 +1540,6 @@ void Test::testFdo68607()
CPPUNIT_ASSERT(getPages() 1);
}
-void Test::testFdo68787()
-{
-uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
-// This was 25, the 'lack of w:separator' - '0 line width' mapping was
missing.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xPageStyle,
FootnoteLineRelativeWidth));
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 342bd75..7f08f58 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4340,7 +4340,17 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
FSEND );
m_pSerializer-startElementNS( XML_w, XML_p, FSEND );
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
-m_pSerializer-singleElementNS( XML_w, XML_separator, FSEND );
+
+bool bSeparator = true;
+if (bFootnotes)
+{
+const SwPageFtnInfo rFtnInfo =
m_rExport.pDoc-GetPageDesc(0).GetFtnInfo();
+// Request a separator only in case the width is larger than zero.
+bSeparator = double(rFtnInfo.GetWidth()) 0;
+}
+
+if (bSeparator)
+m_pSerializer-singleElementNS( XML_w, XML_separator, FSEND );
m_pSerializer-endElementNS( XML_w, XML_r );
m_pSerializer-endElementNS( XML_w, XML_p );
m_pSerializer-endElementNS( XML_w, nItem );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salprn.cxx | 12 ++--
vcl/win/source/window/salframe.cxx |8
vcl/win/source/window/salmenu.cxx | 18 --
3 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 4bd28f7931a533a8ad2b0787f19ce26e6818d5b4
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Sep 4 11:32:10 2013 +0200
XubString to OUString
Change-Id: Ia7514abaa494a367d51db9d9990cd94cff6ed503
Reviewed-on: https://gerrit.libreoffice.org/5802
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 217dca8..19122e7 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -200,7 +200,7 @@ void WinSalInstance::GetPrinterQueueState(
SalPrinterQueueInfo* pInfo )
{
if( pWinInfo2-pDriverName )
pInfo-maDriver = OUString( reinterpret_cast const
sal_Unicode* (pWinInfo2-pDriverName) );
-XubString aPortName;
+OUString aPortName;
if ( pWinInfo2-pPortName )
aPortName = OUString( reinterpret_cast const sal_Unicode*
(pWinInfo2-pPortName) );
// pLocation can be 0 (the Windows docu doesn't describe this)
@@ -235,13 +235,13 @@ OUString WinSalInstance::GetDefaultPrinter()
if( nChars )
{
LPWSTR pStr = (LPWSTR)rtl_allocateMemory(nChars*sizeof(WCHAR));
-XubString aDefPrt;
+OUString aDefPrt;
if( GetDefaultPrinterW( pStr, nChars ) )
{
-aDefPrt = reinterpret_castsal_Unicode* (pStr);
+aDefPrt = OUString(reinterpret_castsal_Unicode* (pStr));
}
rtl_freeMemory( pStr );
-if( aDefPrt.Len() )
+if( !aDefPrt.isEmpty() )
return aDefPrt;
}
@@ -1231,7 +1231,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const
ImplJobSetup* pSetupData )
OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData,
sal_uLong nPaperBin )
{
-XubString aPaperBinName;
+OUString aPaperBinName;
DWORD nBins = ImplDeviceCaps( this, DC_BINNAMES, NULL, pSetupData );
if ( (nPaperBin nBins) (nBins != GDI_ERROR) )
@@ -1239,7 +1239,7 @@ OUString WinSalInfoPrinter::GetPaperBinName( const
ImplJobSetup* pSetupData, sal
sal_Unicode* pBuffer = new sal_Unicode[nBins*24];
DWORD nRet = ImplDeviceCaps( this, DC_BINNAMES, (BYTE*)pBuffer,
pSetupData );
if ( nRet (nRet != GDI_ERROR) )
-aPaperBinName = pBuffer + (nPaperBin*24);
+aPaperBinName = OUString( pBuffer + (nPaperBin*24) );
delete [] pBuffer;
}
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index f290c29..9b4e12c 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2904,11 +2904,11 @@ void WinSalFrame::UpdateSettings( AllSettings
rSettings )
// is to wide for the dialogs
if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
{
-XubString aFontName = aAppFont.GetName();
-XubString aFirstName = aFontName.GetToken( 0, ';' );
-if ( aFirstName.EqualsIgnoreCaseAscii( MS Sans Serif ) )
+OUString aFontName = aAppFont.GetName();
+OUString aFirstName = aFontName.getToken( 0, ';' );
+if ( aFirstName.equalsIgnoreAsciiCase( MS Sans Serif ) )
{
-aFontName.InsertAscii( Arial;, 0 );
+aFontName = Arial; + aFontName;
aAppFont.SetName( aFontName );
}
}
diff --git a/vcl/win/source/window/salmenu.cxx
b/vcl/win/source/window/salmenu.cxx
index 8b8a92b..e7a3aad 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -328,14 +328,13 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem*
pSalMenuItem, const OU
#endif
// combine text and accelerator text
-XubString aStr( pWItem-mText );
+OUString aStr( pWItem-mText );
if( pWItem-mAccelText.getLength() )
{
-aStr.AppendAscii(\t);
-aStr.Append( pWItem-mAccelText );
+aStr += \t + pWItem-mAccelText;
}
-pWItem-mInfo.dwTypeData = (LPWSTR) aStr.GetBuffer();
-pWItem-mInfo.cch = aStr.Len();
+pWItem-mInfo.dwTypeData = (LPWSTR) aStr.getStr();
+pWItem-mInfo.cch = aStr.getLength();
if(!::SetMenuItemInfoW( mhMenu, nPos, TRUE, pWItem-mInfo ))
myerr = GetLastError();
@@ -357,14 +356,13 @@ void WinSalMenu::SetAccelerator( unsigned nPos,
SalMenuItem* pSalMenuItem, const
pWItem-mInfo.fType |= MFT_OWNERDRAW;
#endif
// combine text and accelerator text
-XubString aStr( pWItem-mText );
+OUString aStr( pWItem-mText );
if( pWItem-mAccelText.getLength() )
{
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/svdraw/svdoashp.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7462607928247310b6426325e374c2f9e6f33bd9
Author: Armin Le Grand a...@apache.org
Date: Wed Sep 4 15:58:19 2013 +
i123181 Corrected mirroring of shear angle in
SdrObjCustomShape::TRSetBaseGeometry, this was wrong
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index d34ada5..4a74a9b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3343,8 +3343,10 @@ void SdrObjCustomShape::TRSetBaseGeometry(const
basegfx::B2DHomMatrix rMatrix,
if(!basegfx::fTools::equalZero(fShearX))
{
GeoStat aGeoStat;
-// #121932# do *not* forget to invert shearX(!)
-aGeoStat.nShearWink = FRound((atan(-fShearX) / F_PI180) * 100.0);
+// #123181# The fix for #121932# here was wrong, the trunk version
does not correct the
+// mirrored shear values, neither at the object level, nor on the API
or XML level. Taking
+// back the mirroring of the shear angle
+aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: libcmis compile failure
On 04.09.2013 19:50, Miklos Vajna wrote: On Wed, Sep 04, 2013 at 06:16:16PM +0400, Ivan Timofeev timofeev@gmail.com wrote: Quoting the report: It compiles successfully on 4.7.0 with -std=c++98. So, should we add this flag for libcmis? Hmm, but we bundle boost 1.54. What's the point of using system boost, but internal libcmis? A wish to build with as much system libraries as possible maybe. :) We require quite recent libcmis = 0.4.0. Also there is: AC_MSG_ERROR([--with-system-libcmis conflicts with --enable-dbgutil]) Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC]Firebird Integration Weekly Update 12
How much attention should QA pay to Integrated Firebird? Is there some part of the work for which bug reports would be useful? I can imagine, for example, looking at a bug report against embedded HSQLDB and trying the same thing on Firebird. If Firebird shows the same bug, that is unremarkable; if Firebird works better than HSQLDB, that is interesting in the context of the original bug; if Firebird is worse than HSQLDB (including not being able to get far enough to demonstrate the bug), that is a bug in the Firebird support. Thanks, Terry. -- View this message in context: http://nabble.documentfoundation.org/GSOC-Firebird-Integration-Weekly-Update-12-tp4072578p4073020.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On Sat, Aug 03, 2013 at 02:00:28PM +0200, Lionel Elie Mamane wrote: On Sat, Aug 03, 2013 at 09:54:33AM +0200, Stephan Bergmann wrote: On 08/03/2013 02:56 AM, Thorsten Behrens wrote: * API date issue (Lionel/Stephan) + patches pending on gerrit for -4-1 AI: + review get them in before Monday: https://gerrit.libreoffice.org/5245 So, consensus appears to be to go with option 1 (Break ABI/API in 4.1.1) from http://lists.freedesktop.org/archives/libreoffice/2013-July/054764.html More time-related API headache? Did you happen to have any further discussion about it during the ESC meeting? So, we did that for LibreOffice 4.1, but api.libreoffice.org still documents the old API. Who can regenerated api.libreoffice.org from up-to-date libreoffice-4-1 (or master?) branch? Thanks in advance, -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libcmis compile failure
On Wed, Sep 04, 2013 at 06:16:16PM +0400, Ivan Timofeev timofeev@gmail.com wrote: Quoting the report: It compiles successfully on 4.7.0 with -std=c++98. So, should we add this flag for libcmis? Hmm, but we bundle boost 1.54. What's the point of using system boost, but internal libcmis? Wouldn't it make more sense to tweak the tinderbox to not mix system and internal libraries? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] XubString to OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5802 Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7514abaa494a367d51db9d9990cd94cff6ed503 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oovbaapi/ooo
oovbaapi/ooo/vba/excel/XAxis.idl |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 456539a6faa79e4ec7f9f553e215cc2bc501ed62
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 4 17:37:35 2013 +0200
Remove effectively dead raises specification
Looks like idlc ignores the lone (due to the preceeding ;) raises
specification, for whatever buggy reason. XAxis.idl had been like this
since
the inception, and the C++ implementation of getAxisGroup in
sc/source/ui/vba/vbaaxis.{cxx,hxx} had also failed to list
BasicErrorException
since its inception (likely because the function signatures were copied
directly
from the generated .hdl file, which of course also lacks
BasicErrorException;
and also does not really need it given the function definition just returns
a
member variable), so keep the status quo and clean up the .idl file.
Change-Id: Ib4ffddb6ec867ca302cc595915cae17099734ddf
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 52ab5ab..ed24df2 100644
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -118,8 +118,7 @@ interface XAxis
boolean getMinimumScaleIsAuto()
raises(com::sun::star::script::BasicErrorException);
-long getAxisGroup();//
-raises(com::sun::star::script::BasicErrorException);
+long getAxisGroup();
void setScaleType([in] long ScaleType)
raises(com::sun::star::script::BasicErrorException);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source
avmedia/source/vlc/vlcmanager.cxx | 11 ---
avmedia/source/vlc/vlcplayer.hxx|4 +++-
avmedia/source/vlc/wrapper/SymbolLoader.hxx |5 ++---
3 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 1e4ee9d1744a34c5ee3a21358fa3beef55f84246
Author: Minh Ngo nlmin...@gmail.com
Date: Wed Sep 4 14:57:14 2013 +0300
Turn off event queue.
It's not already threadsafe
Change-Id: I0d2015090171762abd777304b6f30029d995
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
index 441dbc1..56e4365 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -43,8 +43,10 @@ Manager::Manager( const uno::Reference
lang::XMultiServiceFactory rxMgr )
}
}
-if (m_is_vlc_found)
-mEventHandler-launch();
+std::cout T std::endl;
+//if (m_is_vlc_found)
+//mEventHandler-launch();
+std::cout T std::endl;
}
Manager::~Manager()
@@ -62,6 +64,7 @@ uno::Reference media::XPlayer SAL_CALL
Manager::createPlayer( const rtl::OUSt
VLCPlayer* pPlayer( new VLCPlayer( rURL, mEventHandler /*, mxMgr */ )
);
mPlayer = uno::Reference media::XPlayer ( pPlayer );
}
+std::cout A std::endl;
return mPlayer;
}
commit 9335f5f1c577b8f6b43200de573f0112f84b007e
Author: Minh Ngo nlmin...@gmail.com
Date: Wed Sep 4 13:40:49 2013 +0300
Fixing a crash when loading symbols from LibVLC.
Change-Id: Ifb39dea6f0d2328d5658f34ca35d6d65445c38ef
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
index a028d74..441dbc1 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -30,9 +30,11 @@ Manager::Manager( const uno::Reference
lang::XMultiServiceFactory rxMgr )
//Check VLC version
std::vectorstd::string verComponents;
const std::string str(Common::Version());
+
+std::cout str std::endl;
boost::split(verComponents,
str,
- boost::is_any_of(.-));
+ boost::is_any_of(. ));
if (verComponents.size() 3
|| boost::lexical_castint(verComponents[0]) 2
|| (boost::lexical_castint(verComponents[1]) == 0
boost::lexical_castint(verComponents[2]) 8))
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index de809f7..2996cb2 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -19,7 +19,9 @@
#ifndef _VLCPLAYER_HXX
#define _VLCPLAYER_HXX
-
+#if defined UNX
+#include unistd.h
+#endif
#include vlccommon.hxx
#include boost/shared_ptr.hpp
#include cppuhelper/compbase2.hxx
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 3f97fa5..a49e4bf 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -74,8 +74,8 @@ namespace
*pMap[ i ].refValue = NULL;
return false;
}
-
-*pMap[ i ].refValue = aMethod;
+else
+*pMap[ i ].refValue = aMethod;
}
return true;
@@ -104,7 +104,6 @@ namespace VLC
if (tryLink( aModule, pMap ))
{
-osl_unloadModule( aModule );
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: libcmis compile failure
Hi, On Wed, Sep 04, 2013 at 05:50:05PM +0200, Miklos Vajna wrote: On Wed, Sep 04, 2013 at 06:16:16PM +0400, Ivan Timofeev timofeev@gmail.com wrote: Quoting the report: It compiles successfully on 4.7.0 with -std=c++98. So, should we add this flag for libcmis? Hmm, but we bundle boost 1.54. What's the point of using system boost, but internal libcmis? Wouldn't it make more sense to tweak the tinderbox to not mix system and internal libraries? In general, using system libs might incur high amounts of redtape for LibreOffice: - using the external lib might incur bugs/regressions that are not encountered with the internal version and requires extra testing or bugfixing - the external lib must be packaged in a recent enough version - even a packaged version might need additional review and process to be usable by LibreOffice, e.g. https://wiki.ubuntu.com/MainInclusionProcess as such, having the option to fall back on a internal copy is highly desirable. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC] about:config utility a.k.a Expert Config - Weekly Report #10
Hi all, Last week was not productive at all. I couldn't optimize the page as much as I wanted. I was expecting to reduce the time to about 3 seconds at least. Instead I have a time about 6 seconds now. But good news is now usable with all of the options. Also all kinds of sorting is disabled on the page too. Because we figured out the sorting methods was causing issues. This weeks works is the other things on the list. =Basic version of my to-do list= -Stability issues on the page ( for example we cannot handle the types other then string.) -Searchbar -Visual changes. Best, -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - i18nlangtag/source i18npool/source include/i18nlangtag
i18nlangtag/source/isolang/isolang.cxx|2 +-
i18npool/source/localedata/LocaleNode.cxx | 22 +-
i18npool/source/localedata/data/de_CH.xml |3 ---
i18npool/source/localedata/data/es_AR.xml |3 ---
i18npool/source/localedata/data/es_BO.xml |3 ---
i18npool/source/localedata/data/es_CL.xml |3 ---
i18npool/source/localedata/data/es_CO.xml |3 ---
i18npool/source/localedata/data/es_DO.xml |3 ---
i18npool/source/localedata/data/es_EC.xml |3 ---
i18npool/source/localedata/data/es_GT.xml |3 ---
i18npool/source/localedata/data/es_HN.xml |3 ---
i18npool/source/localedata/data/es_MX.xml |3 ---
i18npool/source/localedata/data/es_NI.xml |3 ---
i18npool/source/localedata/data/es_PA.xml |3 ---
i18npool/source/localedata/data/es_PE.xml |3 ---
i18npool/source/localedata/data/es_PR.xml |3 ---
i18npool/source/localedata/data/es_PY.xml |3 ---
i18npool/source/localedata/data/es_SV.xml |3 ---
i18npool/source/localedata/data/es_UY.xml |3 ---
i18npool/source/localedata/data/es_VE.xml |3 ---
i18npool/source/localedata/data/fr_BE.xml |3 ---
i18npool/source/localedata/data/fr_CA.xml |3 ---
i18npool/source/localedata/data/fr_CH.xml |3 ---
i18npool/source/localedata/data/lt_LT.xml |3 ---
i18npool/source/localedata/data/rw_RW.xml |3 ---
i18npool/source/localedata/data/sk_SK.xml |3 ---
i18npool/source/localedata/data/uk_UA.xml |3 ---
include/i18nlangtag/lang.h|1 -
28 files changed, 18 insertions(+), 82 deletions(-)
New commits:
commit 77682c94993193604699079a9325a6dcb32bf965
Author: Eike Rathke er...@redhat.com
Date: Wed Sep 4 19:17:41 2013 +0200
better error-checking for Language,Country,Variant
Change-Id: I4e4f896ca9af8be7118fc868d57f9e2fa6102d74
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 4c49121..1c654b0 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -340,25 +340,37 @@ void LCInfoNode::generateCode (const OFileWriter of)
const
const LocaleNode * countryNode = findNode(Country);
const LocaleNode * variantNode = findNode(Variant);
+OUString aLanguage;
+
if (languageNode)
{
-writeParameterCheckLen( of, langID, languageNode-getChildAt(0), 2,
-1);
+aLanguage = languageNode-getChildAt(0)-getValue();
+if (!(aLanguage.getLength() == 2 || aLanguage.getLength() == 3))
+incErrorStr( langID not 2-3 characters, aLanguage);
+of.writeParameter(langID, aLanguage);
of.writeParameter(langDefaultName,
languageNode-getChildAt(1)-getValue());
}
else
incError( No Language node.);
if (countryNode)
{
-of.writeParameter(countryID, countryNode-getChildAt(0)-getValue());
+OUString aCountry( countryNode-getChildAt(0)-getValue());
+if (!(aCountry.isEmpty() || aCountry.getLength() == 2))
+incErrorStr( countryID not empty or more than 2 characters,
aCountry);
+of.writeParameter(countryID, aCountry);
of.writeParameter(countryDefaultName,
countryNode-getChildAt(1)-getValue());
}
else
incError( No Country node.);
if (variantNode)
{
-of.writeParameter(Variant, variantNode-getValue());
-fprintf( stderr, Warning: %s\n,
-Variants are not supported by application.);
+// If given Variant must be at least ll-Ssss and language must be 'qlt'
+OUString aVariant( variantNode-getValue());
+if (!(aVariant.isEmpty() || (aVariant.getLength() = 7
aVariant.indexOf('-'
+incErrorStr( invalid Variant, aVariant);
+if (!(aVariant.isEmpty() || aLanguage == qlt))
+incErrorStrStr( Variant '%s' given but Language '%s' is not
'qlt', aVariant, aLanguage);
+of.writeParameter(Variant, aVariant);
}
else
of.writeParameter(Variant, OUString());
commit e2da56a909ec435e3293da910ec605923a7206ee
Author: Eike Rathke er...@redhat.com
Date: Wed Sep 4 18:30:10 2013 +0200
removed unused Platform element
Change-Id: If1bb51a69e099e112cce32b8219688b17befa3a3
diff --git a/i18npool/source/localedata/data/de_CH.xml
b/i18npool/source/localedata/data/de_CH.xml
index 245e57b..d88a407 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -27,9 +27,6 @@
CountryIDCH/CountryID
DefaultNameSwitzerland/DefaultName
/Country
-Platform
- PlatformIDgeneric/PlatformID
-/Platform
/LC_INFO
LC_CTYPE
Separators
diff --git a/i18npool/source/localedata/data/es_AR.xml
b/i18npool/source/localedata/data/es_AR.xml
index cca8279..f376cc0 100644
--- a/i18npool/source/localedata/data/es_AR.xml
+++ b/i18npool/source/localedata/data/es_AR.xml
@@ -27,9 +27,6 @@
CountryIDAR/CountryID
[GSOC] about:config utility a.k.a Expert Config - Weekly Report #11
I sent this weeks report as a reply to the last weeks accidentally. you can find the report on there or here: http://nabble.documentfoundation.org/GSOC-about-config-utility-a-k-a-Expert-Config-Weekly-Report-10-td4073036.html thanks -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
Lionel Elie Mamane wrote: Who can regenerated api.libreoffice.org from up-to-date libreoffice-4-1 (or master?) branch? Hi Miklos, I keep forgetting - was it you taking care of that? Thanks, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On Wed, Sep 4, 2013 at 8:40 PM, Thorsten Behrens t...@documentfoundation.org wrote: Lionel Elie Mamane wrote: Who can regenerated api.libreoffice.org from up-to-date libreoffice-4-1 (or master?) branch? Hi Miklos, I keep forgetting - was it you taking care of that? LOL. It's me. I'll do it ASAP. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/languagetag/languagetag.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit a25846baf1137e7086292d8d8824a94f6a825166
Author: Eike Rathke er...@redhat.com
Date: Wed Sep 4 21:04:30 2013 +0200
for zh-HK or zh-MO also list zh-TW as fallback
Change-Id: If86d7df0c9ed84f704c0f2421820f3d9c060f2fd
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 63da4fc..f2f2bec 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1227,7 +1227,12 @@ LanguageTag LanguageTag::makeFallback()
if (isIsoLocale())
{
if (!aCountry.isEmpty())
+{
aVec.push_back( aLanguage + - + aCountry);
+// For zh-HK or zh-MO also list zh-TW
+if (aLanguage == zh (aCountry == HK || aCountry == MO))
+aVec.push_back( aLanguage + -TW);
+}
aVec.push_back( aLanguage);
return aVec;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-online-spellcheck' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|36799 | -- 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
[PUSHED] Remove more unused methods
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5789 Approvals: LibreOffice gerrit bot: Verified Thomas Arnhold: Verified; Looks good to me, approved Marcos Souza: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/5789 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fec40d767905bcca366257a67f669eaa1055cbc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathtype.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ffda2ff88aae5c388fe13ae451cad9af38e41edc
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Sep 4 22:47:59 2013 +0200
Some more fixes
Forgotten in 150c9f8bbcffacc687a5603e2a589d2a3816dccb
Change-Id: I177c3bcb15bf789a68b8758a8a545d4c6bdf5d85
Reviewed-on: https://gerrit.libreoffice.org/5820
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 94310db..42f118d 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -664,7 +664,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
bool bOpenString=false;
sal_Int32 nTextStart = 0;
sal_Int32 nSubSupStartPos = 0;
-sal_Int32 nLastTemplateBracket=STRING_NOTFOUND;
+sal_Int32 nLastTemplateBracket=-1;
do
{
@@ -1261,7 +1261,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8
nSelector,
{
bool bOk=false;
sal_Int32 nI = rRet.lastIndexOf('{');
-if (nI != STRING_NOTFOUND)
+if (nI != -1)
{
for(nI=nI+1;nIrRet.getLength();nI++)
if (rRet[nI] != ' ')
@@ -1386,7 +1386,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8
nSelector,
bool bOk=false;
sal_Int32 nI = rRet.lastIndexOf('{');
-if (nI != STRING_NOTFOUND)
+if (nI != -1)
{
for(nI=nI+1;nIrRet.getLength();nI++)
if (rRet[nI] != ' ')
@@ -2694,7 +2694,7 @@ int MathType::HandleMatrix(int nLevel,sal_uInt8 nSelector,
int nRet = HandleRecords(nLevel+1,nSelector,nVariation,nRows,nCols);
sal_Int32 nI = rRet.lastIndexOf('#');
-if ((nI != STRING_NOTFOUND) (nI 0))
+if ((nI != -1) (nI 0))
if (rRet[nI-1] != '#') //missing column
rRet += {};
@@ -2723,7 +2723,7 @@ int MathType::HandleTemplate(int nLevel,sal_uInt8
rSelector,
//another one after it, mathtype handles it as if the second one was
//inside the first one and renders it as sub of sub
bool bRemove=false;
-if ( (rSelector == 0xf) (rLastTemplateBracket != STRING_NOTFOUND) )
+if ( (rSelector == 0xf) (rLastTemplateBracket != -1) )
{
bRemove=true;
for (sal_Int32 nI = rLastTemplateBracket+1; nI rRet.getLength();
nI++ )
@@ -2741,12 +2741,12 @@ int MathType::HandleTemplate(int nLevel,sal_uInt8
rSelector,
{
rRet = rRet.replaceAt(rLastTemplateBracket,1,);
rRet += } ;
-rLastTemplateBracket = STRING_NOTFOUND;
+rLastTemplateBracket = -1;
}
if (rSelector == 0xf)
rLastTemplateBracket = rRet.lastIndexOf('}');
else
-rLastTemplateBracket = STRING_NOTFOUND;
+rLastTemplateBracket = -1;
rSelector = sal::static_int_cast sal_uInt8 (-1);
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx include/unotools sc/inc sc/source sfx2/source svx/source sw/source unotools/source unusedcode.easy
include/svx/dialcontrol.hxx|2
include/svx/sdr/overlay/overlayrectangle.hxx |1
include/unotools/configitem.hxx| 11 -
sc/inc/compiler.hxx| 12 -
sc/inc/dpobject.hxx|4
sc/inc/formulacell.hxx |3
sc/inc/rangenam.hxx|2
sc/source/core/data/dpobject.cxx | 215 -
sc/source/core/data/formulacell.cxx| 17 -
sc/source/core/inc/ddelink.hxx |3
sc/source/core/tool/compiler.cxx | 29 ---
sc/source/core/tool/ddelink.cxx|5
sc/source/core/tool/rangenam.cxx | 10 -
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 10 -
sc/source/ui/sidebar/CellLineStyleValueSet.hxx |2
sfx2/source/sidebar/Deck.cxx | 14 -
sfx2/source/sidebar/Deck.hxx |1
svx/source/dialog/dialcontrol.cxx |5
svx/source/sdr/overlay/overlayrectangle.cxx| 15 -
sw/source/filter/ww8/writerwordglue.cxx|6
sw/source/filter/ww8/writerwordglue.hxx| 14 -
unotools/source/config/configitem.cxx | 38
unusedcode.easy| 16 -
23 files changed, 435 deletions(-)
New commits:
commit 62d50671919424ca4dd80cd7733b7b259132b9ab
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Tue Sep 3 12:02:53 2013 -0300
Remove more unused methods
Change-Id: I8fec40d767905bcca366257a67f669eaa1055cbc
Reviewed-on: https://gerrit.libreoffice.org/5789
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Marcos Souza marcos.souza@gmail.com
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 84dc1dc..92a3ace 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -116,8 +116,6 @@ public:
* 2 means 100th of degree
*/
voidSetLinkedField( NumericField* pField, sal_Int32
nDecimalPlaces = 0);
-/** Returns the linked numeric edit field, or 0. */
-NumericField* GetLinkedField() const;
/** The passed handler is called whenever the totation value changes. */
voidSetModifyHdl( const Link rLink );
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx
b/include/svx/sdr/overlay/overlayrectangle.hxx
index 3d2f6f7..95de313 100644
--- a/include/svx/sdr/overlay/overlayrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrectangle.hxx
@@ -71,7 +71,6 @@ namespace sdr
// added CursorBlinkTime (in ms)
sal_uInt32 getBlinkTime() const { return mnBlinkTime; }
-void setBlinkTime(sal_uInt32 nNew);
// execute event from base class ::sdr::animation::Event. Default
// implementation does nothing and does not create a new event.
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index d9f7675..f942722 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -156,17 +156,6 @@ namespace utl
// add a new node without setting any properties
sal_BoolAddNode(const OUString rNode, const
OUString rNewNode);
-/** get a name for a new element of a set node
-@param _rSetNode
-relative path to the set node
-@param _rBaseName
-ullibin/b: the base to use when calculating a new
name/li
-libout/b: an unused element name/li
-/ul
-@return TRUE/ if a free name could be generated
-*/
-sal_BoolgetUniqueSetElementName( const OUString
_rSetNode, OUString _rBaseName);
-
public:
virtual ~ConfigItem();
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 5ce3a5d..1870ddc 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -437,18 +437,6 @@ public:
static void MoveRelWrap( ScTokenArray rArr, ScDocument* pDoc, const
ScAddress rPos,
SCCOL nMaxCol, SCROW nMaxRow );
-/** If the character is allowed as first character in sheet names or
-references, includes '$' and '?'. */
-static bool IsCharWordChar(
-String const rStr, xub_StrLen nPos,
-const formula::FormulaGrammar::AddressConvention eConv =
formula::FormulaGrammar::CONV_OOO );
-
-/** If the character is allowed in sheet names, thus may be part of a
-reference, includes '$' and '?' and such. */
-static bool IsWordChar(
-String const rStr, xub_StrLen nPos,
-const formula::FormulaGrammar::AddressConvention eConv =
formula::FormulaGrammar::CONV_OOO );
-
/** If the character
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||36799 -- 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: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
On Wed, Sep 4, 2013 at 6:25 PM, Lionel Elie Mamane lio...@mamane.lu wrote: On Sat, Aug 03, 2013 at 02:00:28PM +0200, Lionel Elie Mamane wrote: On Sat, Aug 03, 2013 at 09:54:33AM +0200, Stephan Bergmann wrote: On 08/03/2013 02:56 AM, Thorsten Behrens wrote: * API date issue (Lionel/Stephan) + patches pending on gerrit for -4-1 AI: + review get them in before Monday: https://gerrit.libreoffice.org/5245 So, consensus appears to be to go with option 1 (Break ABI/API in 4.1.1) from http://lists.freedesktop.org/archives/libreoffice/2013-July/054764.html More time-related API headache? Did you happen to have any further discussion about it during the ESC meeting? So, we did that for LibreOffice 4.1, but api.libreoffice.org still documents the old API. Who can regenerated api.libreoffice.org from up-to-date libreoffice-4-1 (or master?) branch? I updated api.libreoffice.org from master. Cheers, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/wrapper/Player.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e16a29d8d41253ac86d516deacf59684030fe998 Author: Minh Ngo nlmin...@gmail.com Date: Thu Sep 5 01:19:17 2013 +0300 Replacing unistd.h by stdint.h Change-Id: I39cfe819518d11152200620515eded09ed6889f0 diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx index 3413e95..4ff066a 100644 --- a/avmedia/source/vlc/wrapper/Player.hxx +++ b/avmedia/source/vlc/wrapper/Player.hxx @@ -10,7 +10,7 @@ #ifndef _WRAPPER_PLAYER_HXX #define _WRAPPER_PLAYER_HXX #if defined UNX -# include unistd.h +# include stdint.h #endif struct libvlc_media_player_t; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/smartart-persistence' - 4 commits - drawinglayer/source include/editeng include/oox include/sal include/svl include/svx offapi/com oox/source qadevOOo/o
Rebased ref, commits from common ancestor:
commit 932d8ac094ef50f374fe974dd3a48ae16fc0e962
Author: Andres Gomez ago...@igalia.com
Date: Tue Sep 3 11:13:22 2013 +0300
oox: added XDocuments and interfaces to the Diagram class
Change-Id: I22bb41a5695c7026dbdd4dea8a73cbb49e29acd7
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 94c8342..def3df8 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -174,6 +174,9 @@ public:
voidaddExtDrawingRelId( const OUString rRelId ) {
maExtDrawings.push_back( rRelId ); }
voidsetLockedCanvas(bool bLockedCanvas);
boolgetLockedCanvas();
+const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue
+getDiagramDoms() { return maDiagramDoms; }
+voidsetDiagramDoms(const
com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue );
protected:
@@ -265,6 +268,8 @@ private:
// we need separate
flag because we don't want
// to propagate it
when applying reference shape
bool mbLockedCanvas; /// Is this shape part of a locked canvas?
+
+com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue
maDiagramDoms;
};
//
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index a7bc286..012ff0a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -26,6 +26,7 @@
#include com/sun/star/xml/dom/XDocument.hpp
#include com/sun/star/xml/sax/XFastSAXSerializable.hpp
#include rtl/ustrbuf.hxx
+#include editeng/unoprnms.hxx
#include oox/drawingml/textbody.hxx
#include oox/drawingml/textparagraph.hxx
#include oox/drawingml/textrun.hxx
@@ -329,6 +330,26 @@ void Diagram::addTo( const ShapePtr pParentShape )
ShapeCreationVisitor aCreationVisitor(pParentShape, *this);
if( mpLayout-getNode() )
mpLayout-getNode()-accept( aCreationVisitor );
+
+pParentShape-setDiagramDoms( getDomsAsPropertyValues() );
+}
+
+uno::Sequencebeans::PropertyValue Diagram::getDomsAsPropertyValues() const
+{
+sal_Int32 length = maMainDomMap.size();
+
+uno::Sequencebeans::PropertyValue aValue(length);
+beans::PropertyValue* pValue = aValue.getArray();
+for (DiagramDomMap::const_iterator i = maMainDomMap.begin();
+ i != maMainDomMap.end();
+ ++i)
+{
+pValue[0].Name = i-first;
+pValue[0].Value = uno::makeAny(i-second);
+++pValue;
+}
+
+return aValue;
}
uno::Referencexml::dom::XDocument loadFragment(
@@ -368,17 +389,33 @@ void loadDiagram( ShapePtr pShape,
DiagramLayoutPtr pLayout( new DiagramLayout() );
pDiagram-setLayout( pLayout );
+rtl::Reference core::FragmentHandler xRefDataModel(
+new DiagramDataFragmentHandler( rFilter, rDataModelPath, pData ));
+uno::Referencexml::dom::XDocument
xDataModelDom(loadFragment(rFilter,xRefDataModel));
+rtl::Reference core::FragmentHandler xRefLayout(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
+uno::Referencexml::dom::XDocument
xLayoutDom(loadFragment(rFilter,xRefLayout));
+rtl::Reference core::FragmentHandler xRefQStyle(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath,
pDiagram-getStyles() ));
+uno::Referencexml::dom::XDocument
xQStyleDom(loadFragment(rFilter,xRefQStyle));
+rtl::Reference core::FragmentHandler xRefColorStyle(
+new ColorFragmentHandler( rFilter, rColorStylePath,
pDiagram-getColors() ));
+uno::Referencexml::dom::XDocument
xColorStyleDom(loadFragment(rFilter,xRefColorStyle));
+
+DiagramDomMap rMainDomMap = pDiagram-getDomMap();
+rMainDomMap[OUString::createFromAscii(OOXData)] = xDataModelDom;
+rMainDomMap[OUString::createFromAscii(OOXLayout)] = xLayoutDom;
+rMainDomMap[OUString::createFromAscii(OOXStyle)] = xQStyleDom;
+rMainDomMap[OUString::createFromAscii(OOXColor)] = xColorStyleDom;
+
// data
if( !rDataModelPath.isEmpty() )
{
-rtl::Reference core::FragmentHandler xRef(
-new DiagramDataFragmentHandler( rFilter, rDataModelPath, pData ));
-
importFragment(rFilter,
- loadFragment(rFilter,xRef),
+ xDataModelDom,
DiagramData,
pShape,
- xRef);
+ xRefDataModel);
// Pass the info to pShape
for( ::std::vectorOUString::const_iterator aIt =
pData-getExtDrawings().begin(), aEnd = pData-getExtDrawings().end();
aIt != aEnd; ++aIt )
@@ -391,37 +428,31 @@ void loadDiagram( ShapePtr pShape,
// layout
Brian Fraser license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license, unless otherwise stated. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Introduction
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Howard, We are very happy, that you are going to help us doing QA. So here some points from my side (if I am wrong, anyone please correct): - -We do not have a deb master, rpm master can be found online: http://dev-builds.libreoffice.org/daily/master/Linux-x86-64@8-SLED11/current/ - -Here a list of old unconfirmed bugs: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDlimit=100product=LibreOfficeorder=changeddate%2Cbug_id%20DESC As you can see the output is limited to 100 bugs... We do have a biweekly QA call, next in 2 days If you do ahve any questions, please do not hesitate and ask :) Am 02.09.2013 16:58, schrieb Ho Wan Chan: Hello LibreOffice Quality Assurance Team, I would like to express my sincere interest in joining the LibreOffice Quality Assurance Team. I have been an active Ubuntu QA member for over a year, writing testcases and testing images and applications. I would like to enhance my QA experiences by joining the team. Most likely I'll be doing bug triaging and feature testing. I won't do Automated testcase writing for sure, programming is not my area of expertise (although I do know how to code in a few coding languages). Regards, Howard Chan (smartboyhw) Ubuntu Member ___ 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/ - -- Liebe Grüße, / Yours, Florian Reisinger -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.21 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSJuJZAAoJEF/HVupbJ8Ha2pcH/jLV0jqBr4pHA1U4RrYqybY/ LXf69vZJm3LIFRZMYOcsbmBJKvOorjlhUHNAq0fzqOV+oOpuepPGoTbQDbR5RCe3 UhgLM0M32NDiP19LbHfakMoUcXMwNcZ50SBjf+3rG8ChJax4Xvx0CTuWcEDkCXQm l9H49sDmoznk6HlUxLGUdIgJqCVJ55zyvsQTUWxtdHvyF1wwnvJtrKGInNza3GJE YqFwmPYeAjmBYbdzbxVoWQIM8XlEWOzEtNUUV0UGFHdCBVovx7ZPwZGTWNaWPXBA mKzt0dj2bHRTjF6B6FlvSW+RN2FMyxNVHRfQofzKfxoIWnqWk2SXdG3HK5KgcDs= =LImv -END PGP SIGNATURE- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Introduction
hi Howard, great to see somebody interested in doing QA! On 04/09/13 09:33, Florian Reisinger wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Howard, We are very happy, that you are going to help us doing QA. So here some points from my side (if I am wrong, anyone please correct): - -We do not have a deb master, rpm master can be found online: http://dev-builds.libreoffice.org/daily/master/Linux-x86-64@8-SLED11/current/ just to mention it again the RPMs can be installed on any Linux system, on Ubuntu it is just apt-get install rpm and then you can use the script attached here[1] to install the lot in an arbitrary directory that has its own UserInstallation profile (without impacting any distro LO packages you may have). oh actually i just downloaded the RPMs from there and the install script is even conveniently bundled right in there as ./LibreOfficeDev_4.2.0.0.alpha0_Linux_x86-64_rpm/install. [1] http://lists.freedesktop.org/archives/libreoffice-qa/2011-November/000393.html PS: does anybody know if there is some official QA wiki page to which the above can be added, or did somebody add it already? i feel like a broken record :) PPS: Fedora 19 is currently affected by a bug in rpm that prevents using this script so ironically it may even work better on .deb based distros :-/ https://bugzilla.redhat.com/show_bug.cgi?id=1001553 ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-l10n] Re: L10n of Florian's Windows installer
I prepared it i think you can add it your file. https://docs.google.com/spreadsheet/ccc?key=0AkKwk_yUmRmndC1TWVVfVGw1V2dDV3NXWDhINzRQMXc -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-L10n-of-Florian-s-Windows-installer-tp4071790p4073019.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 68666] PIVOTTABLE: function GETPIVOTDATA does not return data
https://bugs.freedesktop.org/show_bug.cgi?id=68666 --- Comment #5 from Guillaume Mortier g_mort...@yahoo.fr --- Created attachment 85169 -- https://bugs.freedesktop.org/attachment.cgi?id=85169action=edit screen capture of a case that worked with 4.0 This file was made at the end of May, with version 4.0.3 I think. The formula in cell P6 worked at that time, and returned 19908. Here, we have 3 line fields (Groupe, Recept and Nom) and 1 column field, and the formula just queries for the total of data field somme - exped for one particular value of recept. In short, the formula should return the total value that is displayed in cell H6. -- 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 68859] Error saving the document FILE: Write Error. The file could not be written.
https://bugs.freedesktop.org/show_bug.cgi?id=68859 --- Comment #2 from Asger Hansen a...@1957ab.dk --- hi mariosv, Now can I save it as a excel file 2003 and 2010 version but not in ods version. Sometimes when I try to save it, Calc hangs so fast the only way close the program is to restart my PC. It is only this spreadsheet I have the problems in, I will in the next days make me a new speadsheet to replace this one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68756] no startup any more: msvcr100.dll not found, after 4.1.0 -- 4.1.1 upgrade on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=68756 --- Comment #23 from tommy27 ba...@quipo.it --- I have an additional info that may be related to the present .dll bug with LibO 4.1.1 I tested the portable version (X-LibO 4.1.1 - see link in Comment 18) on 3 different PCs. it runs with no issue if there's a concurrent installation of 4.2 alpha (31 august build) while it doesn't start if no standard LibO installation is present. I suspect that the faulty .dll of 4.1.1 is not enough to run X-LibO alone, instead the .dll shipped and installed with 4.2alpha make work X-LibO as well. -- 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 68917] New: 3D Look: Simple or Realistic don't change the appearance of the chart
https://bugs.freedesktop.org/show_bug.cgi?id=68917 Priority: medium Bug ID: 68917 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: 3D Look: Simple or Realistic don't change the appearance of the chart Severity: normal Classification: Unclassified OS: All Reporter: dra...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.0.4 release Component: Chart Product: LibreOffice Create a new chart with wizard and check 3D Look so the left combobox will be activate. When select an item it control don't take the choice -- 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 68418] FILESAVE: Exporting DOCX with empty 'different first page' loses footer from 2nd page
https://bugs.freedesktop.org/show_bug.cgi?id=68418 --- Comment #2 from jl...@mail.com --- Created attachment 85171 -- https://bugs.freedesktop.org/attachment.cgi?id=85171action=edit PDF of what the document looks like before saving - different footers on page 1 and 2 I can also confirm with 4.1.1.2 (Linux) and have some additional information. It seems like the footer is affected by the header settings. If you also add a header with separate odd/even pages, then the different footers are retained. If you delete the header, or set the header back to same content left/right, then the footer is also affected (immediately) - the even/left footer is replaced by the odd/right one. Even though you can still separately modify odd/even footers, the changes are not retained when the document is closed and reopened. (Well, not visibly in LO 4.1 anyway. 4.0 will read the document just fine.) Other observations: 1.) If you immediately set the page style to mirrored (before saving? before defining the footers?), then it is not a problem. The problem is seen if page style is first defined with right and left and then switched to mirrored. 2.) This does not happen if you save in .DOC format. The problem is seen with .ODT and .DOCX -- 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 68918] New: FILESAVE: Content loss results when saving in a different format (docx)
https://bugs.freedesktop.org/show_bug.cgi?id=68918 Priority: medium Bug ID: 68918 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Content loss results when saving in a different format (docx) Severity: normal Classification: Unclassified OS: Linux (All) Reporter: camilleri@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.1.2 rc Component: Writer Product: LibreOffice Created attachment 85173 -- https://bugs.freedesktop.org/attachment.cgi?id=85173action=edit Documents Problem description: Steps to reproduce: 1. File Save a document in .odt format 2. File Save a document in .docx format Current behavior: It is noted that currently saving in a different format results in loss of content. Similar behaviour had been noticed with my assignment, and, I had thought that I had done some mistake but I lost about two days of typing when I was copying and saving the documents. Expected behavior: No content loss is made when saving content or transposing to a different format. Opportunity cost for this data loss in terms of intellectual property can be estimated as: €50 x 16 hours = €800 excluding administrative expenses. Operating System: Ubuntu Version: 4.1.1.2 rc Last worked in: 3.6.7.2 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68756] no startup any more: msvcr100.dll not found, after 4.1.0 -- 4.1.1 upgrade on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=68756
--- Comment #24 from ape os...@yandex.ru ---
(In reply to comment #21)
(In reply to comment #17)
1. comment 6: The same error was in a Master-LibO_4.2.0 between the 13rd
and 21st of August, but with MS VCR 2012 (msvcr110.dll and msvcp110.dll).
That's a different story, that Tinderbox uses VS 2012 instead of VS 2010.
2. In theory, the libraries are not needed, because they already exist in
the «${ORIGIN}\program\shlxthdl\..» folder.
No, «${ORIGIN}\program\shlxthdl\..» folder contains 64-bit VC runtime,
because 64-bit shell extensions need it. LibreOffice is a 32-bit application.
--
Andras,
please read my comment 22 and look attachment 85167.
«${ORIGIN}\program\shlxthdl\..» folder contains 32-bit VC runtime
(msvcp100.dll_x32: size - 593 KB or 608080 bytes). I think so, because the
“msvcp100.dll” 64-bit library (ver. 10.00.40219.325) has a different size in
411 KB (421200 bytes).
--
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 68919] New: UI: when editing a chart, popup items don't have the descriptions
https://bugs.freedesktop.org/show_bug.cgi?id=68919 Priority: medium Bug ID: 68919 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: when editing a chart, popup items don't have the descriptions Severity: normal Classification: Unclassified OS: All Reporter: dra...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Chart Product: LibreOffice Created attachment 85175 -- https://bugs.freedesktop.org/attachment.cgi?id=85175action=edit Screenshot 1. Select a chart in Calc 2. Do Edit 3. Right click on it -- 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 68904] FILTER: The new Import filters for AppleWorks/ClarisWorks don't work for spreadsheets
https://bugs.freedesktop.org/show_bug.cgi?id=68904 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||dtar...@redhat.com --- Comment #1 from David Tardon dtar...@redhat.com --- The libwpd API that libmwaw uses only handles text documents. There is a comparable API for import of spreadsheets in liborcus, but so far nobody has used it to write additional import filters (other than the few that are already part of liborcus). I am closing this report, because technically it is not a bug, but a known limitation of what libmwaw can do. And it only marginally touches libreoffice anyway, as libmwaw is not even under our control. -- 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 68918] FILESAVE: Content loss results when saving in a different format (docx)
https://bugs.freedesktop.org/show_bug.cgi?id=68918 --- Comment #1 from Fridrich Strba fridrich.st...@bluewin.ch --- (In reply to comment #0) Opportunity cost for this data loss in terms of intellectual property can be estimated as: €50 x 16 hours = €800 excluding administrative expenses. Thanks. It is to be noted that saving in any other format then .odt (the ISO approved open standard) can even incur more costs: medical expenditures, child psychologist expenditures and even some taxi bills for going to and from hospital. Since it is insane to want to use anything else :) -- 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 68418] FILESAVE: Exporting DOCX with empty 'different first page' loses footer from 2nd page
https://bugs.freedesktop.org/show_bug.cgi?id=68418 --- Comment #4 from Adam CloudOn rattles2...@gmail.com --- This was supposed to be resolved in master by this commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=196328c91ee889a0a1cbc39ce2549c7405afbef5 -- 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 68920] New: UI: 3D pie chart (created in MS-Excel) are show in 2D
https://bugs.freedesktop.org/show_bug.cgi?id=68920 Priority: medium Bug ID: 68920 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: 3D pie chart (created in MS-Excel) are show in 2D Severity: normal Classification: Unclassified OS: All Reporter: dra...@gmail.com Hardware: Other Status: NEW Version: 4.1.0.4 release Component: Chart Product: LibreOffice Created attachment 85176 -- https://bugs.freedesktop.org/attachment.cgi?id=85176action=edit Example 3D pie chart created in MS-Excel (I try on Excel 2003) don't show in 3D but in 2D -- 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 68921] New: RTL: passwd.hxx conversion from String to OUString
https://bugs.freedesktop.org/show_bug.cgi?id=68921 Priority: medium Bug ID: 68921 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: RTL: passwd.hxx conversion from String to OUString Severity: normal Classification: Unclassified OS: Linux (All) Reporter: bric...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.0.4 release Component: UI Product: LibreOffice Created attachment 85177 -- https://bugs.freedesktop.org/attachment.cgi?id=85177action=edit Patch fixing libreoffice-4.1 a8af548 revision OUString errors Problem description: Build broken on linux x86_64 gcc-4.8 Compilation of git clone of branch libreoffice-4.1 fails. in core/include/sfx2/passwd.hxx the prototype for SfxPasswordDialog::SfxPasswordDialog(Window*, const String*) has been changed to SfxPasswordDialog::SfxPasswordDialog(Window*, const rtl::OUString*) However, several cpp files have not been updated to work with this. Attached patch makes libreoffice-4.1 tree (revision: a8af548) build for me (with gcc-4.8.1 20130521 prerelease) Operating System: Linux (Other) Version: 4.1.0.4 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68726] Navigator pops up child dialog behind itself (hidden) on X11
https://bugs.freedesktop.org/show_bug.cgi?id=68726 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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
