LibreOffice Gerrit News for core on 2014-03-19
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Hopefully fix Windows HiDPI toolbar layout bug in https://gerrit.libreoffice.org/8637 from Keith Curtis about module vcl + scp2: move firebird into base. in https://gerrit.libreoffice.org/8647 from Andrzej Hunt about module scp2 + RID_SVXDLG_MULTIPATH dialog converted in https://gerrit.libreoffice.org/8614 from Szymon Kłos about module cui + fdo#64290 ui:count selected rows and columns in https://gerrit.libreoffice.org/8640 from Manmeet Singh about module sc End of freshness + Full colour borders in .doc import/export in https://gerrit.libreoffice.org/8646 from Luke Deller about module include, sw + fdo#56284 : soffice fails to start unless ~/.config exists and is writabl in https://gerrit.libreoffice.org/8630 from Michaël Lefèvre about module sal + fdo#76248: Fix for file corruption which contains Polyline shape. in https://gerrit.libreoffice.org/8623 from Rohit Deshmukh about module sw + make rest param in endsWithIgnoreAsciiCase default to zero in https://gerrit.libreoffice.org/8642 from Noel Grandin about module include * Merged changes on master for project core changed in the last 25 hours: + fdo#76098 ContentType for .xlsm external data file is wrong in https://gerrit.libreoffice.org/8572 from Ravindra Vidhate + fdo#72775 : LibreOffice hang while opening some documents in https://gerrit.libreoffice.org/8632 from Tushar Bende + fdo#76249 DOCX export DML Drawing as lockedCanvas if it's inside DMLTextF in https://gerrit.libreoffice.org/8618 from Vinaya Mandke + convert sal_Char* to OUString in https://gerrit.libreoffice.org/8641 from Noel Grandin + Find places where OUString and OString are passed by value. in https://gerrit.libreoffice.org/8478 from Noel Grandin * 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#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + sal: use posix_memalign only if it's available in https://gerrit.libreoffice.org/8405 from Douglas Mencken + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn 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: ucb/source
ucb/source/ucp/webdav/ContentProperties.cxx| 36 +++---
ucb/source/ucp/webdav/ContentProperties.hxx|2
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx |2
ucb/source/ucp/webdav/SerfSession.cxx |2
ucb/source/ucp/webdav/SerfSession.hxx |2
ucb/source/ucp/webdav/webdavcontent.cxx| 118 ++---
ucb/source/ucp/webdav/webdavcontent.hxx| 14 +-
7 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 26b4c8e5f13350c47e98bd78ba5494f117629e05
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Mar 19 07:39:53 2014 +0100
webdav: loplugin warnings and sal_Bool - bool
Change-Id: I0f1797aa03868e7652a0f90a5cf72ba851537b41
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx
b/ucb/source/ucp/webdav/ContentProperties.cxx
index 6d09c5f..0d5e074 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -113,27 +113,27 @@ ContentProperties::ContentProperties( const DAVResource
rResource )
}
if ( rResource.uri.endsWith(/) )
-m_bTrailingSlash = sal_True;
+m_bTrailingSlash = true;
}
ContentProperties::ContentProperties(
-const OUString rTitle, sal_Bool bFolder )
+const OUString rTitle, bool bFolder )
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
(*m_xProps)[ OUString( Title ) ]
= PropertyValue( uno::makeAny( rTitle ), true );
(*m_xProps)[ OUString( IsFolder ) ]
= PropertyValue( uno::makeAny( bFolder ), true );
(*m_xProps)[ OUString( IsDocument ) ]
-= PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
+= PropertyValue( uno::makeAny( bool( !bFolder ) ), true );
}
ContentProperties::ContentProperties( const OUString rTitle )
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
(*m_xProps)[ OUString( Title ) ]
= PropertyValue( uno::makeAny( rTitle ), true );
@@ -142,7 +142,7 @@ ContentProperties::ContentProperties( const OUString
rTitle )
ContentProperties::ContentProperties()
: m_xProps( new PropertyValueMap ),
- m_bTrailingSlash( sal_False )
+ m_bTrailingSlash( false )
{
}
@@ -219,11 +219,11 @@ void ContentProperties::UCBNamesToDAVNames(
// resourcetype - IsFolder, IsDocument, ContentType
// (taken from URI) - Title
-sal_Bool bCreationDate = sal_False;
-sal_Bool bLastModified = sal_False;
-sal_Bool bContentType = sal_False;
-sal_Bool bContentLength = sal_False;
-sal_Bool bResourceType = sal_False;
+bool bCreationDate = false;
+bool bLastModified = false;
+bool bContentType = false;
+bool bContentLength = false;
+bool bResourceType = false;
sal_Int32 nCount = rProps.getLength();
for ( sal_Int32 n = 0; n nCount; ++n )
@@ -241,7 +241,7 @@ void ContentProperties::UCBNamesToDAVNames(
if ( !bCreationDate )
{
propertyNames.push_back( DAVProperties::CREATIONDATE );
-bCreationDate = sal_True;
+bCreationDate = true;
}
}
else if ( rProp.Name == DateModified ||
@@ -251,7 +251,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETLASTMODIFIED );
-bLastModified = sal_True;
+bLastModified = true;
}
}
else if ( rProp.Name == MediaType ||
@@ -261,7 +261,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETCONTENTTYPE );
-bContentType = sal_True;
+bContentType = true;
}
}
else if ( rProp.Name == Size ||
@@ -271,7 +271,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
propertyNames.push_back(
DAVProperties::GETCONTENTLENGTH );
-bContentLength = sal_True;
+bContentLength = true;
}
}
else if ( rProp.Name == ContentType ||
@@ -282,7 +282,7 @@ void ContentProperties::UCBNamesToDAVNames(
if ( !bResourceType )
{
propertyNames.push_back( DAVProperties::RESOURCETYPE );
-bResourceType = sal_True;
+bResourceType = true;
}
}
else
@@ -514,13 +514,13 @@ void ContentProperties::addProperty( const OUString
rName,
rValue = aValue;
// Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
-sal_Bool bFolder =
+bool bFolder =
aValue.equalsIgnoreAsciiCase( collection );
(*m_xProps)[
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
98 ++
1 file changed, 98 insertions(+)
New commits:
commit 5390829bb36653ae931ff3cfd59ea089bc594ec9
Author: Tor Lillqvist t...@collabora.com
Date: Wed Mar 19 08:27:48 2014 +0200
Add some more source files for debugging convenience
Change-Id: I8e489354fab78e2dff35ecaca80375640c75a68d
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index e2153dd..b14b523 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -169,6 +169,51 @@
BE35B5A71890520E001B7439 /* objface.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objface.cxx;
path = ../../../sfx2/source/control/objface.cxx; sourceTree = group; };
BE55B06B18D87CC600950228 /* DocumentTableViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = DocumentTableViewController.h; sourceTree = group; };
BE55B06C18D87CC600950228 /* DocumentTableViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = DocumentTableViewController.m; sourceTree =
group; };
+ BE55B06F18D96FB000950228 /* displayinfo.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
displayinfo.cxx; path = ../../../svx/source/sdr/contact/displayinfo.cxx;
sourceTree = group; };
+ BE55B07018D96FB000950228 /* objectcontact.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
objectcontact.cxx; path = ../../../svx/source/sdr/contact/objectcontact.cxx;
sourceTree = group; };
+ BE55B07118D96FB000950228 /* objectcontactofobjlistpainter.cxx
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
objectcontactofobjlistpainter.cxx; path =
../../../svx/source/sdr/contact/objectcontactofobjlistpainter.cxx; sourceTree =
group; };
+ BE55B07218D96FB000950228 /* objectcontactofpageview.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
objectcontactofpageview.cxx; path =
../../../svx/source/sdr/contact/objectcontactofpageview.cxx; sourceTree =
group; };
+ BE55B07318D96FB000950228 /* sdrmediawindow.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrmediawindow.cxx; path = ../../../svx/source/sdr/contact/sdrmediawindow.cxx;
sourceTree = group; };
+ BE55B07418D96FB000950228 /* viewcontact.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontact.cxx; path = ../../../svx/source/sdr/contact/viewcontact.cxx;
sourceTree = group; };
+ BE55B07518D96FB000950228 /* viewcontactofe3d.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3d.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3d.cxx; sourceTree = group; };
+ BE55B07618D96FB000950228 /* viewcontactofe3dcube.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dcube.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dcube.cxx; sourceTree =
group; };
+ BE55B07718D96FB000950228 /* viewcontactofe3dextrude.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dextrude.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dextrude.cxx; sourceTree =
group; };
+ BE55B07818D96FB000950228 /* viewcontactofe3dlathe.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dlathe.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dlathe.cxx; sourceTree =
group; };
+ BE55B07918D96FB000950228 /* viewcontactofe3dpolygon.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dpolygon.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dpolygon.cxx; sourceTree =
group; };
+ BE55B07A18D96FB000950228 /* viewcontactofe3dscene.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dscene.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dscene.cxx; sourceTree =
group; };
+ BE55B07B18D96FB000950228 /* viewcontactofe3dsphere.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
viewcontactofe3dsphere.cxx; path =
../../../svx/source/sdr/contact/viewcontactofe3dsphere.cxx; sourceTree =
group; };
+ BE55B07C18D96FB000950228 /* viewcontactofgraphic.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
[Libreoffice-commits] core.git: 3 commits - basic/source compilerplugins/clang editeng/source extensions/source filter/source include/rtl oox/source sc/source svtools/source
basic/source/classes/sbunoobj.cxx |2 +-
compilerplugins/clang/passstringbyref.cxx |4 ++--
editeng/source/misc/svxacorr.cxx |3 +--
extensions/source/propctrlr/genericpropertyhandler.cxx |2 +-
filter/source/msfilter/msvbahelper.cxx |4 +---
include/rtl/ustring.hxx|2 +-
oox/source/vml/vmlinputstream.cxx |2 +-
sc/source/filter/excel/xltools.cxx |4 ++--
svtools/source/config/colorcfg.cxx |4 ++--
9 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit be878d7cc54cbe3dc1de410e9ff760fe353ce56a
Author: Noel Grandin n...@peralex.com
Date: Wed Mar 19 08:57:07 2014 +0200
improve warning message in passstringbyref compiler plugin
Change-Id: Ia8470bbd04c841e6c44c182493fede3dc312f635
diff --git a/compilerplugins/clang/passstringbyref.cxx
b/compilerplugins/clang/passstringbyref.cxx
index 6107969..50e1a85 100644
--- a/compilerplugins/clang/passstringbyref.cxx
+++ b/compilerplugins/clang/passstringbyref.cxx
@@ -49,14 +49,14 @@ bool PassStringByRef::VisitFunctionDecl(const FunctionDecl
* functionDecl) {
if (typeName == class rtl::OUString) {
report(
DiagnosticsEngine::Warning,
-passing OUString by value, rather pass by reference,
+passing OUString by value, rather pass by reference .e.g.
'const OUString',
pvDecl-getSourceRange().getBegin())
pvDecl-getSourceRange();
}
else if (typeName == class rtl::OString) {
report(
DiagnosticsEngine::Warning,
-passing OString by value, rather pass by reference,
+passing OString by value, rather pass by reference .e.g.
'const OString',
pvDecl-getSourceRange().getBegin())
pvDecl-getSourceRange();
}
commit 96710f8e466d44047ea4ac9cb8c70dc7664f5c73
Author: Noel Grandin n...@peralex.com
Date: Tue Mar 18 16:12:40 2014 +0200
convert OUString::match to OUString::endsWith
Convert code like:
rTxt.match( ---, rTxt.getLength()-3 )
to:
rTxt.endsWith( --- )
Change-Id: Iada74c5e714f7234f25b326526843a36255d5599
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 34a9c9b..1602fb0 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1767,7 +1767,7 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const
OUString rClass )
// match interface name with passed class name
OSL_TRACE(Checking if object implements %s, OUStringToOString(
aClassName, RTL_TEXTENCODING_UTF8 ).getStr() );
if ( (aClassName.getLength() = aInterfaceName.getLength())
-aInterfaceName.matchIgnoreAsciiCase( aClassName,
aInterfaceName.getLength() - aClassName.getLength() ) )
+aInterfaceName.endsWithIgnoreAsciiCase( aClassName ) )
{
result = true;
break;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 320a999..f6c935e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1322,8 +1322,7 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc rDoc,
const OUString rTxt,
// since LibO 4.1, '-' is a word separator
// fdo#67742 avoid -- to be replaced by â if next is -
-if( rTxt.getLength() = 3
-rTxt.match( OUString(---), rTxt.getLength()-3 ) )
+if( rTxt.endsWith( --- ) )
break;
bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
*this, pPara );
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx
b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 66d20ce..c519440 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -598,7 +598,7 @@ namespace pcr
case TypeClass_STRING:
{
// some special handling for URL properties
-bool bIsURLProperty = ( _rPropertyName.getLength() = 3 )
_rPropertyName.matchAsciiL( URL, 3, _rPropertyName.getLength() - 3 );
+bool bIsURLProperty = _rPropertyName.endsWithAsciiL( URL, 3 );
if ( bIsURLProperty )
{
aDescriptor.Control = _rxControlFactory-createPropertyControl(
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index 6c48eed..fbde4d6 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -54,9 +54,7 @@ OUString makeMacroURL( const OUString sMacroName )
OUString extractMacroName( const OUString
[Libreoffice-commits] core.git: 4 commits - connectivity/source extensions/source framework/inc framework/source sw/source
connectivity/source/drivers/evoab2/NConnection.hxx |2
extensions/source/update/check/updateinfo.hxx |4
framework/inc/tabwin/tabwindow.hxx |4
framework/source/tabwin/tabwindow.cxx | 87 +
sw/source/core/table/swnewtable.cxx|2
5 files changed, 45 insertions(+), 54 deletions(-)
New commits:
commit 75122338eba5515786198b734d43577d727e3c67
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 09:21:58 2014 +0100
libstdc++ abs vs std::abs confusion (-Werror,-Wabsolute-value)
Change-Id: I55fdcdfb25a2d6456eff044eb4af8fa00905d6e8
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index 0186a22..b74132f 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -205,7 +205,7 @@ static SwTableBox* lcl_LeftBorder2Box( long nLeft, const
SwTableLine* pLine )
// HACK: It appears that rounding errors may result in positions
not matching
// exactly, so allow a little tolerance. This happens at least
with merged cells
// in the doc from fdo#38414 .
-if( abs( nCurrLeft - nLeft ) = ( nLeft / 1000 ))
+if( std::abs( nCurrLeft - nLeft ) = ( nLeft / 1000 ))
return pBox;
if( nCurrLeft = nLeft )
{
commit d3bc04b780829902d2f68c743410ae599d144e8b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 08:58:57 2014 +0100
loplugin:passstringbyref
Change-Id: I0cbb49b29f0b1ee69f342d14d4560924e7bc5d11
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx
b/connectivity/source/drivers/evoab2/NConnection.hxx
index 7c529ab..206e5df 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -68,7 +68,7 @@ namespace connectivity
virtual void construct(const OUString _rUrl,const
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
_rInfo ) throw( ::com::sun::star::sdbc::SQLException);
inline OString getPassword() { return m_aPassword; }
-inline void setPassword( OString aStr ) { m_aPassword =
aStr; }
+inline void setPassword( OString const aStr ) {
m_aPassword = aStr; }
// own methods
inline const OEvoabDriver getDriver() const { return m_rDriver; }
commit 42bfcce1231f8f91056ddbc3ad8771e57b540b52
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 08:40:48 2014 +0100
loplugin:passstringbyref
Change-Id: If08dab3956da5c0ee90d6a788f6f34a936e792d7
diff --git a/extensions/source/update/check/updateinfo.hxx
b/extensions/source/update/check/updateinfo.hxx
index 67acd55..9896270 100644
--- a/extensions/source/update/check/updateinfo.hxx
+++ b/extensions/source/update/check/updateinfo.hxx
@@ -41,8 +41,8 @@ struct ReleaseNote
sal_uInt8 Pos2;
OUString URL2;
-ReleaseNote(sal_uInt8 pos, const OUString aURL) : Pos(pos), URL(aURL),
Pos2(0), URL2() {};
-ReleaseNote(sal_uInt8 pos, const OUString aURL, sal_uInt8 pos2, const
OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {};
+ReleaseNote(sal_uInt8 pos, const OUString aURL) : Pos(pos), URL(aURL),
Pos2(0), URL2() {};
+ReleaseNote(sal_uInt8 pos, const OUString aURL, sal_uInt8 pos2, const
OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {};
ReleaseNote(const ReleaseNote rn) :Pos(rn.Pos), URL(rn.URL),
Pos2(rn.Pos2), URL2(rn.URL2) {};
ReleaseNote operator=( const ReleaseNote rn) { Pos=rn.Pos; URL=rn.URL;
Pos2=rn.Pos2; URL2=rn.URL2; return *this; };
commit 4da1eb8404c726a22c2b43aff544d26ad5d42af6
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 18 17:45:07 2014 +0100
Use SolarMutexGuard directly
Change-Id: Ica2736fd9e249bfa88cfd8fd094af83deadf7737
diff --git a/framework/inc/tabwin/tabwindow.hxx
b/framework/inc/tabwin/tabwindow.hxx
index f0dbce0..aa9c1c7 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX
#include stdtypes.h
-#include threadhelp/threadhelpbase.hxx
#include macros/generic.hxx
#include macros/xinterface.hxx
#include macros/xtypeprovider.hxx
@@ -39,6 +38,7 @@
#include com/sun/star/awt/XSimpleTabController.hpp
#include com/sun/star/awt/XTabListener.hpp
+#include cppuhelper/basemutex.hxx
#include cppuhelper/propshlp.hxx
#include cppuhelper/interfacecontainer.hxx
#include cppuhelper/weak.hxx
@@ -55,7 +55,7 @@ class TabWindow : public
::com::sun::star::lang::XTypeProvider ,
public ::com::sun::star::awt::XWindowListener,
public ::com::sun::star::awt::XTopWindowListener ,
public ::com::sun::star::awt::XSimpleTabController ,
-
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/vml/vmlshapecontext.cxx |3 ++-
sw/qa/extras/ooxmlimport/data/fdo74401.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|9 +
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 81f9fe3a14f0fc99afbfa7ce3a26a9c7855d0919
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 19 09:59:32 2014 +0100
fdo#74401 VML groupshape import: only handle v:rect as TextShape
Regression from commit 75934fc178ed90b56d77eb1efebed5bdac8427b6 (VML
import: handle shape with text inside groupshape as TextShape,
2014-01-17), the problem was that TextShape is also a kind of rectangle,
so that shouldn't be used for all shape with text in groupshapes, just
for v:rect elements.
This fix gives the required text wrapping for the referenced bugdoc
without turning the rest of the shapes into rectangles.
Change-Id: I6e343c65a869e335b641728adbc7984ee85377b5
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index d213815..fe7e8ec 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -459,7 +459,8 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
nElement, const Attri
dynamic_castSimpleShape( mrShape ).setService(
com.sun.star.text.TextFrame);
}
-else
+else if (getCurrentElement() == VML_TOKEN(rect))
+// Transform only rectangles into a TextShape inside a
groupshape.
dynamic_castSimpleShape(mrShape).setService(com.sun.star.drawing.TextShape);
return new TextBoxContext( *this,
mrShapeModel.createTextBox(mrShape.getTypeModel()), rAttribs,
mrShape.getDrawing().getFilter().getGraphicHelper());
diff --git a/sw/qa/extras/ooxmlimport/data/fdo74401.docx
b/sw/qa/extras/ooxmlimport/data/fdo74401.docx
new file mode 100644
index 000..fd3cbab
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo74401.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 87571c8..6943c4b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2004,6 +2004,15 @@ DECLARE_OOXMLIMPORT_TEST(testFdo38414, fdo38414.docx )
OUString height4 =
parseDump(/root/page/body/tab/row[1]/cell[4]/infos/bounds, height );
CPPUNIT_ASSERT_EQUAL( height3, height4 );
}
+
+DECLARE_OOXMLIMPORT_TEST(testFdo74401, fdo74401.docx)
+{
+uno::Referencedrawing::XShapes xGroupShape(getShape(1), uno::UNO_QUERY);
+uno::Referencedrawing::XShapeDescriptor
xShape(xGroupShape-getByIndex(1), uno::UNO_QUERY);
+// The triangle (second child) was a TextShape before, so it was shown as
a rectangle.
+CPPUNIT_ASSERT_EQUAL(OUString(com.sun.star.drawing.CustomShape),
xShape-getShapeType());
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 74401, which changed state. Bug 74401 Summary: FILEOPEN: DOCX: Figures with text which are on canvas become rectangles https://bugs.freedesktop.org/show_bug.cgi?id=74401 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to put Basic IDE code completion to work
Hi Fernand, On Tue, Mar 18, 2014 at 10:26:08PM +0100, Fernand Vanrie s...@pmgroup.be wrote: Found new Basic IDE options in 4.2 , but where to find some documentation how this new stuff works ? In worst case, https://speakerdeck.com/vmiklos/gsoc-students-panel starting from slide 53 talks about this topic. Gergo, did you have some wiki page or so describing the new features? Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 58d80a6f439f2834470659397ccd1913c6955d29 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 19 10:39:40 2014 +0100 gbuild: More crude hacking to fix over-evaluation of gb_ICU_PRECOMMAND ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 gbuild: fix over- evaluation in gb_ExternalExecutable__set_internal Change-Id: I43ff930267cfd3cc537e79c41a8b4167fd5c77d3 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e9b0261..a1fbcda 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3518,7 +3518,7 @@ else # ! SYSTEM_GENBRK define gb_ExternalExecutable__register_genbrk $(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build)) -$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND)) +$(call gb_ExternalExecutable_set_precommand,genbrk,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3538,7 +3538,7 @@ else # ! SYSTEM_GENCCODE define gb_ExternalExecutable__register_genccode $(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build)) -$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND)) +$(call gb_ExternalExecutable_set_precommand,genccode,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3558,7 +3558,7 @@ else # ! SYSTEM_GENCMN define gb_ExternalExecutable__register_gencmn $(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build)) -$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND)) +$(call gb_ExternalExecutable_set_precommand,gencmn,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_Package_get_target_for_build,icu) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: GSOC 2014 - Haskell UNO Language Binding
Hi, I'm Lakmal From University of Moratuwa, Sri Lanka. I like to contribute for the topic Haskell UNO Language Binding. I'm looking for a mentor for the project. I read about your description about the project and browsed through many details around the topic. I had written a libreoffice plugin a few months ago using pyuno. It made me easier to find the details about UNO bindings. I like to get some advice from you about 1 st and third options. As I got to know, FFI doesn't provide direct support for C++, but there exist many code generators and methods to do that. The following links added me another option to call pyuno library through Haskell. Better if I can get an opinion on that http://www.haskell.org/haskellwiki/Cxx_foreign_function_interface https://john-millikin.com/articles/ride-the-snake/ By the way I would like to get some opinion about pros and cons of option 1(FFI) and 3(Remote Protocol). I'll prepare the proposal asap and get your feedback also. Thanks Regards -- *Lakmal Muthugama,* *Undergraduate,* *Department of Computer Science and Engineering,* *University of Moratuwa,* *Sri Lanka.* -- *Lakmal Muthugama,* *Undergraduate,* *Department of Computer Science and Engineering,* *University of Moratuwa,* *Sri Lanka.* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 --- Comment #5 from Michal Strnad high...@gmail.com --- Hello, I am starting work on this bug. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 45789] automatic row height in reports
https://bugs.freedesktop.org/show_bug.cgi?id=45789 --- Comment #14 from Michal Strnad high...@gmail.com --- Hello, I am starting work on this bug. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sw/source
sw/source/ui/uiview/viewport.cxx | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
New commits:
commit a0e94c5ce7dc2ad00d48cd9c0681c044bd0f96d1
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 14 23:08:11 2014 +0100
fdo#75460: sw: fix AutoScroll
This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which
fixed a crash but unfortunately also prevents the
m_pEditWin-HandleScrollCommand from being called, thus disabling
AutoScroll. Fix the crash in the ugly way by another pWData check.
(regression from 8880c773e779710dc0a08760e92afd709a73ca31)
Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d
(cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30)
Reviewed-on: https://gerrit.libreoffice.org/8596
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 6857a266c5e8037f097ed7e727671f7da543f178)
Reviewed-on: https://gerrit.libreoffice.org/8622
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 1d4acb3..ac0b21a 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1242,14 +1242,9 @@ void SwView::Move()
sal_Bool SwView::HandleWheelCommands( const CommandEvent rCEvt )
{
-const CommandWheelData* pWData = rCEvt.GetWheelData();
-if (!pWData)
-{
-return sal_False;
-}
-
sal_Bool bOk = sal_False;
-if( COMMAND_WHEEL_ZOOM == pWData-GetMode() )
+const CommandWheelData* pWData = rCEvt.GetWheelData();
+if (pWData COMMAND_WHEEL_ZOOM == pWData-GetMode())
{
long nFact = m_pWrtShell-GetViewOptions()-GetZoom();
if( 0L pWData-GetDelta() )
@@ -1260,7 +1255,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent
rCEvt )
SetZoom( SVX_ZOOM_PERCENT, nFact );
bOk = sal_True;
}
-else if( COMMAND_WHEEL_ZOOM_SCALE == pWData-GetMode() )
+else if (pWData COMMAND_WHEEL_ZOOM_SCALE == pWData-GetMode())
{
// mobile touch zoom (pinch) section
// remember the center location to reach in logic
@@ -1304,13 +1299,13 @@ sal_Bool SwView::HandleWheelCommands( const
CommandEvent rCEvt )
}
else
{
-if( pWData-GetMode()==COMMAND_WHEEL_SCROLL )
+if (pWData pWData-GetMode()==COMMAND_WHEEL_SCROLL)
{
// This influences whether quick help is shown
m_bWheelScrollInProgress=true;
}
-if( (COMMAND_WHEEL_SCROLL==pWData-GetMode())
(((sal_uLong)0x) == pWData-GetScrollLines()) )
+if (pWData (COMMAND_WHEEL_SCROLL==pWData-GetMode())
(((sal_uLong)0x) == pWData-GetScrollLines()))
{
if (pWData-GetDelta()0)
PhyPageDown();
___
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' - sw/source
sw/source/core/table/swnewtable.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit e8b686149f2a9f21a7a52bb5710a8a6362cd7a35
Author: LuboÅ¡ LuÅák l.lu...@centrum.cz
Date: Tue Mar 18 18:57:05 2014 +0100
workaround for rounding errors when handling merged cells (fdo#38414)
Change-Id: I4d36e4b86c77a7356a8c221cbfc5735e925392ba
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index 23edc85..fef95fc 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -200,10 +200,20 @@ static SwTableBox* lcl_LeftBorder2Box( long nLeft, const
SwTableLine* pLine )
{
SwTableBox* pBox = pLine-GetTabBoxes()[nCurrBox];
OSL_ENSURE( pBox, Missing table box );
-if( nCurrLeft = nLeft pBox-GetFrmFmt()-GetFrmSize().GetWidth() )
+if( pBox-GetFrmFmt()-GetFrmSize().GetWidth() )
{
-OSL_ENSURE( nCurrLeft == nLeft, Wrong box found );
-return pBox;
+if( nCurrLeft == nLeft )
+return pBox;
+// HACK: It appears that rounding errors may result in positions
not matching
+// exactly, so allow a little tolerance. This happens at least
with merged cells
+// in the doc from fdo#38414 .
+if( abs( nCurrLeft - nLeft ) = ( nLeft / 1000 ))
+return pBox;
+if( nCurrLeft = nLeft )
+{
+SAL_WARN( sw.core, Possibly wrong box found );
+return pBox;
+}
}
nCurrLeft += pBox-GetFrmFmt()-GetFrmSize().GetWidth();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/cppuhelper
include/cppuhelper/weak.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 38cf887abd4b8a0280917e31aa27632f4f341b9a
Author: Isamu Mogi saturda...@gmail.com
Date: Mon Mar 17 23:20:01 2014 +0900
Replace UTF-8 no-break space to ASCII space
UTF-8 no-break space causes C4819 warning in MSVC with CP932.
Change-Id: I83a6ea6d060d132d21d8ea3141051f850d0e6bd2
Reviewed-on: https://gerrit.libreoffice.org/8628
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 47f3d8d..67bc0b7 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -163,8 +163,8 @@ public:
To be used like:
css::uno::XInterface * FOO_constructor_function(...) {
-Â Â Â Â return cppu::acquire(new FOO(...));
-Â Â }
+return cppu::acquire(new FOO(...));
+}
@param instance
Newly created instance that should be acquired.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source
chart2/source/tools/NumberFormatterWrapper.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d5580b252ad4cfea10422c044366c3c6c1ebed83
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Mar 19 04:50:20 2014 +0100
the type in the Any is a util::Date and not a DateTime, fdo#74549
Either that was always broken or it is a recent regression that
operator= does not convert from Date to DateTime.
Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1
(cherry picked from commit 22c7da0ca5438b69165609db2a1ef219aa167dc2)
Reviewed-on: https://gerrit.libreoffice.org/8652
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx
b/chart2/source/tools/NumberFormatterWrapper.cxx
index 1501532..4994215 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -26,7 +26,7 @@
#include svl/zformat.hxx
#include tools/color.hxx
#include i18nlangtag/mslangid.hxx
-#include com/sun/star/util/DateTime.hpp
+#include com/sun/star/util/Date.hpp
namespace chart
{
@@ -79,7 +79,7 @@ Date NumberFormatterWrapper::getNullDate() const
sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
Date aRet(nDay,nMonth,nYear);
-util::DateTime aUtilDate;
+util::Date aUtilDate;
if( m_aNullDate.hasValue() (m_aNullDate = aUtilDate) )
{
aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year);
@@ -114,7 +114,7 @@ OUString NumberFormatterWrapper::getFormattedString(
sal_Int32 nNumberFormatKey,
nMonth = pDate-GetMonth();
nDay = pDate-GetDay();
} // if ( pDate )
-util::DateTime aNewNullDate;
+util::Date aNewNullDate;
m_aNullDate = aNewNullDate;
m_pNumberFormatter-ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac RepositoryExternal.mk
RepositoryExternal.mk |2 +- configure.ac | 15 ++- 2 files changed, 11 insertions(+), 6 deletions(-) New commits: commit 4999a73991e6995e8d307c7653bfbf29a15573ec Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 19 11:24:57 2014 +0100 --enable-python=fully-internal to force PYTHON_FOR_BUILD= (for testing purposes, mainly) Change-Id: I50d3c92b9ac0cc9dda55b7340f657acb74f675f6 diff --git a/configure.ac b/configure.ac index f372fe03..89a8166 100644 --- a/configure.ac +++ b/configure.ac @@ -950,10 +950,11 @@ AC_ARG_ENABLE(crashdump, [Enable the crashdump feature.])) AC_ARG_ENABLE(python, -AS_HELP_STRING([--enable-python=no/auto/system/internal], +AS_HELP_STRING([--enable-python=no/auto/system/internal/fully-internal], [Enables or disables Python support at run-time and build-time. - Also specifies what Python to use. 'auto' is the - default.])) + Also specifies what Python to use. 'auto' is the default. + 'fully-internal' even forces the internal version for uses of Python + during the build (for testing purposes, mainly).])) AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], @@ -7819,7 +7820,7 @@ AC_SUBST(XMLLINT) # Optionally user can pass an option to configure, i. e. # ./configure PYTHON=/usr/bin/python # = -if test $build_os != cygwin; then +if test $build_os != cygwin -a $enable_python != fully-internal; then # This allows a lack of system python with no error, we use internal one in that case. AM_PATH_PYTHON([2.5],, [:]) # Clean PYTHON_VERSION checked below if cross-compiling @@ -7854,7 +7855,7 @@ no|disable) dnl (When cross-compiling to Windows from Linux using the mingw32-cross dnl compiler from OBS, use mingw32-python from OBS, and ditto for other dnl MinGW cross-compilation setups.) -AC_MSG_RESULT([internal]) +AC_MSG_RESULT([fully internal]) enable_python=internal elif test $cross_compiling = yes; then AC_MSG_RESULT([system]) @@ -7876,6 +7877,10 @@ no|disable) internal) AC_MSG_RESULT([internal]) ;; +fully-internal) +AC_MSG_RESULT([fully internal]) +enable_python=internal +;; system) AC_MSG_RESULT([system]) ;; commit 233610f1245685a3f27cf9633c93568bd1d300da Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 19 11:24:13 2014 +0100 gbuild: More crude hacking to fix over-evaluation of gb_Python_PRECOMMAND ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 gbuild: fix over- evaluation in gb_ExternalExecutable__set_internal Change-Id: I3d5859bd3437cc050250e66d723d3dee3056ef46 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a1fbcda..809a110 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3491,7 +3491,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_ else $(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) -$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND)) +$(call gb_ExternalExecutable_set_precommand,python,$(subst $$,,$(gb_Python_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) endif ___ 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' - sw/source
sw/source/ui/uiview/viewport.cxx | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 715cb73a20bbe9db6406a863201370996c04c1b7
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 14 23:08:11 2014 +0100
fdo#75460: sw: fix AutoScroll
This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which
fixed a crash but unfortunately also prevents the
m_pEditWin-HandleScrollCommand from being called, thus disabling
AutoScroll. Fix the crash in the ugly way by another pWData check.
(regression from 8880c773e779710dc0a08760e92afd709a73ca31)
(cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30)
Conflicts:
sw/source/ui/uiview/viewport.cxx
Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d
Reviewed-on: https://gerrit.libreoffice.org/8597
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index e9f5d1a..aabbda9 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1253,14 +1253,9 @@ void SwView::Move()
sal_Bool SwView::HandleWheelCommands( const CommandEvent rCEvt )
{
-const CommandWheelData* pWData = rCEvt.GetWheelData();
-if (!pWData)
-{
-return sal_False;
-}
-
sal_Bool bOk = sal_False;
-if( COMMAND_WHEEL_ZOOM == pWData-GetMode() )
+const CommandWheelData* pWData = rCEvt.GetWheelData();
+if (pWData COMMAND_WHEEL_ZOOM == pWData-GetMode())
{
long nFact = m_pWrtShell-GetViewOptions()-GetZoom();
if( 0L pWData-GetDelta() )
@@ -1271,7 +1266,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent
rCEvt )
SetZoom( SVX_ZOOM_PERCENT, nFact );
bOk = sal_True;
}
-else if( COMMAND_WHEEL_ZOOM_SCALE == pWData-GetMode() )
+else if (pWData COMMAND_WHEEL_ZOOM_SCALE == pWData-GetMode())
{
int newZoom = 100 * (m_pWrtShell-GetViewOptions()-GetZoom() / 100.0)
* (pWData-GetDelta() / 100.0);
SetZoom( SVX_ZOOM_PERCENT, std::max( 20, std::min( 600, newZoom ) ) );
@@ -1279,13 +1274,13 @@ sal_Bool SwView::HandleWheelCommands( const
CommandEvent rCEvt )
}
else
{
-if(pWData-GetMode()==COMMAND_WHEEL_SCROLL)
+if (pWData pWData-GetMode()==COMMAND_WHEEL_SCROLL)
{
// This influences whether quick help is shown
m_bWheelScrollInProgress=true;
}
-if ((COMMAND_WHEEL_SCROLL==pWData-GetMode())
(((sal_uLong)0x) == pWData-GetScrollLines()))
+if (pWData (COMMAND_WHEEL_SCROLL==pWData-GetMode())
(((sal_uLong)0x) == pWData-GetScrollLines()))
{
if (pWData-GetDelta()0)
PhyPageDown();
___
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/access/accpara.cxx | 59 --
1 file changed, 59 deletions(-)
New commits:
commit 3fa4b0a00f78e940b32d546bac410890719502fd
Author: Niklas Johansson sleeping.pil...@gmail.com
Date: Fri Mar 14 15:39:30 2014 +0100
fdo#74983: Instability in A11y after integration of IA2-branch
The IA2-integration added some special cases for calculating textbounds for
attributeruns when automatic spellchecking is active. This does not seem to
effect linux but messes up accessibility on mac. This patch removes the
special
cases avoids the problem on Mac. When daily builds gets available for
Windows
I will do some testing there to see if I can find any problems.
Change-Id: I203da4fe1c6e5d4915d19e1704073e58f8aa88c9
Reviewed-on: https://gerrit.libreoffice.org/8591
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index 8ff2410..77817ec 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -916,65 +916,6 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
case AccessibleTextType::ATTRIBUTE_RUN:
bRet = GetAttributeBoundary( rBound, rText, nPos );
-if(bRet)
-{
-SwCrsrShell* pCrsrShell = GetCrsrShell();
-if( pCrsrShell != NULL pCrsrShell-GetViewOptions()
pCrsrShell-GetViewOptions()-IsOnlineSpell())
-{
-SwTxtNode* pTxtNode = const_castSwTxtNode*( GetTxtNode()
);
-if(pTxtNode)
-{
-const SwWrongList* pWrongList = pTxtNode-GetWrong();
-if( NULL != pWrongList )
-{
-sal_Int32 nBegin = nPos;
-sal_Int32 nLen = 1;
-const sal_Int32 nNext =
pWrongList-NextWrong(nBegin);
-sal_Int32 nLast = 0;
-sal_uInt16 nWrongPos = pWrongList-GetWrongPos(
nBegin );
-if ( nWrongPos = pWrongList-Count() ||
- ( nLast = pWrongList-Pos( nWrongPos ) ) =
nBegin )
-{
-nLast = nWrongPos
-? pWrongList-Pos( --nWrongPos )
-: COMPLETE_STRING;
-}
-if ( nBegin pWrongList-GetBeginInv()
- ( nLast == COMPLETE_STRING || nLast
pWrongList-GetEndInv() ) )
-{
-nLast = min(nBegin, pWrongList-GetEndInv());
-}
-else if ( nLast COMPLETE_STRING )
-{
-nLast += pWrongList-Len( nWrongPos );
-}
-
-const bool bIn = pWrongList-InWrongWord(nBegin,
nLen); // !pTxtNode-IsSymbol(nBegin) )
-if(bIn)
-{
-rBound.startPos = max(nNext, rBound.startPos);
-rBound.endPos = min(nNext+nLen, rBound.endPos);
-}
-else
-{
-if (COMPLETE_STRING == nLast)//first
-{
-rBound.endPos = min(nNext, rBound.endPos);
-}
-else if(COMPLETE_STRING == nNext)
-{
-rBound.startPos = max(nLast,
rBound.startPos);
-}
-else
-{
-rBound.startPos = max(nLast,
rBound.startPos);
-rBound.endPos = min(nNext, rBound.endPos);
-}
-}
-}
-}
-}
-}
break;
case AccessibleTextType::GLYPH:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |3 ++
include/vcl/print.hxx | 23 +-
vcl/source/gdi/outdev4.cxx | 46 -
vcl/source/gdi/print.cxx |7 ++
4 files changed, 53 insertions(+), 26 deletions(-)
New commits:
commit c16186f1b96ecf0933a16f4c9fb196c5be18d7d9
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Fri Mar 14 21:31:59 2014 +1100
fdo#74702 Move gradient steps logic into OutputDevice or Printer classes
Currently we work out the number of gradient steps based on the type of
class that is being used. We calculate the number differntly for
printers. However, we should let the Printers class work this out.
Also, the function is very long - I have moved most of the calculation
logic to it's own function.
Made some very small formatting changes to outdev.hxx.
Change-Id: I91b8787d885c1c8d2aa2205f25e5c7f82607c0ea
Reviewed-on: https://gerrit.libreoffice.org/8586
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index da696af..e3986ac 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -798,6 +798,8 @@ public:
protected:
OutputDevice();
+virtual longImplGetGradientStepCount( long nMinRect );
+
private:
typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
@@ -807,6 +809,7 @@ private:
SAL_DLLPRIVATE void ImplClearFontData( bool bNewFontLists );
SAL_DLLPRIVATE void ImplRefreshFontData( bool bNewFontLists );
SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames(
FontUpdateHandler_t pHdl, bool bNewFontLists );
+SAL_DLLPRIVATE long ImplGetGradientSteps( const Gradient
rGradient, const Rectangle rRect, bool bMtf );
public:
virtual ~OutputDevice();
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index bc53bd6..f72781c 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -223,18 +223,18 @@ private:
Printer*mpNext;
VirtualDevice* mpDisplayDev;
PrinterOptions* mpPrinterOptions;
-OUString maPrinterName;
-OUString maDriver;
-OUString maPrintFile;
-OUString maJobName;
+OUStringmaPrinterName;
+OUStringmaDriver;
+OUStringmaPrintFile;
+OUStringmaJobName;
JobSetupmaJobSetup;
Point maPageOffset;
SizemaPaperSize;
-sal_uLong mnError;
-sal_uInt16 mnCurPage;
-sal_uInt16 mnCurPrintPage;
-sal_uInt16 mnPageQueueSize;
-sal_uInt16 mnCopyCount;
+sal_uLong mnError;
+sal_uInt16 mnCurPage;
+sal_uInt16 mnCurPrintPage;
+sal_uInt16 mnPageQueueSize;
+sal_uInt16 mnCopyCount;
boolmbDefPrinter;
boolmbPrinting;
boolmbJobActive;
@@ -265,9 +265,14 @@ private:
SAL_DLLPRIVATE bool EndJob();
SAL_DLLPRIVATE Printer( const Printer rPrinter );
SAL_DLLPRIVATE Printer operator =( const Printer rPrinter );
+
public:
SAL_DLLPRIVATE void ImplStartPage();
SAL_DLLPRIVATE void ImplEndPage();
+
+protected:
+longImplGetGradientStepCount( long nMinRect );
+
public:
voidDrawGradientEx( OutputDevice* pOut, const
Rectangle rRect, const Gradient rGradient );
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 8df71b8..c3873b6 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -140,6 +140,34 @@ inline sal_uInt8 ImplGetGradientColorValue( long nValue )
return (sal_uInt8)nValue;
}
+long OutputDevice::ImplGetGradientStepCount( long nMinRect )
+{
+long nInc = (nMinRect 50) ? 2 : 4;
+
+return nInc;
+}
+
+long OutputDevice::ImplGetGradientSteps( const Gradient rGradient, const
Rectangle rRect, bool bMtf )
+{
+// calculate step count
+longnStepCount = rGradient.GetSteps();
+
+// generate nStepCount, if not passed
+long nMinRect = rRect.GetHeight();
+
+if ( !nStepCount )
+{
+long nInc;
+
+nInc = ImplGetGradientStepCount (nMinRect);
+if ( !nInc || bMtf )
+nInc = 1;
+nStepCount = nMinRect / nInc;
+}
+
+return nStepCount;
+}
+
void OutputDevice::ImplDrawLinearGradient( const Rectangle rRect,
Re: Fwd: GSOC 2014 - Haskell UNO Language Binding
On 03/19/2014 10:44 AM, Tharindu Lakmal wrote: I'm Lakmal From University of Moratuwa, Sri Lanka. I like to contribute for the topic Haskell UNO Language Binding. I'm looking for a mentor for the project. I read about your description about the project and browsed through many details around the topic. I had written a libreoffice plugin a few months ago using pyuno. It made me easier to find the details about UNO bindings. I like to get some advice from you about 1 st and third options. As I got to know, FFI doesn't provide direct support for C++, but there exist many code generators and methods to do that. The following links added me another option to call pyuno library through Haskell. Better if I can get an opinion on that http://www.haskell.org/haskellwiki/Cxx_foreign_function_interface https://john-millikin.com/articles/ride-the-snake/ By the way I would like to get some opinion about pros and cons of option 1(FFI) and 3(Remote Protocol). I'll prepare the proposal asap and get your feedback also. Hi Lakmal, Great to see you interested in this topic. A few notes: * Doing a UNO Remote Protocol (URP) bridge might be easier than an FFI bridge in that you do that in an external, purely Haskell process (and the documentation of URP might be somewhat better than the documentation of Binary UNO, which you need to interface with in the FFI case). In the end, a real UNO binding would support both, but it would of course be fine to concentrate on one of them, at least initially. * FFI being C rather than C++ should not be a problem, as the Binary UNO code that it needs to interact with is just C (although partially implemented in C++). (One UNO concept is the Binary UNO hub that bridges between different language bindings, which each provide a bridge between that language binding and Binary UNO, so if e.g., some C++ code calls a UNO method implemented in Java, that call goes via the C++-to-Binary-UNO and then via the Binary-UNO-to-JNI bridge.) * You mention Python, but I wouldn't make a bridge between Haskell and PyUNO, but rather between Haskell and Binary UNO. I see no advantage in the former, just more layers of indirection that complicate matters. * Great to read you already did a LO plugin. Is the code available somewhere to have a look at it? * To be eligible for LO GSoC, you'd need to do some Easy Hacks first. * Do you also have experience with Haskell itself? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source include/drawinglayer include/svx starmath/inc svx/source
drawinglayer/source/primitive2d/openglprimitive2d.cxx | 32 ++--
include/drawinglayer/primitive2d/openglprimitive2d.hxx | 33
include/svx/sdr/contact/viewcontactofopengl.hxx| 28 +++---
starmath/inc/node.hxx |3 -
svx/source/sdr/contact/viewcontactofopengl.cxx | 34 +++--
5 files changed, 57 insertions(+), 73 deletions(-)
New commits:
commit 24da9e2538dc8f80fb6ac6d498992f9093495b22
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Mar 19 11:11:15 2014 +0100
Use sane indentation in new files.
Change-Id: Ida89284c00946d3972c4e45a5453ccfdff99713f
diff --git a/drawinglayer/source/primitive2d/openglprimitive2d.cxx
b/drawinglayer/source/primitive2d/openglprimitive2d.cxx
index 48724df..3ed333b 100644
--- a/drawinglayer/source/primitive2d/openglprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/openglprimitive2d.cxx
@@ -10,29 +10,23 @@
#include drawinglayer/primitive2d/openglprimitive2d.hxx
#include svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+using namespace drawinglayer::primitive2d;
-namespace drawinglayer
+OpenGLPrimitive2D::OpenGLPrimitive2D(const Point rPos)
+: m_aPos(rPos)
{
-namespace primitive2d
-{
-
-OpenGLPrimitive2D::OpenGLPrimitive2D(const Point rPos)
-: m_aPos(rPos)
-{
-}
-
-bool OpenGLPrimitive2D::operator==( const BasePrimitive2D rPrimitive
) const
-{
-if(BasePrimitive2D::operator==(rPrimitive))
-{
-const OpenGLPrimitive2D rCompare = static_cast const
OpenGLPrimitive2D (rPrimitive);
-return m_aPos == rCompare.getPos();
-}
-return false;
-}
+}
-ImplPrimitive2DIDBlock(OpenGLPrimitive2D,
PRIMITIVE2D_ID_OPENGLPRIMITIVE2D)
+bool OpenGLPrimitive2D::operator==( const BasePrimitive2D rPrimitive ) const
+{
+if(BasePrimitive2D::operator==(rPrimitive))
+{
+const OpenGLPrimitive2D rCompare = static_cast const
OpenGLPrimitive2D (rPrimitive);
+return m_aPos == rCompare.getPos();
}
+return false;
}
+ImplPrimitive2DIDBlock(OpenGLPrimitive2D, PRIMITIVE2D_ID_OPENGLPRIMITIVE2D)
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx
b/include/drawinglayer/primitive2d/openglprimitive2d.hxx
index c251dcb..832a657 100644
--- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/openglprimitive2d.hxx
@@ -13,29 +13,28 @@
#include tools/gen.hxx
#include drawinglayer/primitive2d/baseprimitive2d.hxx
-namespace drawinglayer
-{
-namespace primitive2d
-{
+namespace drawinglayer {
+namespace primitive2d {
-class DRAWINGLAYER_DLLPUBLIC OpenGLPrimitive2D : public BasePrimitive2D
-{
-public:
-explicit OpenGLPrimitive2D(const Point rPos);
+/// Primitive to hold data necessary for openGL objects
+class DRAWINGLAYER_DLLPUBLIC OpenGLPrimitive2D : public BasePrimitive2D
+{
+public:
+explicit OpenGLPrimitive2D(const Point rPos);
-const Point getPos() const { return m_aPos; }
+const Point getPos() const { return m_aPos; }
-virtual bool operator==( const BasePrimitive2D rPrimitive ) const;
+virtual bool operator==( const BasePrimitive2D rPrimitive ) const;
-/// provide unique ID
-DeclPrimitive2DIDBlock()
+/// provide unique ID
+DeclPrimitive2DIDBlock()
-private:
-Point m_aPos;
-};
+private:
+Point m_aPos;
+};
-}
-}
+} // namespace primitive2d
+} // namespace drawinglayer
#endif
diff --git a/include/svx/sdr/contact/viewcontactofopengl.hxx
b/include/svx/sdr/contact/viewcontactofopengl.hxx
index ad96b0c..e5fae8b 100644
--- a/include/svx/sdr/contact/viewcontactofopengl.hxx
+++ b/include/svx/sdr/contact/viewcontactofopengl.hxx
@@ -14,21 +14,21 @@
class SdrOpenGLObj;
-namespace sdr
+namespace sdr {
+namespace contact {
+
+class ViewContactOfOpenGL : public ViewContactOfSdrObj
{
-namespace contact
-{
-class ViewContactOfOpenGL : public ViewContactOfSdrObj
-{
-public:
-explicit ViewContactOfOpenGL(SdrOpenGLObj rOpenGLObj);
-virtual ~ViewContactOfOpenGL();
-
-protected:
-virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
-};
-}
-}
+public:
+explicit ViewContactOfOpenGL(SdrOpenGLObj rOpenGLObj);
+virtual ~ViewContactOfOpenGL();
+
+protected:
+virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
+};
+
+} // namespace contact
+} // namespace sdr
#endif
diff --git a/svx/source/sdr/contact/viewcontactofopengl.cxx
b/svx/source/sdr/contact/viewcontactofopengl.cxx
index 34630ec..054fb99 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/rtl
include/rtl/ustring.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 853660dbf4dc350e7a9096e2367c7f10cfcc3ac6
Author: Noel Grandin n...@peralex.com
Date: Tue Mar 18 13:42:37 2014 +0200
make rest param in endsWithIgnoreAsciiCase default to zero
so it matches all of the other endsWith* methods
Change-Id: If6a37056b1225675848434bfb3520e6c496f22e5
(cherry picked from commit e80b9f344aeb88bdbb42d846c0a094d86ee327dc)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 826727f..995ef17 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1095,7 +1095,7 @@ public:
@since LibreOffice 3.6
*/
-bool endsWithIgnoreAsciiCase(OUString const str, OUString * rest) const
+bool endsWithIgnoreAsciiCase(OUString const str, OUString * rest = 0)
const
{
bool b = str.getLength() = getLength()
matchIgnoreAsciiCase(str, getLength() - str.getLength());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - include/rtl
include/rtl/ustring.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4a1f7ca884f36703e202122122e0fc6cf921de2d
Author: Noel Grandin n...@peralex.com
Date: Tue Mar 18 13:42:37 2014 +0200
make rest param in endsWithIgnoreAsciiCase default to zero
so it matches all of the other endsWith* methods
Change-Id: If6a37056b1225675848434bfb3520e6c496f22e5
(cherry picked from commit e80b9f344aeb88bdbb42d846c0a094d86ee327dc)
Reviewed-on: https://gerrit.libreoffice.org/8655
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 826727f..995ef17 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1095,7 +1095,7 @@ public:
@since LibreOffice 3.6
*/
-bool endsWithIgnoreAsciiCase(OUString const str, OUString * rest) const
+bool endsWithIgnoreAsciiCase(OUString const str, OUString * rest = 0)
const
{
bool b = str.getLength() = getLength()
matchIgnoreAsciiCase(str, getLength() - str.getLength());
___
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/oox oox/source
include/oox/drawingml/shapepropertymap.hxx |3 +++
oox/source/drawingml/fillproperties.cxx|4 +++-
oox/source/drawingml/shapepropertymap.cxx | 16 +++-
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 012de8a0056bd75299ef97d03a95905c272cc26c
Author: Muthu Subramanian sumu...@collabora.com
Date: Wed Mar 12 16:44:10 2014 +0530
n#821567: Import PPTX background images with table-name.
Ported from 2ec4d410de5bd98527336a9dc49abb76656373df
Change-Id: I50693f7fea8de4f1d3668378aa2334539dd80c42
Reviewed-on: https://gerrit.libreoffice.org/8546
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/include/oox/drawingml/shapepropertymap.hxx
b/include/oox/drawingml/shapepropertymap.hxx
index 8018752..a18276d 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -63,6 +63,7 @@ enum ShapePropertyId
SHAPEPROP_FillBitmapRectanglePoint,
SHAPEPROP_FillHatch,
SHAPEPROP_ShadowXDistance,
+SHAPEPROP_FillBitmapNameFromUrl,
SHAPEPROP_END
};
@@ -128,6 +129,8 @@ private:
boolsetGradientTrans( sal_Int32 nPropId, const
::com::sun::star::uno::Any rValue );
/** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL.
*/
boolsetFillBitmapUrl( sal_Int32 nPropId, const
::com::sun::star::uno::Any rValue );
+/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName
*/
+boolsetFillBitmapNameFromUrl( sal_Int32 nPropId, const
::com::sun::star::uno::Any rValue );
// not implemented, to prevent implicit conversion from enum to int
::com::sun::star::uno::Any operator[]( ShapePropertyId ePropId );
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index d1d097f..389ef8a 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -376,7 +376,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap
rPropMap,
OUString aGraphicUrl = rGraphicHelper.createGraphicObject(
maBlipProps.mxGraphic );
// push bitmap or named bitmap to property map
-if( !aGraphicUrl.isEmpty() rPropMap.setProperty(
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
+if( !aGraphicUrl.isEmpty() rPropMap.supportsProperty(
SHAPEPROP_FillBitmapNameFromUrl ) rPropMap.setProperty(
SHAPEPROP_FillBitmapNameFromUrl, aGraphicUrl ) )
+eFillStyle = FillStyle_BITMAP;
+else if( !aGraphicUrl.isEmpty() rPropMap.setProperty(
SHAPEPROP_FillBitmapUrl, aGraphicUrl ) )
eFillStyle = FillStyle_BITMAP;
// set other bitmap properties, if bitmap has been
inserted into the map
diff --git a/oox/source/drawingml/shapepropertymap.cxx
b/oox/source/drawingml/shapepropertymap.cxx
index ff02dd5..fe985db 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -47,7 +47,8 @@ static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END ] =
PROP_FillBitmapURL, PROP_FillBitmapMode, PROP_FillBitmapSizeX,
PROP_FillBitmapSizeY,
PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY,
PROP_FillBitmapRectanglePoint,
PROP_FillHatch,
-PROP_ShadowXDistance
+PROP_ShadowXDistance,
+PROP_FillBitmapName
};
} // namespace
@@ -108,6 +109,9 @@ bool ShapePropertyMap::setAnyProperty( ShapePropertyId
ePropId, const Any rValu
case SHAPEPROP_FillBitmapUrl:
return setFillBitmapUrl( nPropId, rValue );
+case SHAPEPROP_FillBitmapNameFromUrl:
+return setFillBitmapNameFromUrl( nPropId, rValue );
+
default:; // suppress compiler warnings
}
@@ -195,6 +199,16 @@ bool ShapePropertyMap::setFillBitmapUrl( sal_Int32
nPropId, const Any rValue )
return false;
}
+bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const
Any rValue )
+{
+if( rValue.has OUString () )
+{
+OUString aBitmapUrlName = mrModelObjHelper.insertFillBitmapUrl(
rValue.get OUString () );
+return !aBitmapUrlName.isEmpty() setProperty( PROP_FillBitmapName,
aBitmapUrlName );
+}
+return false;
+}
+
//
} // namespace drawingml
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx | 70 +-
1 file changed, 43 insertions(+), 27 deletions(-)
New commits:
commit b6d9aa63ab63f3236712b2b68155e6b0d129a688
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 14 20:28:10 2014 +
Related: rhbz#1076264 intermittent a11y crash in calc
http://retrace.fedoraproject.org/faf/reports/338291/
this crash refuses to be captured alive. But seeing as
we sometimes check mpViewShell against NULL and sometimes check
GetViewData against NULL its worth making those checks everytime
for consistency
see also...
rhbz#923993 rhbz#896711 rhbz#602273 rhbz#577595 lp#811057 lp#760665
(cherry picked from commit fae1e19af05e664364c55d4f686aaab860fd538d)
Conflicts:
sc/source/ui/Accessibility/AccessibleDocument.cxx
Reviewed-on: https://gerrit.libreoffice.org/8604
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
(cherry picked from commit d01abcc7beb215c7e425248f690db8a642f00c73)
Conflicts:
sc/source/ui/Accessibility/AccessibleDocument.cxx
Change-Id: I5553848018f500b63ade60bcfc756a736b27c64f
Reviewed-on: https://gerrit.libreoffice.org/8639
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 6ce612b..d4d126d 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -337,13 +337,14 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument*
pAccessibleDocument, Sc
}
if (pViewShell)
{
-SfxBroadcaster* pDrawBC =
pViewShell-GetViewData()-GetDocument()-GetDrawBroadcaster();
+ScViewData *pViewData = pViewShell-GetViewData();
+SfxBroadcaster* pDrawBC = pViewData ?
pViewData-GetDocument()-GetDrawBroadcaster() : NULL;
if (pDrawBC)
{
StartListening(*pDrawBC);
-maShapeTreeInfo.SetModelBroadcaster( new
ScDrawModelBroadcaster(pViewShell-GetViewData()-GetDocument()-GetDrawLayer())
);
-
maShapeTreeInfo.SetSdrView(pViewShell-GetViewData()-GetScDrawView());
+maShapeTreeInfo.SetModelBroadcaster( new
ScDrawModelBroadcaster(pViewData-GetDocument()-GetDrawLayer()) );
+maShapeTreeInfo.SetSdrView(pViewData-GetScDrawView());
maShapeTreeInfo.SetController(NULL);
maShapeTreeInfo.SetWindow(pViewShell-GetWindowByPos(meSplitPos));
maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument);
@@ -356,7 +357,8 @@ ScChildrenShapes::~ScChildrenShapes()
std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), Destroy());
if (mpViewShell)
{
-SfxBroadcaster* pDrawBC =
mpViewShell-GetViewData()-GetDocument()-GetDrawBroadcaster();
+ScViewData *pViewData = mpViewShell-GetViewData();
+SfxBroadcaster* pDrawBC = pViewData ?
pViewData-GetDocument()-GetDrawBroadcaster() : NULL;
if (pDrawBC)
EndListening(*pDrawBC);
}
@@ -366,13 +368,14 @@ void ScChildrenShapes::SetDrawBroadcaster()
{
if (mpViewShell)
{
-SfxBroadcaster* pDrawBC =
mpViewShell-GetViewData()-GetDocument()-GetDrawBroadcaster();
+ScViewData *pViewData = mpViewShell-GetViewData();
+SfxBroadcaster* pDrawBC = pViewData ?
pViewData-GetDocument()-GetDrawBroadcaster() : NULL;
if (pDrawBC)
{
StartListening(*pDrawBC, sal_True);
-maShapeTreeInfo.SetModelBroadcaster( new
ScDrawModelBroadcaster(mpViewShell-GetViewData()-GetDocument()-GetDrawLayer())
);
-
maShapeTreeInfo.SetSdrView(mpViewShell-GetViewData()-GetScDrawView());
+maShapeTreeInfo.SetModelBroadcaster( new
ScDrawModelBroadcaster(pViewData-GetDocument()-GetDrawLayer()) );
+maShapeTreeInfo.SetSdrView(pViewData-GetScDrawView());
maShapeTreeInfo.SetController(NULL);
maShapeTreeInfo.SetWindow(mpViewShell-GetWindowByPos(meSplitPos));
maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument);
@@ -827,7 +830,8 @@ SdrPage* ScChildrenShapes::GetDrawPage() const
SdrPage* pDrawPage = NULL;
if (mpViewShell)
{
-ScDocument* pDoc = mpViewShell-GetViewData()-GetDocument();
+ScViewData *pViewData = mpViewShell-GetViewData();
+ScDocument* pDoc = pViewData ? pViewData-GetDocument() : NULL;
if (pDoc pDoc-GetDrawLayer())
{
ScDrawLayer* pDrawLayer = pDoc-GetDrawLayer();
@@ -1239,9 +1243,10 @@ ScAccessibleDocument::ScAccessibleDocument(
AddChild( pChildWin-GetAccessible(), false );
}
}
-if (pViewShell-GetViewData()-HasEditView( eSplitPos ))
+
[Libreoffice-commits] core.git: starmath/inc
starmath/inc/node.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 092be17c69b5789414da907197856c0d239da015 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Mar 19 13:26:28 2014 +0100 typo diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 1f2b2a9..cd3180f 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -621,7 +621,7 @@ public: /** Dynamic Integral symbol node * - * Node for drawing dynamicall sized integral symbols. + * Node for drawing dynamically sized integral symbols. * * TODO: It might be created a parent class SmDynamicSizedNode (for both dynamic integrals, roots and other dynamic symbols) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 69079] Creating a new themes in the gallery the files are always created as file new theme.* instead of sdxxx.* - existing files will be overwritten and leads to data loss.
https://bugs.freedesktop.org/show_bug.cgi?id=69079 --- Comment #15 from Chris Sherlock chris.sherloc...@gmail.com --- What do we want to call the themes? do we want them to be sdxxx.* If so, should be easy for me to fix this. Happy to do so if this is what is required. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/FDO76248.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8 +
sw/source/filter/ww8/docxsdrexport.cxx | 159 ++--
3 files changed, 89 insertions(+), 78 deletions(-)
New commits:
commit 3e92847d75e8703d0537d5411d1f98bd1cd0402a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 19 14:09:51 2014 +0100
fdo#76248 make the test fail without the fix
Change-Id: I26d27bfaafb83ee3ae74ce64bf72146b157ed7db
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6a50def..ee6c511 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2880,11 +2880,11 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts,
simple-sdts.docx)
DECLARE_OOXMLEXPORT_TEST(testFDO76248, FDO76248.docx)
{
-uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
-uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
-uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
-xCursor-jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(3), xCursor-getPage());
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+ return;
+// In two cases the a:graphicData elements had no children, which is
invalid.
+assertXPath(pXmlDoc, //a:graphicData[not(*)], 0);
}
#endif
commit 79747314d368ab253e171877209d7172fd993c74
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Mon Mar 17 15:08:04 2014 +0530
fdo#76248: Fix for file corruption which contains Polyline shape.
Reviewed on:
https://gerrit.libreoffice.org/8623
Change-Id: I042eeb0829c55d6a0fd5d85c1712c7b1cddc8c96
diff --git a/sw/qa/extras/ooxmlexport/data/FDO76248.docx
b/sw/qa/extras/ooxmlexport/data/FDO76248.docx
new file mode 100644
index 000..c7b868e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO76248.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0a77ab5..6a50def 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2878,6 +2878,14 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts,
simple-sdts.docx)
}
+DECLARE_OOXMLEXPORT_TEST(testFDO76248, FDO76248.docx)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(3), xCursor-getPage());
+}
#endif
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index be0baa1..0e62973 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -536,95 +536,98 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject*
sdrObj, const SwFrmFmt rFr
void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const
SwFrmFmt* pFrmFmt, int nAnchorId)
{
-sax_fastparser::FSHelperPtr pFS = m_pImpl-m_pSerializer;
-Size aSize(pSdrObject-GetLogicRect().GetWidth(),
pSdrObject-GetLogicRect().GetHeight());
-startDMLAnchorInline(pFrmFmt, aSize);
-
-sax_fastparser::FastAttributeList* pDocPrAttrList = pFS-createAttrList();
-pDocPrAttrList-add(XML_id, OString::number(nAnchorId).getStr());
-pDocPrAttrList-add(XML_name, OUStringToOString(pSdrObject-GetName(),
RTL_TEXTENCODING_UTF8));
-if (!pSdrObject-GetTitle().isEmpty())
-pDocPrAttrList-add(XML_title,
OUStringToOString(pSdrObject-GetTitle(), RTL_TEXTENCODING_UTF8));
-if (!pSdrObject-GetDescription().isEmpty())
-pDocPrAttrList-add(XML_descr,
OUStringToOString(pSdrObject-GetDescription(), RTL_TEXTENCODING_UTF8));
-sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
-pFS-singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef);
-
uno::Referencedrawing::XShape
xShape(const_castSdrObject*(pSdrObject)-getUnoShape(), uno::UNO_QUERY_THROW);
-uno::Referencelang::XServiceInfo xServiceInfo(xShape,
uno::UNO_QUERY_THROW);
-uno::Reference beans::XPropertySet xPropertySet(xShape, uno::UNO_QUERY);
-uno::Reference beans::XPropertySetInfo xPropSetInfo;
-if (xPropertySet.is())
-xPropSetInfo = xPropertySet-getPropertySetInfo();
-
-bool bLockedCanvas = false;
-if (xPropSetInfo.is() xPropSetInfo-hasPropertyByName(InteropGrabBag))
+if (m_pImpl-isSupportedDMLShape(xShape))
{
-uno::Sequence beans::PropertyValue propList;
-xPropertySet-getPropertyValue(InteropGrabBag) = propList;
-for (sal_Int32 nProp=0; nProp propList.getLength(); ++nProp)
+sax_fastparser::FSHelperPtr pFS =
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/JunitTest.mk |2 +-
solenv/gbuild/platform/com_MSC_class.mk |4 ++--
solenv/gbuild/platform/macosx.mk|2 +-
solenv/gbuild/platform/solaris.mk |2 +-
solenv/gbuild/platform/unxgcc.mk|2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d2c16eb81a813f709552bd840897047fe98eb131
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Mar 19 13:46:36 2014 +0100
use $(value ...) to reduce escalating double-quoting of dollars
Change-Id: I92b4c1be5d8e051a4d716900bcc5dd7bb621017b
Reviewed-on: https://gerrit.libreoffice.org/8658
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index aee3edf..708779f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -41,7 +41,7 @@ $(call gb_JunitTest_get_target,%) :
(DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \
$(gb_JunitTest_JAVACOMMAND) \
-classpath $(T_CP) \
-$(DEFS) \
+$(value DEFS) \
org.junit.runner.JUnitCore \
$(CLASSES) $@.log 21 || \
(cat $@.log \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index fb617ac..7288cf6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -401,8 +401,8 @@ endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}
\
- -Dorg.openoffice.test.arg.env=PATH=PATH \
+
-Dorg.openoffice.test.arg.soffice=$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}
\
+ -Dorg.openoffice.test.arg.env=PATH=$$PATH \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1)))
endef
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8d6f834..33b3870 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -299,7 +299,7 @@ endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice=$(gb_JunitTest_SOFFICEARG) \
-
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH{DYLD_LIBRARY_PATH+=DYLD_LIBRARY_PATH}
\
+
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH$${DYLD_LIBRARY_PATH+=$$DYLD_LIBRARY_PATH}
\
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 318e630..8168e4a 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -321,7 +321,7 @@ endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR){$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}
\
+
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}
\
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
-Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh
\
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0de4a72..63c223e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -319,7 +319,7 @@ endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR){$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}
\
+
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}
\
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1))) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
-Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Darshana Padmadas license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Regards Darshana Padmadas 2nd year CSE darshanapadmadas.wordpress.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo76316.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++
sw/source/filter/ww8/docxattributeoutput.hxx |2 ++
4 files changed, 29 insertions(+)
New commits:
commit 20a3792502120d67b1a9fdea641e15ea504359d3
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Wed Mar 19 16:29:42 2014 +0530
fdo#76316 : File gets corrupt after Roundtrip
Issue :
DOCX containing nested Hyperlinks, have mismatch xml tags.
End tag for outer Hyperlinks does not get closed.
Implementation :
1] Added code at Export side to maintain Count of
Hyperlinks started and ended.
Added check endParagraph() to to close Hyperlink tag
if not yet closed but started.
2] Written Export Unit Test case.
NOTE : Corruption was occurring on Without debug-util build and Crash was
occurring on WITH debug-util build.
Reviewed on:
https://gerrit.libreoffice.org/8654
Change-Id: I9a0ab48578f3d5f4a13c615f4e42a69e790d3ced
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76316.docx
b/sw/qa/extras/ooxmlexport/data/fdo76316.docx
new file mode 100644
index 000..67d3764
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76316.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ee6c511..9461ba7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2865,6 +2865,19 @@ DECLARE_OOXMLEXPORT_TEST(test76108, test76108.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1], fldCharType, begin);
}
+DECLARE_OOXMLEXPORT_TEST(testHyperLinkTagEnded, fdo76316.docx)
+{
+/* XML tag w:hyperlink was not getting closed when its inside another
+ * w:hyperlink tag.
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+
+if (!pXmlDoc) return;
+
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[1]/w:tr[2]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[7]/w:tc[1]/w:tbl[1]/w:tr[2]/w:tc[6]/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:hyperlink[1],1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, simple-sdts.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f3c97d0..1ff6305 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -359,6 +359,16 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
--m_nTextFrameLevel;
+/* If m_nHyperLinkCount 0 that means hyperlink tag is not yet colsed.
+ * This is due to nested hyperlink tags. So close it before end of
paragraph.
+ */
+if(m_nHyperLinkCount 0)
+{
+for(sal_Int32 nHyperLinkToClose = 0; nHyperLinkToClose
m_nHyperLinkCount; ++nHyperLinkToClose)
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_nHyperLinkCount = 0;
+}
+
m_pSerializer-endElementNS( XML_w, XML_p );
WriteParagraphSdt();
@@ -712,6 +722,7 @@ void DocxAttributeOutput::EndRun()
{
m_pSerializer-endElementNS( XML_w, XML_hyperlink );
m_startedHyperlink = false;
+m_nHyperLinkCount--;
}
m_closeHyperlinkInPreviousRun = false;
}
@@ -743,6 +754,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
m_pHyperlinkAttrList = NULL;
m_startedHyperlink = true;
+m_nHyperLinkCount++;
}
// if there is some redlining in the document, output it
@@ -830,6 +842,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-endElementNS( XML_w, XML_hyperlink );
m_startedHyperlink = false;
+m_nHyperLinkCount--;
}
m_closeHyperlinkInThisRun = false;
}
@@ -7060,6 +7073,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_closeHyperlinkInThisRun( false ),
m_closeHyperlinkInPreviousRun( false ),
m_startedHyperlink( false ),
+ m_nHyperLinkCount(0),
m_postponedGraphic( NULL ),
m_postponedDiagram( NULL ),
m_postponedVMLDrawing(NULL),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index b5a58d8..5b55dc8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -771,6 +771,8 @@ private:
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
bool m_startedHyperlink;
+// Count nested HyperLinks
+sal_Int32 m_nHyperLinkCount;
struct PostponedGraphic
{
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source oox/source vcl/source
filter/source/graphicfilter/itiff/ccidecom.cxx |8 +++-
filter/source/graphicfilter/itiff/ccidecom.hxx |2 +-
filter/source/graphicfilter/itiff/itiff.cxx|2 +-
oox/source/ppt/presentationfragmenthandler.cxx |3 +++
oox/source/ppt/slidefragmenthandler.cxx| 11 ---
vcl/source/gdi/print.cxx | 24 +++-
6 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit 13f70473b4a341ec513a5a070a0828b3f85c0c84
Author: Jürgen Schmidt j...@apache.org
Date: Wed Mar 19 12:47:53 2014 +
#124456# merge from aoo410 branch, add null pointer check to avoid usage of
not initialzed theme, add comment for missing theme support in notes page
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index 609b960..401b01e 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -273,6 +273,9 @@ void PresentationFragmentHandler::endDocument() throw
(SAXException, RuntimeExce
SlidePersistPtr pNotesMasterPersistPtr( new
SlidePersist( rFilter, sal_True/*sal_False*/, sal_True, xNotesPage,
ShapePtr( new PPTShape( Slide,
com.sun.star.drawing.GroupShape ) ), mpTextListStyle ) );
FragmentHandlerRef xNotesMasterFragmentHandler(
new SlideFragmentHandler( getFilter(), aNotesMasterFragmentPath,
pNotesMasterPersistPtr, Slide ) );
+
+// TODO: Theme support is missing, theme pointer
in SlidePersist is null and used later
+
importSlide( xNotesMasterFragmentHandler,
pNotesMasterPersistPtr );
pNotesMasterPersistPtr-createXShapes( rFilter );
pNotesPersistPtr-setMasterPersist(pNotesMasterPersistPtr);
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index 2992880..0f2ab8d 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -141,10 +141,15 @@ Reference XFastContextHandler
SlideFragmentHandler::createFastChildContext( s
case PPT_TOKEN( bgRef ):// a:CT_StyleMatrixReference
{
-FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
-*mpSlidePersistPtr-getTheme()-getFillStyle(
xAttribs-getOptionalValue( XML_idx ).toInt32() ) ) );
+oox::drawingml::ThemePtr pTheme = mpSlidePersistPtr-getTheme();
+if (pTheme)
+{
+FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
+*pTheme-getFillStyle( xAttribs-getOptionalValue( XML_idx
).toInt32() ) ) );
+mpSlidePersistPtr-setBackgroundProperties( pFillPropertiesPtr
);
+}
xRet.set( new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() ) );
-mpSlidePersistPtr-setBackgroundProperties( pFillPropertiesPtr );
+
}
break;
commit 0ab284f5064f66a11741fa4aa2e2774c1d7e5f14
Author: Armin Le Grand a...@apache.org
Date: Wed Mar 19 12:34:44 2014 +
i122984 Avoid too many Print JobSetups, be more tolerant with last line
TIFF imports
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 92dbd31..77b856e 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -629,7 +629,7 @@ void CCIDecompressor::StartDecompression( SvStream
rIStream )
}
-sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits )
+sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits, bool bLastLine )
{
sal_uInt16 i;
sal_uInt8 * pSrc,* pDst;
@@ -714,6 +714,12 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 *
pTarget, sal_uLong nTa
for ( i = 0; i nLastLineSize; i++ ) *(pDst++)=*(pSrc++);
}
+// #122984#
+if( !bStatus bLastLine )
+{
+bStatus = sal_True;
+}
+
if ( pIStream-GetError() )
bStatus = sal_False;
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx
b/filter/source/graphicfilter/itiff/ccidecom.hxx
index ac75d2b..d021a84 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -58,7 +58,7 @@ public:
void StartDecompression( SvStream rIStream );
-sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits );
+sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits,
bool bLastLine );
private:
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 4cb6400..e31ed00 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@
Re: Fwd: GSOC 2014 - Haskell UNO Language Binding
Thanks for the comment.. I'm working on bug fixes and trying to upload a patch asap. My LibreOffice Plugin was not a fully tested or a better formatted one. It was done as an experiment. It's repository was a mess with many gibberish. I added the important files into a separate repository. old one - https://github.com/tmtlakmal/EasyTuteLO new one - https://github.com/tmtlakmal/EasyTuteLibreOffice I'm working on a Haskell implementation and will send you a working code before the selection process ends up. Regards On Wed, Mar 19, 2014 at 4:54 PM, Stephan Bergmann sberg...@redhat.comwrote: On 03/19/2014 10:44 AM, Tharindu Lakmal wrote: I'm Lakmal From University of Moratuwa, Sri Lanka. I like to contribute for the topic Haskell UNO Language Binding. I'm looking for a mentor for the project. I read about your description about the project and browsed through many details around the topic. I had written a libreoffice plugin a few months ago using pyuno. It made me easier to find the details about UNO bindings. I like to get some advice from you about 1 st and third options. As I got to know, FFI doesn't provide direct support for C++, but there exist many code generators and methods to do that. The following links added me another option to call pyuno library through Haskell. Better if I can get an opinion on that http://www.haskell.org/haskellwiki/Cxx_foreign_function_interface https://john-millikin.com/articles/ride-the-snake/ By the way I would like to get some opinion about pros and cons of option 1(FFI) and 3(Remote Protocol). I'll prepare the proposal asap and get your feedback also. Hi Lakmal, Great to see you interested in this topic. A few notes: * Doing a UNO Remote Protocol (URP) bridge might be easier than an FFI bridge in that you do that in an external, purely Haskell process (and the documentation of URP might be somewhat better than the documentation of Binary UNO, which you need to interface with in the FFI case). In the end, a real UNO binding would support both, but it would of course be fine to concentrate on one of them, at least initially. * FFI being C rather than C++ should not be a problem, as the Binary UNO code that it needs to interact with is just C (although partially implemented in C++). (One UNO concept is the Binary UNO hub that bridges between different language bindings, which each provide a bridge between that language binding and Binary UNO, so if e.g., some C++ code calls a UNO method implemented in Java, that call goes via the C++-to-Binary-UNO and then via the Binary-UNO-to-JNI bridge.) * You mention Python, but I wouldn't make a bridge between Haskell and PyUNO, but rather between Haskell and Binary UNO. I see no advantage in the former, just more layers of indirection that complicate matters. * Great to read you already did a LO plugin. Is the code available somewhere to have a look at it? * To be eligible for LO GSoC, you'd need to do some Easy Hacks first. * Do you also have experience with Haskell itself? Stephan -- *Lakmal Muthugama,* *Undergraduate,* *Department of Computer Science and Engineering,* *University of Moratuwa,* *Sri Lanka.* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source
include/svx/svddrag.hxx | 19 ---
svx/source/svdraw/svddrag.cxx |2 --
2 files changed, 21 deletions(-)
New commits:
commit 0fb498ccfd40a13bf99c3f36dd0cebebdaf55809
Author: Tor Lillqvist t...@collabora.com
Date: Wed Mar 19 15:15:27 2014 +0200
Remove unused fields
Change-Id: Ia7d3b7e319f2a568120add15ef05915a98fe6696
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 11109f2..fd43db2 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -48,9 +48,7 @@ protected:
Point aRef1; // Referencepoint: Resize fixed point, (axis of
rotation,
Point aRef2; // axis of reflection, ...)
Point aPos0; // Position at the last Event
-Point aRealPos0; // Position at the last Event
Point aRealNow; // Current dragging position without Snap, Ortho and
Limit
-Point aRealLast; // RealPos of the last Point (for MinMoved)
Rectangle aActionRect;
bool bEndDragChangesAttributes;
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index a45ef7b..3c0f109 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -60,13 +60,11 @@ void SdrDragStat::Reset(const Point rPnt)
Reset();
Start()=rPnt;
aPos0=rPnt;
-aRealPos0=rPnt;
RealNow()=rPnt;
}
void SdrDragStat::NextMove(const Point rPnt)
{
-aRealPos0=GetRealNow();
aPos0=GetNow();
RealNow()=rPnt;
Point aBla=KorregPos(GetRealNow(),GetPrev());
commit 861d87d5526a25aef49d8acc99ba5a8ee12a8337
Author: Tor Lillqvist t...@collabora.com
Date: Wed Mar 19 15:02:05 2014 +0200
Drop unused reserve fields
Probably a relic from the past, when people tried to avoid changing public
headers incompatibly to avoid causing recompilations for their
colleagues... We are long past such concerns. The talk about extensions in
the comment is most likely obsolete.
Change-Id: If90ca02685bf82ed529becb715b4c614287fdc57
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index ef29454..11109f2 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -53,26 +53,9 @@ protected:
Point aRealLast; // RealPos of the last Point (for MinMoved)
Rectangle aActionRect;
-// Backup for compatible extensions which otherwise would become
incompatible
-Point aReservePoint1;
-Point aReservePoint2;
-Point aReservePoint3;
-Point aReservePoint4;
-Rectangle aReserveRect1;
-Rectangle aReserveRect2;
bool bEndDragChangesAttributes;
bool bEndDragChangesGeoAndAttributes;
bool bMouseIsUp;
-bool aReserveBool3;
-bool aReserveBool4;
-long aReserveLong1;
-long aReserveLong2;
-long aReserveLong3;
-long aReserveLong4;
-void* aReservePtr1;
-void* aReservePtr2;
-void* aReservePtr3;
-void* aReservePtr4;
bool bShown;// Xor visible?
sal_uInt16nMinMov; // So much has to be minimally moved first
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 69079] Creating a new themes in the gallery the files are always created as file new theme.* instead of sdxxx.* - existing files will be overwritten and leads to data loss.
https://bugs.freedesktop.org/show_bug.cgi?id=69079 --- Comment #16 from Michael Meeks michael.me...@collabora.com --- Of course, we could provide the user with an option, or use a mangled version of their theme name, or use sdXXXnext - but ... I really thought I fixed that ;-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/customshapeproperties.cxx|3 ++-
oox/source/export/drawingml.cxx | 20
sw/qa/extras/ooxmlexport/data/test76317.docx |binary
sw/qa/extras/ooxmlexport/data/test76317_2K10.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 ++
5 files changed, 28 insertions(+), 9 deletions(-)
New commits:
commit 35e190ba5bac01b47fbed1ea568dfb3456029d82
Author: Sourav sourav.maha...@synerzip.com
Date: Wed Mar 19 18:01:45 2014 +0530
fdo76201:File Corruption - Issue related with prstGeom for Hexagon shape.
There are two issues that are handled in this fix.
1)File created in MSO2K10 on RT gets corrupted.The root cause is found in
CustomShapeProperties::pushToPropSet
2)File created in MSO2K7 on RT gets corrupted.There is an issue in shape
import a:gd values for any shape (ex. circular arrow, hexagon etc).LO cannot
import right a:gd values for any shape which is created in MSO-2007.Due to
missing values of a:gd tag, after roundtrip the file gets corrupted.To avoid
corruption a check introduced:-
if(aAdjustments.size() == nLength)
after
http://opengrok.libreoffice.org/xref/core/oox/source/export/drawingml.cxx#1784
that will verify the number of a:gd tags associated with the shape
during import and the number of a:gd tags during export.If there is a
mismatch a:gd willnot be written.Changes made in DrawingML::WritePresetShape.
I have written 2 test cases for the same.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8657
Change-Id: Ibb1e2dc1c098b7399c06d7b4f59fac4e80887062
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 60ef079..52fa038 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -170,6 +170,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase /* rFi
uno::Sequence
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentSeq;
if ( aGeoPropSeq[ i ].Value = aAdjustmentSeq )
{
+int nIndex=0;
for (std::vector CustomShapeGuide
::const_iterator aIter( maAdjustmentGuideList.begin() ),
aEnd(maAdjustmentGuideList.end());
aIter != aEnd; ++aIter)
{
@@ -189,7 +190,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase /* rFi
aAdjustmentVal.Value =
(*aIter).maFormula.toInt32();
aAdjustmentVal.State =
PropertyState_DIRECT_VALUE;
aAdjustmentVal.Name = (*aIter).maName;
-aAdjustmentSeq[ 0 ] = aAdjustmentVal;
+aAdjustmentSeq[ nIndex++ ] =
aAdjustmentVal;
}
}
aGeoPropSeq[ i ].Value = aAdjustmentSeq;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7d8ea84..a71ed89 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1782,19 +1782,23 @@ void DrawingML::WritePresetShape( const char* pShape,
MSO_SPT eShapeType, sal_Bo
EscherPropertyContainer::LookForPolarHandles( eShapeType,
nAdjustmentsWhichNeedsToBeConverted );
sal_Int32 nValue, nLength = aAdjustmentSeq.getLength();
-for( sal_Int32 i=0; i nLength; i++ )
-if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i
], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
-{
-// If the document model doesn't have an adjustment name (e.g.
shape was created from VML), then take it from the predefined list.
-OString aAdjName;
-if (aAdjustmentSeq[i].Name.isEmpty()
static_castsal_uInt32(i) aAdjustments.size())
-aAdjName = aAdjustments[i];
+//aAdjustments will give info about the number of adj values for a
particular geomtery.For example for hexagon aAdjustments.size() will be 2 and
for circular arrow it will be 5 as per ooxDrawingMLGetAdjNames.
+if(aAdjustments.size() == static_castsal_uInt32(nLength))// In case
there is a mismatch do not write the XML_gd tag.
+{
+for( sal_Int32 i=0; i nLength; i++ )
+if( EscherPropertyContainer::GetAdjustmentValue(
aAdjustmentSeq[ i ], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
+{
+// If the document model doesn't have an adjustment name
(e.g. shape was created from VML), then take it from the predefined list.
+OString aAdjName;
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/87ca89e3905009ed947c651f3dc70f3d61ea93
00/87ca89e3905009ed947c651f3dc70f3d61ea93 |1 + 1 file changed, 1 insertion(+) New commits: commit acf3bd31b1e82542100f59ec21c8b5b658ea Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 19 15:35:19 2014 + Notes added by 'git notes add' diff --git a/00/87ca89e3905009ed947c651f3dc70f3d61ea93 b/00/87ca89e3905009ed947c651f3dc70f3d61ea93 new file mode 100644 index 000..019e9c3 --- /dev/null +++ b/00/87ca89e3905009ed947c651f3dc70f3d61ea93 @@ -0,0 +1 @@ +merged as: 04187aaf09969341a7ae9ae7ff5a13925381a96b ___ 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' - 13/f70473b4a341ec513a5a070a0828b3f85c0c84
13/f70473b4a341ec513a5a070a0828b3f85c0c84 |1 + 1 file changed, 1 insertion(+) New commits: commit 76c7d82ddc7bfb71030473198220625ed4c86d92 Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 19 15:37:40 2014 + Notes added by 'git notes add' diff --git a/13/f70473b4a341ec513a5a070a0828b3f85c0c84 b/13/f70473b4a341ec513a5a070a0828b3f85c0c84 new file mode 100644 index 000..f7d8540 --- /dev/null +++ b/13/f70473b4a341ec513a5a070a0828b3f85c0c84 @@ -0,0 +1 @@ +prefer: 752c83258899be8b3541e25933905393b9c38698 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 38 commits - include/svtools lotuswordpro/source registry/source reportdesign/source sc/source sd/source svtools/source svx/source sw/source vbahelper/source
include/svtools/asynclink.hxx| 22 ++-
include/svtools/editbrowsebox.hxx|1
lotuswordpro/source/filter/lwpcelllayout.cxx |6 -
lotuswordpro/source/filter/lwplayout.cxx |5
lotuswordpro/source/filter/lwppara.cxx | 155 +--
lotuswordpro/source/filter/lwpstory.cxx |2
registry/source/reflwrit.cxx |1
reportdesign/source/ui/dlg/GroupsSorting.cxx |5
sc/source/core/data/dociter.cxx | 14 +-
sc/source/filter/excel/impop.cxx |3
sc/source/filter/xml/XMLExportIterator.cxx |3
sd/source/ui/func/fupage.cxx |3
sd/source/ui/view/drtxtob1.cxx |4
svtools/source/brwbox/editbrowsebox.cxx |5
svtools/source/config/printoptions.cxx |1
svx/source/fmcomp/gridctrl.cxx |2
svx/source/svdraw/svdopath.cxx |1
svx/source/svdraw/svdotext.cxx |2
svx/source/tbxctrls/colrctrl.cxx |3
svx/source/toolbars/extrusionbar.cxx | 45 ---
svx/source/unodraw/unopool.cxx |2
sw/source/core/attr/format.cxx |5
sw/source/core/crsr/crstrvl.cxx |4
sw/source/core/doc/doctxm.cxx|4
sw/source/core/layout/fly.cxx| 23 ++--
sw/source/core/layout/frmtool.cxx|2
sw/source/core/table/swtable.cxx |2
sw/source/filter/ww8/wrtw8esh.cxx|1
sw/source/filter/ww8/ww8atr.cxx |2
sw/source/filter/ww8/ww8scan.cxx |2
vbahelper/source/msforms/vbauserform.cxx |2
31 files changed, 185 insertions(+), 147 deletions(-)
New commits:
commit d1a8a119f267f0eda36dc28fece111a1b6c0b6ec
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 14:21:44 2014 +
coverity#708279 Uninitialized pointer field
Change-Id: I65b245c3f262f2ad2665e7d0c3c246104e36eacd
diff --git a/svtools/source/config/printoptions.cxx
b/svtools/source/config/printoptions.cxx
index 53fb5ef..fc0f0c1 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -504,6 +504,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString
sProp,
}
SvtBasePrintOptions::SvtBasePrintOptions()
+: m_pDataContainer(NULL)
{
}
commit 60211f44fd1fe27497f1a599091437a65ca4094b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 14:20:17 2014 +
coverity#708277 Uninitialized pointer field
Change-Id: I9877ef518b68afada1abaf47ebb167fcaf7bda16
diff --git a/svtools/source/brwbox/editbrowsebox.cxx
b/svtools/source/brwbox/editbrowsebox.cxx
index 783aa72..ec048fe 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -138,6 +138,7 @@ namespace svt
,nStartEvent(0)
,nEndEvent(0)
,nCellModifiedEvent(0)
+ ,m_pFocusWhileRequest(0)
,nPaintRow(-1)
,nEditRow(-1)
,nOldEditRow(-1)
@@ -147,8 +148,8 @@ namespace svt
,bPaintStatus(sal_True)
,bActiveBeforeTracking( sal_False )
,m_nBrowserFlags(nBrowserFlags)
+ ,pHeader(NULL)
{
-
impl_construct();
}
@@ -158,6 +159,7 @@ namespace svt
,nStartEvent(0)
,nEndEvent(0)
,nCellModifiedEvent(0)
+ ,m_pFocusWhileRequest(0)
,nPaintRow(-1)
,nEditRow(-1)
,nOldEditRow(-1)
@@ -169,7 +171,6 @@ namespace svt
,m_nBrowserFlags(nBrowserFlags)
,pHeader(NULL)
{
-
impl_construct();
}
commit e2363a12a613e04c39bb2bf88ea2bdec4b42e04c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 14:18:42 2014 +
unused pMouseEvent member
Change-Id: I4d3d9bcdfdb43a2a628dcd1411962f78f81a81e2
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index d02a83b..62fa334 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -471,7 +471,6 @@ namespace svt
void Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown);
} aMouseEvent;
-const BrowserMouseEvent* pMouseEvent; // is set during a mouse event
CellControllerRefaController,
aOldController;
commit 011f1e6c90a1fb50d73493b931b73559388826e8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 14:14:43 2014 +
coverity#708192 Uninitialized pointer field
Change-Id: Iaccc034f61442242ce1b864457f0d048cdeae98d
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index af10d73..1428cd5 100644
--- a/include/svtools/asynclink.hxx
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmloff/source
xmloff/source/draw/ximpcustomshape.cxx | 44 -
1 file changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 4e04ad3623f2ab4693dcd50a9934fc836e190a6f
Author: Armin Le Grand a...@apache.org
Date: Wed Mar 19 14:51:18 2014 +
i124452 correct svg:viewBox for EnhancedCustomShape geometry import when no
width and no height are given
diff --git a/xmloff/source/draw/ximpcustomshape.cxx
b/xmloff/source/draw/ximpcustomshape.cxx
index 3c65884..98ae15a 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -52,6 +52,7 @@
#include com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp
#include com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp
#include com/sun/star/drawing/ProjectionMode.hpp
+#include basegfx/vector/b2dvector.hxx
#include hash_map
using namespace ::com::sun::star;
@@ -853,7 +854,48 @@ void XMLEnhancedCustomShapeContext::StartElement( const
uno::Reference xml::sax
case EAS_viewBox :
{
SdXMLImExViewBox aViewBox( rValue,
GetImport().GetMM100UnitConverter() );
-awt::Rectangle aRect( aViewBox.GetX(), aViewBox.GetY(),
aViewBox.GetWidth(), aViewBox.GetHeight() );
+awt::Rectangle aRect(
+basegfx::fround(aViewBox.GetX()),
+basegfx::fround(aViewBox.GetY()),
+basegfx::fround(aViewBox.GetWidth()),
+basegfx::fround(aViewBox.GetHeight()));
+
+if(0 == aRect.Width 0 == aRect.Height)
+{
+// #124452# If in svg:viewBox no width and height is
given the objects should normally
+// not be visible at all, but in this case it is a bug
in LO to write empty svg:viewBox
+// entries for CustomShapes. To allow for a better ODF
user experience, just correct this
+// here by getting the real object scale from the
already set transformation from the xShape.
+// Hopefully LO will fix that bug (but this will still
leave the files with the error), but
+// even when not this will do no harm as long noone
uses this state explicitely for some
+// purpose (e.g. to really have CustomShapes without
content, but unlikely).
+// When they do fix this they will need this fix
anyways to read their own misformed ODF files
+// again, so I guess it will be taken, too...
+uno::Reference beans::XPropertySet xProps(mrxShape,
uno::UNO_QUERY_THROW);
+uno::Any aObjectTransform =
xProps-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Transformation)));
+drawing::HomogenMatrix3 aTransformMatrix;
+aObjectTransform = aTransformMatrix;
+basegfx::B2DHomMatrix aMatrix;
+
+aMatrix.set(0, 0, aTransformMatrix.Line1.Column1);
+aMatrix.set(0, 1, aTransformMatrix.Line1.Column2);
+aMatrix.set(0, 2, aTransformMatrix.Line1.Column3);
+aMatrix.set(1, 0, aTransformMatrix.Line2.Column1);
+aMatrix.set(1, 1, aTransformMatrix.Line2.Column2);
+aMatrix.set(1, 2, aTransformMatrix.Line2.Column3);
+aMatrix.set(2, 0, aTransformMatrix.Line3.Column1);
+aMatrix.set(2, 1, aTransformMatrix.Line3.Column2);
+aMatrix.set(2, 2, aTransformMatrix.Line3.Column3);
+
+basegfx::B2DVector aScale, aTranslate;
+double fRotate, fShearX;
+
+aMatrix.decompose(aScale, aTranslate, fRotate,
fShearX);
+
+aRect.Width = basegfx::fround(fabs(aScale.getX()));
+aRect.Height = basegfx::fround(fabs(aScale.getY()));
+}
+
beans::PropertyValue aProp;
aProp.Name = EASGet( EAS_ViewBox );
aProp.Value = aRect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Dialog Widget Conversion
On Mon, 2014-03-17 at 21:30 +0100, Szymon Kłos wrote: Hi all, My name is Szymon Kłos. I study at the Gdansk University of Technology and I would like to participate in GSoC 2014. The Dialog Widget Conversion proposal is interesting for me, because I've been learning GTK. Instead of bug fixing, I convert my first dialog and I would be grateful if someone look at my change. https://gerrit.libreoffice.org/#/c/8614/ Yup, mostly good. I reviewed this earlier so just noting the same to the list. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/igif/decode.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 3037f4d98908f64157a5522e4ba09d0ecf22c2ab
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 15:44:28 2014 +
coverity#708312 Uninitialized pointer field
Change-Id: I3bb28d1116e155f819b0e920a3c355b00e892c2a
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index 0dcd86d..561bf5c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -27,12 +27,15 @@ struct GIFLZWTableEntry
sal_uInt8 nData;
};
-GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) :
-nInputBitsBuf ( 0 ),
-nOutBufDataLen ( 0 ),
-nInputBitsBufSize ( 0 ),
-bEOIFound ( false ),
-nDataSize ( cDataSize )
+GIFLZWDecompressor::GIFLZWDecompressor(sal_uInt8 cDataSize)
+: pBlockBuf(NULL)
+, nInputBitsBuf(0)
+, nOutBufDataLen(0)
+, nInputBitsBufSize(0)
+, bEOIFound(false)
+, nDataSize(cDataSize)
+, nBlockBufSize(0)
+, nBlockBufPos(0)
{
pOutBuf = new sal_uInt8[ 4096 ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #7 from Markus Mohrhard markus.mohrh...@googlemail.com --- Here is a commit where I did something similar to find a bug in oox for the oox::PropertyMap: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f566585f0882e65778c424640b9312cb19b007b9 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/sdi sc/source sc/uiconfig
sc/inc/globstr.hrc|4 +++-
sc/inc/sc.hrc |1 +
sc/sdi/cellsh.sdi |1 +
sc/sdi/scalc.sdi | 26 ++
sc/source/ui/src/globstr.src |4
sc/source/ui/view/cellsh.cxx | 20
sc/source/ui/view/preview.cxx |1 +
sc/source/ui/view/tabview3.cxx|3 +++
sc/source/ui/view/viewfun2.cxx|1 +
sc/uiconfig/scalc/statusbar/statusbar.xml |1 +
10 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit 82b5ded699fcc03a09b0930213da204a332285e6
Author: gdm.manmeet gdm.manm...@gmail.com
Date: Tue Mar 18 13:21:39 2014 +0530
fdo#64290 ui:count selected rows and columns
Change-Id: Ie6443fd9b1ac6332b4937c4b6b5d565cca1fe612
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index c402de2..3dfb79b 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -687,7 +687,9 @@
#define STR_CTRLCLICKHYPERLINK 526
#define STR_CLICKHYPERLINK 527
-#define SC_GLOBSTR_STR_COUNT528 /** the count of permanently
resident strings */
+#define STR_ROWCOL_SELCOUNT 528
+
+#define SC_GLOBSTR_STR_COUNT529 /** the count of permanently
resident strings */
#endif
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index c776750..507255b 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -242,6 +242,7 @@
#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35)
#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36)
#define SID_ENTER_STRING(SC_MESSAGE_START + 37)
+#define SID_ROWCOL_SELCOUNT (SC_MESSAGE_START + 38)
// messages for opening dialogs:
#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50)
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 3e18a13..65ff899 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -404,6 +404,7 @@ interface CellMovement
SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ]
SID_STATUS_SUM [ ExecMethod = Execute; StateMethod = GetState; ]
SID_STATUS_DOCPOS [ ExecMethod = Execute; StateMethod = GetState; ]
+SID_ROWCOL_SELCOUNT [ ExecMethod = Execute; StateMethod = GetState; ]
SID_STATUS_SELMODE [ ExecMethod = Execute; StateMethod = GetState; ]
SID_STATUS_SELMODE_ERG [ ExecMethod = Execute; ]
SID_STATUS_SELMODE_ERW [ ExecMethod = Execute; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index ca7b225..fac4558 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -7003,6 +7003,32 @@ SfxStringItem StatusDocPos SID_STATUS_DOCPOS
GroupId = GID_VIEW;
]
+SfxStringItem RowColSelCount SID_ROWCOL_SELCOUNT
+
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+Readonly = TRUE,
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = TRUE,
+ToolBoxConfig = FALSE,
+GroupId = GID_VIEW;
+]
+
SfxStringItem StatusFunction SID_STATUS_SUM
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 47c5d94..82eb914 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -585,6 +585,10 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = Sheet ;
};
+String STR_ROWCOL_SELCOUNT
+{
+Text [ en-US ] = Selected $1 rows, $2 columns;
+};
String STR_COLUMN
{
Text [ en-US ] = Column ;
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index dfea350..3cd823c 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -679,6 +679,26 @@ void ScCellShell::GetState(SfxItemSet rSet)
}
break;
+case SID_ROWCOL_SELCOUNT:
+{
+ScRange aMarkRange;
+GetViewData()-GetSimpleArea( aMarkRange );
+SCCOL nCol1, nCol2;
+SCROW nRow1, nRow2;
+nCol1 = aMarkRange.aStart.Col();
+nRow1 = aMarkRange.aStart.Row();
+nCol2 = aMarkRange.aEnd.Col();
+nRow2 = aMarkRange.aEnd.Row();
+if( nCol2 != nCol1 || nRow1 != nRow2 )
+{
+OUString aStr = ScGlobal::GetRscString(
STR_ROWCOL_SELCOUNT );
+aStr = aStr.replaceAll( $1, OUString::number( nRow2
- nRow1 + 1 ));
+aStr = aStr.replaceAll( $2, OUString::number( nCol2
- nCol1 + 1 ));
+rSet.Put( SfxStringItem( nWhich, aStr ) );
+}
+}
+break;
+
// calculations etc. with
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 51819, which changed state. Bug 51819 Summary: Password-protected documents saved unencrypted for auto-recovery https://bugs.freedesktop.org/show_bug.cgi?id=51819 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need suggestion, Regarding fdo#62957 and GSOC..
On 17/03/2014 17:59, Sujay m wrote: Hi all, I've introduced myself and shown my interest in the GSOC idea Follow-me slideshow.. I have just started my open source development. Its been 2 months with LO, and have taken up 3 bugs, fdo#42788 https://bugs.freedesktop.org/show_bug.cgi?id=42788 ,fdo#64290 https://bugs.freedesktop.org/show_bug.cgi?id=64290 and fdo#62957 https://bugs.freedesktop.org/show_bug.cgi?id=62957.. Well i started with fdo#42788, the change i proposed to the mailing list, honestly i was a beginner so the change i proposed was very silly, so didn't submit to the gerrit.. Then, with fdo#64290, i had to do real hardwork, it was a very easy hack in the end, but since it was my first time with huge source code i took three weeks to hack it.. I have submitted the patch to gerrit.. Well, the thing is when i got information about GSOC, it occured to me that it is the perfect program to kick start my open source involvement.. But i am not sure i will be able to do it because, i have taken 3 weeks to solve an easy hack.. Is it you, or did you just pick an easy hack that wasn't so easy? GO FOR IT! If you don't get accepted, then find out why and do something about it. If you do, then working on a real project with an experienced guy looking over your shoulder is a great way to learn. Either way, you can't lose. The best life lesson is to set yourself targets that are just beyond your current ability. That way, you will (with hard work) be able to achieve them, and each success sets you up for the next ... Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/ajrhunt/firebird-improvement'
New branch 'private/ajrhunt/firebird-improvement' available with the following commits: commit d352ee8550c5261503a2c1a8d7cf2a57a6699b2d Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Mar 19 20:15:11 2014 + firebird-sdbc: Implement XSQLDA wrapper. Should hopefully help cleanup some of the madness when dealing with XSQLDAs manually. Change-Id: Ia8a477c08fc8d3b66cae11766551d396b881e4bf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source vcl/source
filter/source/graphicfilter/itiff/ccidecom.cxx |8 +++-
filter/source/graphicfilter/itiff/ccidecom.hxx |2 +-
filter/source/graphicfilter/itiff/itiff.cxx|2 +-
vcl/source/gdi/print.cxx | 24 +++-
4 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit 674a8a084bff6aa089d073b2710cd6a8b6662546
Author: Armin Le Grand a...@apache.org
Date: Wed Mar 19 12:34:44 2014 +
Resolves: #i122984# Avoid too many Print JobSetups...
be more tolerant with last line TIFF imports
(cherry picked from commit 0ab284f5064f66a11741fa4aa2e2774c1d7e5f14)
Change-Id: I75c86422bfbf2f83e1027bbc1bd83260de39b3ca
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index ce70811..1d105b2 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -621,7 +621,7 @@ void CCIDecompressor::StartDecompression( SvStream
rIStream )
}
-sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits )
+sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits, bool bLastLine )
{
sal_uInt16 i;
sal_uInt8 * pDst;
@@ -706,6 +706,12 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 *
pTarget, sal_uLong nTa
for ( i = 0; i nLastLineSize; i++ ) *(pDst++)=*(pSrc++);
}
+// #i122984#
+if( !bStatus bLastLine )
+{
+bStatus = sal_True;
+}
+
if ( pIStream-GetError() )
bStatus = sal_False;
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx
b/filter/source/graphicfilter/itiff/ccidecom.hxx
index db5295a..e018dcf 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -53,7 +53,7 @@ public:
void StartDecompression( SvStream rIStream );
-sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits );
+sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits,
bool bLastLine );
private:
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 4c2e1fb..dc27652 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -559,7 +559,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent,
sal_uLong nMaxPercent )
pTIFF-Seek( pStripOffsets[ nStrip ] );
aCCIDecom.StartDecompression( *pTIFF );
}
-if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth *
nBitsPerSample * nSamplesPerPixel / nPlanes ) == sal_False )
+if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth *
nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes ) == sal_False )
return sal_False;
if ( pTIFF-GetError() )
return sal_False;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 8e97d4b..ba69c1c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1213,11 +1213,25 @@ bool Printer::SetPaperSizeUser( const Size rSize, bool
bMatchNearest )
if ( mbInPrintPage )
return false;
-SizeaPixSize = LogicToPixel( rSize );
-SizeaPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
-if ( (maJobSetup.ImplGetConstData()-mePaperFormat != PAPER_USER) ||
- (maJobSetup.ImplGetConstData()-mnPaperWidth != aPageSize.Width()) ||
- (maJobSetup.ImplGetConstData()-mnPaperHeight != aPageSize.Height()) )
+const Size aPixSize = LogicToPixel( rSize );
+const Size aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
+bool bNeedToChange(maJobSetup.ImplGetConstData()-mnPaperWidth !=
aPageSize.Width() ||
+maJobSetup.ImplGetConstData()-mnPaperHeight != aPageSize.Height());
+
+if(!bNeedToChange)
+{
+// #i122984# only need to change when Paper is different from
PAPER_USER and
+// the mapped Paper which will created below in the call to
ImplFindPaperFormatForUserSize
+// and will replace maJobSetup.ImplGetConstData()-mePaperFormat. This
leads to
+// unnecessary JobSetups, e.g. when printing a multi-page fax, but
also with
+// normal print
+const Paper aPaper = ImplGetPaperFormat(aPageSize.Width(),
aPageSize.Height());
+
+bNeedToChange = maJobSetup.ImplGetConstData()-mePaperFormat !=
PAPER_USER
+maJobSetup.ImplGetConstData()-mePaperFormat != aPaper;
+}
+
+if(bNeedToChange)
{
JobSetupaJobSetup = maJobSetup;
ImplJobSetup* pSetupData = aJobSetup.ImplGetData();
___
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' - 0a/b284f5064f66a11741fa4aa2e2774c1d7e5f14
0a/b284f5064f66a11741fa4aa2e2774c1d7e5f14 |1 + 1 file changed, 1 insertion(+) New commits: commit b0030aafdb3b8c414c888505c836597b60aae4ba Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 19 20:28:12 2014 + Notes added by 'git notes add' diff --git a/0a/b284f5064f66a11741fa4aa2e2774c1d7e5f14 b/0a/b284f5064f66a11741fa4aa2e2774c1d7e5f14 new file mode 100644 index 000..a8d6c8f --- /dev/null +++ b/0a/b284f5064f66a11741fa4aa2e2774c1d7e5f14 @@ -0,0 +1 @@ +merged as: 674a8a084bff6aa089d073b2710cd6a8b6662546 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/firebird-improvement' - 2 commits - connectivity/Library_firebird_sdbc.mk connectivity/source
Rebased ref, commits from common ancestor:
commit d0a9f440e6860a225c5a0ae6222fa96bbc312dbe
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Mar 19 20:28:45 2014 +
firebird-sdbc: upgrade Statement to use Sqlda wrapper.
So much cleaner already :).
Change-Id: I8d1709246d4cbcd3113fdd7d14c0885ddca37059
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index d5e1213..3ddf3b5 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -56,7 +56,6 @@ OPreparedStatement::OPreparedStatement( Connection*
_pConnection,
:OStatementCommonBase(_pConnection)
,m_aTypeInfo(_TypeInfo)
,m_sSqlStatement(sql)
-,m_pOutSqlda(0)
,m_pInSqlda(0)
{
SAL_INFO(connectivity.firebird, OPreparedStatement().
@@ -82,8 +81,8 @@ void OPreparedStatement::ensurePrepared()
}
prepareAndDescribeStatement(m_sSqlStatement,
- m_pOutSqlda,
- m_pInSqlda);
+m_aOutSqlda,
+m_pInSqlda);
aErr = isc_dsql_describe_bind(m_statusVector,
@@ -152,7 +151,7 @@ Reference XResultSetMetaData SAL_CALL
OPreparedStatement::getMetaData()
ensurePrepared();
if(!m_xMetaData.is())
-m_xMetaData = new OResultSetMetaData(m_pConnection, m_pOutSqlda);
+m_xMetaData = new OResultSetMetaData(m_pConnection, m_aOutSqlda);
return m_xMetaData;
}
@@ -169,12 +168,6 @@ void SAL_CALL OPreparedStatement::close()
throw(SQLException, RuntimeException,
free(m_pInSqlda);
m_pInSqlda = 0;
}
-if (m_pOutSqlda)
-{
-freeSQLVAR(m_pOutSqlda);
-free(m_pOutSqlda);
-m_pOutSqlda = 0;
-}
}
void SAL_CALL OPreparedStatement::disposing()
@@ -286,7 +279,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
m_aMutex,
uno::Reference XInterface (*this),
m_aStatementHandle,
- m_pOutSqlda);
+ m_aOutSqlda);
if (getStatementChangeCount() 0)
m_pConnection-notifyDatabaseModified();
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 90e89a8..688063a 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -21,6 +21,7 @@
#define CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
#include Statement.hxx
+#include wrapper/Sqlda.hxx
#include cppuhelper/implbase5.hxx
@@ -69,7 +70,7 @@ namespace connectivity
::rtl::OUString
m_sSqlStatement;
::com::sun::star::uno::Reference
::com::sun::star::sdbc::XResultSetMetaData m_xMetaData;
-XSQLDA* m_pOutSqlda;
+wrapper::Sqlda m_aOutSqlda;
XSQLDA* m_pInSqlda;
void checkParameterIndex(sal_Int32 nParameterIndex)
throw(::com::sun::star::sdbc::SQLException,
diff --git a/connectivity/source/drivers/firebird/Statement.cxx
b/connectivity/source/drivers/firebird/Statement.cxx
index 94b9474..eb185a4 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -34,6 +34,7 @@
#include com/sun/star/sdbc/FetchDirection.hpp
using namespace connectivity::firebird;
+using namespace connectivity::firebird::wrapper;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -84,13 +85,6 @@ void OStatement::disposeResultSet()
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
OStatementCommonBase::disposeResultSet();
-
-if (m_pSqlda)
-{
-freeSQLVAR(m_pSqlda);
-free(m_pSqlda);
-m_pSqlda = 0;
-}
}
// XStatement ---
@@ -115,7 +109,7 @@ uno::Reference XResultSet SAL_CALL
OStatement::executeQuery(const OUString s
disposeResultSet();
prepareAndDescribeStatement(sql,
-m_pSqlda);
+m_aSqlda);
aErr = isc_dsql_execute(m_statusVector,
m_pConnection-getTransaction(),
@@ -129,7 +123,7 @@ uno::Reference XResultSet SAL_CALL
OStatement::executeQuery(const OUString s
m_aMutex,
uno::Reference XInterface (*this),
m_aStatementHandle,
- m_pSqlda);
+ m_aSqlda);
// TODO: deal with cleanup
diff --git
[Libreoffice-commits] core.git: 8 commits - extensions/source include/vcl l10ntools/source sal/qa sfx2/source vcl/source vcl/unx writerfilter/source
extensions/source/plugin/base/plctrl.cxx | 14 ++
include/vcl/animate.hxx|4
l10ntools/source/xmlparse.cxx |4 +++-
sal/qa/osl/file/osl_File.cxx |9 +++--
sfx2/source/dialog/dinfdlg.cxx |1 +
vcl/source/window/toolbox.cxx | 22 ++
vcl/unx/generic/app/sm.cxx | 14 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
8 files changed, 38 insertions(+), 31 deletions(-)
New commits:
commit 43f74365f9a3cc913618e55cae0b050f4b0ca58c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 16:10:57 2014 +
coverity#984140 Uninitialized pointer field
Change-Id: Icba06e9bfa85b67a9e2a5f6952d023d6655267d4
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 121534e..4c1b055 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1390,6 +1390,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(Window*
pParent,
m_aYesNoButton ( this, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
m_aRemoveButton ( this, SfxResId( SFX_PB_PROPERTY_REMOVE ) ),
m_nScrollPos (0),
+m_pCurrentLine (NULL),
m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
Application::GetSettings().GetLanguageTag().getLanguageType() )
commit 7a958026f3526468a0c949fcceb116b33e29b903
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 16:09:15 2014 +
coverity#984119 Uninitialized pointer field
Change-Id: I6bbb181b892f22d05be76fc75506d94543eb7ee7
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 63b9bcb..5256303 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2460,6 +2460,11 @@ namespace osl_FileStatus
::osl::DirectoryItemrItem_file, rItem_link;
public:
+isValid()
+: pDir(NULL)
+{
+}
+
// initialization
void setUp()
{
@@ -2477,8 +2482,8 @@ namespace osl_FileStatus
void tearDown()
{
-::osl::FileBase::RC nError1 = pDir-close();
-delete pDir;
+::osl::FileBase::RC nError1 = pDir-close();
+delete pDir;
CPPUNIT_ASSERT_MESSAGE( errorToStr(nError1).getStr(),
::osl::FileBase::E_None == nError1 );
// remove the tempfile in $TEMP/tmpdir/tmpname.
commit f8ee482b92638d3acfa944d305f87a34e5fc6e95
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 16:07:03 2014 +
coverity#984098 Uninitialized pointer field
Change-Id: I671f7c98bdcfa828e7252ec13fd1b6b998ff7a87
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 043..1a7559b 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -825,7 +825,9 @@ static OUString lcl_pathnameToAbsoluteUrl(const OString
rPathname)
SimpleXMLParser::SimpleXMLParser()
-: m_pXMLFile( NULL )
+: m_pXMLFile(NULL)
+, m_pCurNode(NULL)
+, m_pCurData(NULL)
{
m_aParser = XML_ParserCreate( NULL );
XML_SetUserData( m_aParser, this );
commit b0ff06a5bc78839f43c73ac529c91a23293e93e8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 16:05:03 2014 +
coverity#984088 Uninitialized pointer field
Change-Id: I228f7c8f99b0cc3117fbeab78efbeddd74896d54
diff --git a/extensions/source/plugin/base/plctrl.cxx
b/extensions/source/plugin/base/plctrl.cxx
index 9fe7821..fc19c0d 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -37,22 +37,20 @@
#include vcl/syschild.hxx
#include toolkit/helper/vclunohelper.hxx
-
-
-PluginControl_Impl::PluginControl_Impl() :
-_pMultiplexer( NULL )
+PluginControl_Impl::PluginControl_Impl()
+: _pMultiplexer( NULL )
, _nX( 0 )
, _nY( 0 )
, _nWidth( 100 )
, _nHeight( 100 )
, _nFlags( WINDOW_POSSIZE_ALL )
-, _bVisible( sal_False )
-, _bInDesignMode( sal_False )
-, _bEnable( sal_True )
+, _bVisible(false)
+, _bInDesignMode(false)
+, _bEnable(true)
+, _pSysChild(NULL)
{
}
-
PluginControl_Impl::~PluginControl_Impl()
{
}
commit d4abe5ea0f89f9dbff49c1acf5f424f6afd9b5b2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 19 15:55:30 2014 +
coverity#738947 Uninitialized pointer field
Change-Id: I817c0e494bef9f112e1bdc30253fac9bcf472c6a
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ab4c3c9..7e971a1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -238,6 +238,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_xDstDoc(xDstDoc),
m_xFrame(xFrame),
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/uunxapi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f100204736b19339d673f4b469930357de2b969e
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 21:37:51 2014 +0100
loplugin:passstringbyref
Change-Id: I461db4b173dcdc812d3ccc5e3eef8a3dad93b0b0
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 8d495f2..6fb75a1 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -111,14 +111,14 @@ typedef void accessFilePathState;
* Helper function for resolving Mac native alias files (not the same as unix
alias files)
* and to return the resolved alias as rtl::OString
*/
-static rtl::OString macxp_resolveAliasAndConvert(rtl::OString p)
+static rtl::OString macxp_resolveAliasAndConvert(rtl::OString const p)
{
sal_Char path[PATH_MAX];
if (p.getLength() PATH_MAX)
{
strcpy(path, p.getStr());
macxp_resolveAlias(path, PATH_MAX);
-p = rtl::OString(path);
+return rtl::OString(path);
}
return p;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/printaccessoryview.mm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f52dcaa810517195fe6a3b305a6c1097ec32995e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 19 21:53:43 2014 +0100 loplugin:passstringbyref Change-Id: I3189ff08bd984b8f4fa127aeb40e8c13e5cc01c9 diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm index 40e9036..852263a 100644 --- a/vcl/osx/printaccessoryview.mm +++ b/vcl/osx/printaccessoryview.mm @@ -957,7 +957,7 @@ static void addList( NSView* pCurParent, long rCurX, long rCurY, long /*nAttac } static void addEdit( NSView* pCurParent, long rCurX, long rCurY, long nAttachOffset, -const rtl::OUString rCtrlType, +const rtl::OUString rCtrlType, const rtl::OUString rText, const rtl::OUString rProperty, const PropertyValue* pValue, sal_Int64 nMinValue, sal_Int64 nMaxValue, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/firebird-improvement' - connectivity/source
connectivity/source/drivers/firebird/Util.cxx | 108 --
connectivity/source/drivers/firebird/Util.hxx |4
2 files changed, 112 deletions(-)
New commits:
commit 80f477367272ff0c5289250c2d76d35064ab384e
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Mar 19 20:56:07 2014 +
firebird-sdbc: Remove the now-unneeded mallocSQLVAR/freeSQLVAR.
Is all in the Sqlda wrapper and we don't handle raw XSQLDAs anymore.
Change-Id: I30f09e76351a5be9d25464313cd581cb89bae176
diff --git a/connectivity/source/drivers/firebird/Util.cxx
b/connectivity/source/drivers/firebird/Util.cxx
index 74eb00c..4019c185 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -186,112 +186,4 @@ short firebird::getFBTypeFromBlrType(short blrType)
}
}
-void firebird::mallocSQLVAR(XSQLDA* pSqlda)
-{
-// TODO: confirm the sizings below.
-XSQLVAR* pVar = pSqlda-sqlvar;
-for (int i=0; i pSqlda-sqld; i++, pVar++)
-{
-int dtype = (pVar-sqltype ~1); /* drop flag bit for now */
-switch(dtype) {
-case SQL_TEXT:
-pVar-sqldata = (char *)malloc(sizeof(char)*pVar-sqllen);
-break;
-case SQL_VARYING:
-pVar-sqldata = (char *)malloc(sizeof(char)*pVar-sqllen + 2);
-break;
-case SQL_SHORT:
-pVar-sqldata = (char*) malloc(sizeof(sal_Int16));
-break;
-case SQL_LONG:
-pVar-sqldata = (char*) malloc(sizeof(sal_Int32));
-break;
-case SQL_FLOAT:
-pVar-sqldata = (char *)malloc(sizeof(float));
-break;
-case SQL_DOUBLE:
-pVar-sqldata = (char *)malloc(sizeof(double));
-break;
-case SQL_D_FLOAT:
-pVar-sqldata = (char *)malloc(sizeof(double));
-break;
-case SQL_TIMESTAMP:
-pVar-sqldata = (char*) malloc(sizeof(ISC_TIMESTAMP));
-break;
-case SQL_BLOB:
-pVar-sqldata = (char*) malloc(sizeof(ISC_QUAD));
-break;
-case SQL_ARRAY:
-assert(false); // TODO: implement
-break;
-case SQL_TYPE_TIME:
-pVar-sqldata = (char*) malloc(sizeof(ISC_TIME));
-break;
-case SQL_TYPE_DATE:
-pVar-sqldata = (char*) malloc(sizeof(ISC_DATE));
-break;
-case SQL_INT64:
-pVar-sqldata = (char *)malloc(sizeof(sal_Int64));
-break;
-case SQL_NULL:
-assert(false); // TODO: implement
-break;
-case SQL_QUAD:
-assert(false); // TODO: implement
-break;
-default:
-SAL_WARN(connectivity.firebird, Unknown type: dtype);
-assert(false);
-break;
-}
-if (pVar-sqltype 1)
-{
-/* allocate variable to hold NULL status */
-pVar-sqlind = (short *)malloc(sizeof(short));
-}
-}
-}
-
-void firebird::freeSQLVAR(XSQLDA* pSqlda)
-{
-XSQLVAR* pVar = pSqlda-sqlvar;
-for (int i=0; i pSqlda-sqld; i++, pVar++)
-{
-int dtype = (pVar-sqltype ~1); /* drop flag bit for now */
-switch(dtype) {
-case SQL_TEXT:
-case SQL_VARYING:
-case SQL_SHORT:
-case SQL_LONG:
-case SQL_FLOAT:
-case SQL_DOUBLE:
-case SQL_D_FLOAT:
-case SQL_TIMESTAMP:
-case SQL_BLOB:
-case SQL_INT64:
-case SQL_TYPE_TIME:
-case SQL_TYPE_DATE:
-free(pVar-sqldata);
-break;
-case SQL_ARRAY:
-assert(false); // TODO: implement
-break;
-case SQL_NULL:
-assert(false); // TODO: implement
-break;
-case SQL_QUAD:
-assert(false); // TODO: implement
-break;
-default:
-SAL_WARN(connectivity.firebird, Unknown type: dtype);
-assert(false);
-break;
-}
-
-if (pVar-sqltype 1)
-{
-free(pVar-sqlind);
-}
-}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Util.hxx
b/connectivity/source/drivers/firebird/Util.hxx
index 3a992a8..e49c893 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -52,10 +52,6 @@ namespace connectivity
* between the two when retrieving column metadata.
*/
short getFBTypeFromBlrType(short blrType);
-
-void mallocSQLVAR(XSQLDA* pSqlda);
-
-void freeSQLVAR(XSQLDA* pSqlda);
}
}
#endif //CONNECTIVITY_FIREBIRD_UTIL_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/firebird-improvement' - 3 commits - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 55 +
connectivity/source/drivers/firebird/PreparedStatement.hxx |2
connectivity/source/drivers/firebird/wrapper/Sqlda.cxx | 20
connectivity/source/drivers/firebird/wrapper/Sqlda.hxx |8 +
4 files changed, 32 insertions(+), 53 deletions(-)
New commits:
commit dc0af89801e0f6a2105487915259a879533083df
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Mar 19 20:51:59 2014 +
firebird-sdbc: upgrade PreparedStatement to use Sqlda wrapper.
Change-Id: If79a8b1cfe76292054db4417c452f6443e663fda
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 3ddf3b5..4814b91 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -56,7 +56,6 @@ OPreparedStatement::OPreparedStatement( Connection*
_pConnection,
:OStatementCommonBase(_pConnection)
,m_aTypeInfo(_TypeInfo)
,m_sSqlStatement(sql)
-,m_pInSqlda(0)
{
SAL_INFO(connectivity.firebird, OPreparedStatement().
sql: sql);
@@ -71,46 +70,12 @@ void OPreparedStatement::ensurePrepared()
if (m_aStatementHandle)
return;
-ISC_STATUS aErr = 0;
-
-if (!m_pInSqlda)
-{
-m_pInSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(10));
-m_pInSqlda-version = SQLDA_VERSION1;
-m_pInSqlda-sqln = 10;
-}
-
prepareAndDescribeStatement(m_sSqlStatement,
m_aOutSqlda,
-m_pInSqlda);
-
-
-aErr = isc_dsql_describe_bind(m_statusVector,
- m_aStatementHandle,
- 1,
- m_pInSqlda);
+m_aInSqlda);
-if (aErr)
-{
-SAL_WARN(connectivity.firebird, isc_dsql_describe_bind failed);
-}
-else if (m_pInSqlda-sqld m_pInSqlda-sqln) // Not large enough
-{
-short nItems = m_pInSqlda-sqld;
-free(m_pInSqlda);
-m_pInSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(nItems));
-m_pInSqlda-version = SQLDA_VERSION1;
-m_pInSqlda-sqln = nItems;
-isc_dsql_describe_bind(m_statusVector,
- m_aStatementHandle,
- 1,
- m_pInSqlda);
-}
-if (!aErr)
-mallocSQLVAR(m_pInSqlda);
-else
-evaluateStatusVector(m_statusVector, m_sSqlStatement, *this);
+m_aInSqlda.describeStatement(m_aStatementHandle, true);
}
OPreparedStatement::~OPreparedStatement()
@@ -162,12 +127,6 @@ void SAL_CALL OPreparedStatement::close()
throw(SQLException, RuntimeException,
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
OStatementCommonBase::close();
-if (m_pInSqlda)
-{
-freeSQLVAR(m_pInSqlda);
-free(m_pInSqlda);
-m_pInSqlda = 0;
-}
}
void SAL_CALL OPreparedStatement::disposing()
@@ -191,7 +150,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
nParameterIndex,
OString str = OUStringToOString(x , RTL_TEXTENCODING_UTF8 );
-XSQLVAR* pVar = m_pInSqlda-sqlvar + (nParameterIndex - 1);
+XSQLVAR* pVar = m_aInSqlda-sqlvar + (nParameterIndex - 1);
int dtype = (pVar-sqltype ~1); // drop flag bit for now
@@ -268,7 +227,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
m_pConnection-getTransaction(),
m_aStatementHandle,
1,
-m_pInSqlda);
+m_aInSqlda);
if (aErr)
{
SAL_WARN(connectivity.firebird, isc_dsql_execute failed );
@@ -331,7 +290,7 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T
nValue, ISC_SHORT nType)
checkParameterIndex(nIndex);
setParameterNull(nIndex, false);
-XSQLVAR* pVar = m_pInSqlda-sqlvar + (nIndex - 1);
+XSQLVAR* pVar = m_aInSqlda-sqlvar + (nIndex - 1);
if ((pVar-sqltype ~1) != nType)
{
@@ -686,7 +645,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32
nParameterIndex)
throw(SQLException, RuntimeException)
{
ensurePrepared();
-if ((nParameterIndex == 0) || (nParameterIndex m_pInSqlda-sqld))
+if ((nParameterIndex == 0) || (nParameterIndex m_aInSqlda-sqld))
{
::dbtools::throwSQLException(
No column + OUString::number(nParameterIndex),
@@ -698,7 +657,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32
nParameterIndex)
void OPreparedStatement::setParameterNull(sal_Int32 nParameterIndex,
bool bSetNull)
{
-XSQLVAR* pVar = m_pInSqlda-sqlvar + (nParameterIndex - 1);
+XSQLVAR* pVar = m_aInSqlda-sqlvar + (nParameterIndex - 1);
if (pVar-sqltype 1)
{
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/FilterHelper.hxx |6 +-
fpicker/source/aqua/FilterHelper.mm |6 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit f342aba967dab0be6a4ce981c92240d66a1c41b1
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 22:21:41 2014 +0100
loplugin:passstringbyref (and some dead code)
Change-Id: I96f5b58ac000e7535b6759af04be60e738aa2b09
diff --git a/fpicker/source/aqua/FilterHelper.hxx
b/fpicker/source/aqua/FilterHelper.hxx
index c519a21..7facc80 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -112,11 +112,7 @@ private:
OUString m_aCurrentFilter;
NSStringList *m_pFilterNames;
-int implAddFilter( const OUString rFilter, const OUStringList rSuffixList);
-int implAddFilterGroup( const OUString rFilter,
-const ::com::sun::star::uno::Sequence
::com::sun::star::beans::StringPair _rFilters );
-
-sal_Bool FilterNameExists( const OUString rTitle );
+sal_Bool FilterNameExists( const OUString rTitle );
sal_Bool FilterNameExists( const UnoFilterList _rGroupedFilters );
void ensureFilterList( const OUString _rInitialCurrentFilter );
diff --git a/fpicker/source/aqua/FilterHelper.mm
b/fpicker/source/aqua/FilterHelper.mm
index 5ee7b44..ef048f2 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -92,7 +92,7 @@ isFilterString( const rtl::OUString rFilterString, const
char *pMatch )
static rtl::OUString
-shrinkFilterName( const rtl::OUString aFilterName, bool bAllowNoStar = false )
+shrinkFilterName( const rtl::OUString aFilterName, bool bAllowNoStar = false )
{
// DBG_PRINT_ENTRY(CLASS_NAME, shrinkFilterName, filterName,
aFilterName);
@@ -130,7 +130,7 @@ protected:
const rtl::OUString rTitle;
public:
-FilterTitleMatch( const rtl::OUString _rTitle ) : rTitle( _rTitle ) { }
+FilterTitleMatch( const rtl::OUString _rTitle ) : rTitle( _rTitle ) {
}
bool operator () ( const FilterEntry _rEntry )
@@ -203,7 +203,7 @@ FilterHelper::~FilterHelper()
}
-sal_Bool FilterHelper::FilterNameExists( const rtl::OUString rTitle )
+sal_Bool FilterHelper::FilterNameExists( const rtl::OUString rTitle )
{
sal_Bool bRet = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/shutdowniconaqua.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04fcf88c61cb525eef6b9a09701dac8de3634f90
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 22:31:19 2014 +0100
loplugin:passstringbyref
Change-Id: I53e8d7d976f37a0dcf09200713ea418ed024305d
diff --git a/sfx2/source/appl/shutdowniconaqua.mm
b/sfx2/source/appl/shutdowniconaqua.mm
index 2b922dc..29cd579 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -295,7 +295,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1 ::com::sun::star
static RecentMenuDelegate* pRecentDelegate = nil;
-static rtl::OUString getShortCut( const rtl::OUString i_rTitle )
+static rtl::OUString getShortCut( const rtl::OUString i_rTitle )
{
// create shortcut
rtl::OUString aKeyEquiv;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/macab/MacabAddressBook.cxx |8
connectivity/source/drivers/macab/MacabAddressBook.hxx |8
connectivity/source/drivers/macab/MacabHeader.cxx|2 +-
connectivity/source/drivers/macab/MacabHeader.hxx|2 +-
connectivity/source/drivers/macab/MacabRecord.cxx|2 +-
connectivity/source/drivers/macab/MacabRecord.hxx|2 +-
connectivity/source/drivers/macab/MacabRecords.cxx | 10 +-
connectivity/source/drivers/macab/MacabRecords.hxx | 10 +-
connectivity/source/drivers/macab/MacabResultSet.cxx |2 +-
connectivity/source/drivers/macab/MacabResultSet.hxx |2 +-
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx |2 +-
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx |2 +-
connectivity/source/drivers/macab/macabutilities.hxx |2 +-
13 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 12b2461a45214fe3a62ca20fe05fb2ea90a5fa5c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 19 22:49:09 2014 +0100
loplugin:passstringbyref
Change-Id: Ibd88c8d980072801f533103cd16d2c3a5e9b8fc5
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx
b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 48559c8..d1040f6 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -93,7 +93,7 @@ MacabRecords *MacabAddressBook::getMacabRecords()
/* Get the MacabRecords for a given name: either a group name or the
* default table name.
*/
-MacabRecords *MacabAddressBook::getMacabRecords(const OUString _tableName)
+MacabRecords *MacabAddressBook::getMacabRecords(const OUString _tableName)
{
if(_tableName == getDefaultTableName())
{
@@ -106,7 +106,7 @@ MacabRecords *MacabAddressBook::getMacabRecords(const
OUString _tableName)
}
-MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName)
+MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString
_tableName)
{
if(match(_tableName, getDefaultTableName(), '\0'))
{
@@ -155,7 +155,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const
OUString _tableName)
}
-MacabGroup *MacabAddressBook::getMacabGroup(OUString _groupName)
+MacabGroup *MacabAddressBook::getMacabGroup(OUString const _groupName)
{
// initialize groups if not already initialized
if(m_bRetrievedGroups == sal_False)
@@ -179,7 +179,7 @@ MacabGroup *MacabAddressBook::getMacabGroup(OUString
_groupName)
}
-MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString _groupName)
+MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString const _groupName)
{
// initialize groups if not already initialized
if(m_bRetrievedGroups == sal_False)
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx
b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index dbb9477..34a0135 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -51,11 +51,11 @@ namespace connectivity
MacabRecords *getMacabRecords();
::std::vectorMacabGroup * getMacabGroups();
-MacabGroup *getMacabGroup(OUString _groupName);
-MacabRecords *getMacabRecords(const OUString _tableName);
+MacabGroup *getMacabGroup(const OUString _groupName);
+MacabRecords *getMacabRecords(const OUString _tableName);
-MacabGroup *getMacabGroupMatch(OUString _groupName);
-MacabRecords *getMacabRecordsMatch(const OUString _tableName);
+MacabGroup *getMacabGroupMatch(const OUString _groupName);
+MacabRecords *getMacabRecordsMatch(const OUString _tableName);
};
}
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx
b/connectivity/source/drivers/macab/MacabHeader.cxx
index 6d0eb20..a12ce3d 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -264,7 +264,7 @@ sal_Int32 MacabHeader::compareFields(const macabfield
*_field1, const macabfield
}
-sal_Int32 MacabHeader::getColumnNumber(const OUString s) const
+sal_Int32 MacabHeader::getColumnNumber(const OUString s) const
{
sal_Int32 i;
for(i = 0; i size; i++)
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx
b/connectivity/source/drivers/macab/MacabHeader.hxx
index c328484..7f7f260 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -37,7 +37,7 @@ namespace connectivity
void operator+= (const MacabHeader *r);
OUString getString(const sal_Int32 i) const;
void sortRecord();
-sal_Int32
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc |5 ++-
sc/source/ui/inc/preview.hxx |1
sc/source/ui/inc/printfun.hxx |3 +
sc/source/ui/src/globstr.src | 10 ++
sc/source/ui/view/preview.cxx | 63 +
sc/source/ui/view/printfun.cxx | 19 +++-
6 files changed, 98 insertions(+), 3 deletions(-)
New commits:
commit 9040ef49f0b2886a51630878c06b2fb9cf94b927
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Mar 19 14:05:04 2014 -0400
cp#122: Display message in print preview when there is nothing to show.
To make this experience slightly less confusing.
Change-Id: I844dd2cdbc0349433d445955cdcf5e9723673286
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 3dfb79b..8456944 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -689,7 +689,10 @@
#define STR_ROWCOL_SELCOUNT 528
-#define SC_GLOBSTR_STR_COUNT529 /** the count of permanently
resident strings */
+#define STR_PRINT_PREVIEW_NODATA529
+#define STR_PRINT_PREVIEW_EMPTY_RANGE 530
+
+#define SC_GLOBSTR_STR_COUNT531 /** the count of permanently
resident strings */
#endif
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index fe1f642..f9d1b5c 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -80,6 +80,7 @@ private:
boolbFooterRulerChange:1;
boolbPageMargin:1;
boolbColRulerMove:1;
+boolmbHasEmptyRangeTable:1; /// we have at least one sheet
with empty print range (print range set to '- none -').
ScRange aPageArea;
longnRight[ MAXCOL+1 ];
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index a0306b0..47a2a4e 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -167,6 +167,7 @@ private:
sal_uInt16 nZoom;
boolbPrintCurrentTable;
boolbMultiArea;
+boolmbHasPrintRange;
longnTabPages;
longnTotalPages;
@@ -276,6 +277,8 @@ public:
ScPrintHFParam GetHeader(){return aHdr;}
ScPrintHFParam GetFooter(){return aFtr;}
+bool HasPrintRange() const;
+
private:
voidConstruct( const ScPrintOptions* pOptions );
voidInitParam( const ScPrintOptions* pOptions );
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 82eb914..9897db3 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2061,6 +2061,16 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = click to open hyperlink:;
};
+
+String STR_PRINT_PREVIEW_NODATA
+{
+Text [ en-US ] = Empty Content;
+};
+
+String STR_PRINT_PREVIEW_EMPTY_RANGE
+{
+Text [ en-US ] = Empty Print Range;
+};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 5d2b015..9930741 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -53,6 +53,8 @@
#include svx/algitem.hxx
#include editeng/lrspitem.hxx
#include editeng/ulspitem.hxx
+#include editeng/colritem.hxx
+#include editeng/fhgtitem.hxx
#include attrib.hxx
#include pagepar.hxx
#include com/sun/star/accessibility/XAccessible.hpp
@@ -60,6 +62,10 @@
#include vcl/svapp.hxx
#include viewutil.hxx
#include columnspanset.hxx
+#include docpool.hxx
+#include patattr.hxx
+
+#include boost/scoped_ptr.hpp
// STATIC DATA ---
@@ -118,6 +124,7 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh,
ScPreviewShell* pView
bFooterRulerChange( false ),
bPageMargin ( false ),
bColRulerMove( false ),
+mbHasEmptyRangeTable(false),
mnScale( 0 ),
nColNumberButttonDown( 0 ),
nHeaderHeight ( 0 ),
@@ -258,6 +265,9 @@ void ScPreview::CalcPages()
long nThisStart = nTotalPages;
ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL,
aOptions );
long nThisTab = aPrintFunc.GetTotalPages();
+if (!aPrintFunc.HasPrintRange())
+mbHasEmptyRangeTable = true;
+
nPages[i] = nThisTab;
nTotalPages += nThisTab;
nFirstAttr[i] = aPrintFunc.GetFirstPageNo();// to keep or from
template
@@ -481,6 +491,59 @@ void ScPreview::DoPrint( ScPreviewLocationData*
pFillLocation )
bool bRight = nPageEndX = aWinEnd.X();
bool bBottom = nPageEndY = aWinEnd.Y();
+if (!nTotalPages)
+{
+// There is no data to print. Print a friendly warning message and
+// bail out.
+
+SetMapMode(aMMMode);
+
+// Draw background first.
+SetLineColor();
+SetFillColor(aBackColor);
+DrawRect(Rectangle(0, 0, aWinEnd.X(),
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 56048, which changed state. Bug 56048 Summary: FILEOPEN: LibreOffice cannot open .docx file in strict variant https://bugs.freedesktop.org/show_bug.cgi?id=56048 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
HELP: How to use SpellChecker
Hi folks, I'm trying to use SpellChecker from python via pyUNO. I've a simple question, but maybe the solution isn't. Is it possible to SpellCheck a text or just word by word? If it is, can someone point me the right direction? Can be in the LibreOffice code, doesn't need to be Python. Just to explain why, I'm using LibreOffice API to make an online SpellChecker for a class work. Best regards, Alexandre Vicenzi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/inc sc/source
sc/inc/globstr.hrc |5 ++-
sc/source/ui/inc/preview.hxx |1
sc/source/ui/inc/printfun.hxx |3 +
sc/source/ui/src/globstr.src | 10 ++
sc/source/ui/view/preview.cxx | 63 +
sc/source/ui/view/printfun.cxx | 19 +++-
6 files changed, 98 insertions(+), 3 deletions(-)
New commits:
commit c1d0f15f673c26feaf377896f91f751ca96bbc46
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Mar 19 14:05:04 2014 -0400
cp#122: Display message in print preview when there is nothing to show.
To make this experience slightly less confusing.
(cherry picked from commit 9040ef49f0b2886a51630878c06b2fb9cf94b927)
Conflicts:
sc/inc/globstr.hrc
sc/source/ui/inc/printfun.hxx
sc/source/ui/src/globstr.src
sc/source/ui/view/preview.cxx
sc/source/ui/view/printfun.cxx
Change-Id: I844dd2cdbc0349433d445955cdcf5e9723673286
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 7dc6cd6..53e6e30 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -673,7 +673,10 @@
#define STR_FUN_TEXT_SELECTION_COUNT546
-#define STR_COUNT 547
+#define STR_PRINT_PREVIEW_NODATA547
+#define STR_PRINT_PREVIEW_EMPTY_RANGE 548
+
+#define STR_COUNT 549
#endif
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index d88d973..2ecc07c 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -80,6 +80,7 @@ private:
boolbFooterRulerChange:1;
boolbPageMargin:1;
boolbColRulerMove:1;
+boolmbHasEmptyRangeTable:1; /// we have at least one sheet
with empty print range (print range set to '- none -').
ScRange aPageArea;
longnRight[ MAXCOL+1 ];
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 7273283..3e42715 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -167,6 +167,7 @@ private:
sal_uInt16 nZoom;
sal_BoolbPrintCurrentTable;
sal_BoolbMultiArea;
+boolmbHasPrintRange;
longnTabPages;
longnTotalPages;
@@ -275,6 +276,8 @@ public:
ScPrintHFParam GetHeader(){return aHdr;}
ScPrintHFParam GetFooter(){return aFtr;}
+bool HasPrintRange() const;
+
private:
voidConstruct( const ScPrintOptions* pOptions );
voidInitParam( const ScPrintOptions* pOptions );
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index b9ffd2a..ee64094 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2065,6 +2065,16 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = Invalid condition. ;
};
+
+String STR_PRINT_PREVIEW_NODATA
+{
+Text [ en-US ] = Empty Content;
+};
+
+String STR_PRINT_PREVIEW_EMPTY_RANGE
+{
+Text [ en-US ] = Empty Print Range;
+};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 8ad3ec4..776a265 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -52,12 +52,18 @@
#include svx/algitem.hxx
#include editeng/lrspitem.hxx
#include editeng/ulspitem.hxx
+#include editeng/colritem.hxx
+#include editeng/fhgtitem.hxx
#include attrib.hxx
#include pagepar.hxx
#include com/sun/star/accessibility/XAccessible.hpp
#include AccessibilityHints.hxx
#include vcl/svapp.hxx
#include viewutil.hxx
+#include docpool.hxx
+#include patattr.hxx
+
+#include boost/scoped_ptr.hpp
// STATIC DATA ---
@@ -116,6 +122,7 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh,
ScPreviewShell* pView
bFooterRulerChange( false ),
bPageMargin ( false ),
bColRulerMove( false ),
+mbHasEmptyRangeTable(false),
mnScale( 0 ),
nColNumberButttonDown( 0 ),
nHeaderHeight ( 0 ),
@@ -256,6 +263,9 @@ void ScPreview::CalcPages()
long nThisStart = nTotalPages;
ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL,
aOptions );
long nThisTab = aPrintFunc.GetTotalPages();
+if (!aPrintFunc.HasPrintRange())
+mbHasEmptyRangeTable = true;
+
nPages[i] = nThisTab;
nTotalPages += nThisTab;
nFirstAttr[i] = aPrintFunc.GetFirstPageNo();// to keep or from
template
@@ -479,6 +489,59 @@ void ScPreview::DoPrint( ScPreviewLocationData*
pFillLocation )
bool bRight = nPageEndX = aWinEnd.X();
bool bBottom = nPageEndY = aWinEnd.Y();
+if (!nTotalPages)
+{
+// There is no data to print. Print a friendly warning message and
+// bail out.
+
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/globstr.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f277f8eca83475f7bb1d95c75d5de53ad4d26578
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Mar 19 20:05:02 2014 -0400
Chnage the wording for empty preview messages.
Change-Id: I90e12d6e2999522ef0d252e1592b8649e8e4560c
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 9897db3..b55ae11 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2064,12 +2064,12 @@ Resource RID_GLOBSTR
String STR_PRINT_PREVIEW_NODATA
{
-Text [ en-US ] = Empty Content;
+Text [ en-US ] = No Data;
};
String STR_PRINT_PREVIEW_EMPTY_RANGE
{
-Text [ en-US ] = Empty Print Range;
+Text [ en-US ] = Print Range Empty;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/src/globstr.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit db356b1148c3bfd98ef5e54bcef1223f714f6acc
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Mar 19 20:05:02 2014 -0400
Chnage the wording for empty preview messages.
Change-Id: I90e12d6e2999522ef0d252e1592b8649e8e4560c
(cherry picked from commit f277f8eca83475f7bb1d95c75d5de53ad4d26578)
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index ee64094..a408cb0 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2068,12 +2068,12 @@ Resource RID_GLOBSTR
String STR_PRINT_PREVIEW_NODATA
{
-Text [ en-US ] = Empty Content;
+Text [ en-US ] = No Data;
};
String STR_PRINT_PREVIEW_EMPTY_RANGE
{
-Text [ en-US ] = Empty Print Range;
+Text [ en-US ] = Print Range Empty;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source drawinglayer/source
chart2/source/view/inc/DateHelper.hxx |3 -
chart2/source/view/main/OpenGLRender.cxx |2 -
drawinglayer/source/attribute/fillgraphicattribute.cxx|2 -
drawinglayer/source/primitive2d/controlprimitive2d.cxx|4 --
drawinglayer/source/primitive2d/graphicprimitive2d.cxx|2 -
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 16 --
drawinglayer/source/processor2d/processorfromoutputdevice.cxx |5 ---
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx| 13
drawinglayer/source/processor3d/zbufferprocessor3d.cxx|9 -
9 files changed, 1 insertion(+), 55 deletions(-)
New commits:
commit e5cf1d8c0352e99e13ed25b666895c21d8f1189b
Author: peilin pei...@multicorewareinc.com
Date: Tue Mar 18 16:55:03 2014 +0800
fix the scale size of bubble
Change-Id: I633e2ff112e21488b9d17ffbb59a926b22b51952
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 689925a..76c19cb 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -852,7 +852,7 @@ int OpenGLRender::RenderBubble2FBO(int)
Bubble2DPointList pointList = m_Bubble2DShapePointList.front();
PosVecf3 trans = {pointList.x, pointList.y, m_fZStep};
PosVecf3 angle = {0.0f, 0.0f, 0.0f};
-PosVecf3 scale = {pointList.xScale, pointList.yScale, 1.0f};
+PosVecf3 scale = {pointList.xScale / 2, pointList.yScale / 2 , 1.0f};
MoveModelf(trans, angle, scale);
m_MVP = m_Projection * m_View * m_Model;
//render to fbo
commit 8c347455848c9b15841b796785fc147a6e79c60b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Mar 19 02:09:50 2014 +0100
remove empty comment
Change-Id: Ie5f5e6c92845933403b2371400fcdba10eba1a42
diff --git a/chart2/source/view/inc/DateHelper.hxx
b/chart2/source/view/inc/DateHelper.hxx
index 3c80674..3142e90 100644
--- a/chart2/source/view/inc/DateHelper.hxx
+++ b/chart2/source/view/inc/DateHelper.hxx
@@ -25,9 +25,6 @@
namespace chart
{
-/**
-*/
-
class DateHelper
{
public:
commit 092eecb7d7bf6ffc08c4d83a78ec3ed741db7162
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Mar 18 01:22:28 2014 +0100
remove whitespace
Change-Id: I81a24a7affa7dffcc3dac65248444679c3c49925
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx
b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 0e3bc2f..bd7b98e 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -20,8 +20,6 @@
#include drawinglayer/attribute/fillgraphicattribute.hxx
#include vcl/graph.hxx
-
-
namespace drawinglayer
{
namespace attribute
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 334288e..58388e4 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -37,12 +37,8 @@
#include vcl/window.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
-
-
using namespace com::sun::star;
-
-
namespace drawinglayer
{
namespace primitive2d
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 2fa4a94..ab7e1e3 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -28,8 +28,6 @@
#include vcl/svapp.hxx
#include vcl/outdev.hxx
-
-
namespace drawinglayer
{
namespace primitive2d
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 53d890b..7fc6426 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -29,7 +29,6 @@
#include basegfx/polygon/b2dpolygontools.hxx
#include basegfx/numeric/ftools.hxx
-
// helper class for animated graphics
#include vcl/animate.hxx
@@ -38,11 +37,6 @@
#include vcl/svapp.hxx
#include vcl/metaact.hxx
-
-// includes for testing MetafilePrimitive2D::create2DDecomposition
-
-
-
namespace
{
struct animationStep
@@ -195,8 +189,6 @@ namespace
}
} // end of anonymous namespace
-
-
namespace drawinglayer
{
namespace primitive2d
@@ -323,15 +315,7 @@ namespace drawinglayer
return aRetval;
}
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
Primitive2DSequence create2DColorModifierEmbeddingsAsNeeded(
const Primitive2DSequence rChildren,
GraphicDrawMode aGraphicDrawMode,
diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - framework/source
framework/source/services/autorecovery.cxx |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 827d7dbf3b75e61f63c769ce41634e890a608455 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Mar 14 09:42:02 2014 +0100 fdo#51819: autorecovery: fix saving password in protected documents. Thanks to s...@mailinator.com for the idea. Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c (cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219) Reviewed-on: https://gerrit.libreoffice.org/8633 Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8a32d78..3a18af4 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2305,9 +2305,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString // if the document was loaded with a password, it should be // stored with password utl::MediaDescriptor lNewArgs; -OUString sPassword = lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), OUString()); -if (!sPassword.isEmpty()) -lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] = sPassword; +css::uno::Sequence css::beans::NamedValue aEncryptionData = + lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA(), +css::uno::Sequence css::beans::NamedValue ()); +if (aEncryptionData.getLength() 0) +lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] = aEncryptionData; // Further it must be saved using the default file format of that application. // Otherwhise we will some data lost. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 62957] FILESAVE: Save Last Slide Position in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=62957 --- Comment #10 from Kumāra kumaras...@gmail.com --- (In reply to comment #9) i am currently working on this bug, i ll keep the status updated.. Just like to say thanks to all who are contributing to this request. With presentations with over a hundred slides, this fix will be a great saver. -- 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
GSOC 2014 - Proposal Template
Hi, Is there any template for the GSOC Project Proposal, or does the applicant have to present it in his own way. Thanks Regards -- *Lakmal Muthugama,* *Undergraduate,* *Department of Computer Science and Engineering,* *University of Moratuwa,* *Sri Lanka.* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
No SSL support included in this Python in 4.2 LibreOffice Relise
Hi. I get an error No SSL support included in this Python in 4.2 Libre Office Relise when I test my email settings in Service\Setup\ LibreOffice Writer mail settings\Test settings and check the ssl option in this form. And the letters not send when I use Service\Mail merge. I use LibreOffice 4.2 relice on Windows 2008 R2 Server x64 SP1. See full error description: class 'RuntimeError': No SSL support included in this Python, traceback follows C:\Program Files (x86)\LibreOffice 4\program\python-core-3.3.3\lib\smtplib.py:660 in function starttls() [raise RuntimeError(No SSL support included in this Python)] C:\Program Files (x86)\LibreOffice 4\program\mailmerge.py:114 in function connect() [self.server.starttls()] Thanks a lot, Ruslan Agapov, Russia http://detsad10-ufa.ru ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 76233] LibreOffice Writer crash save as / LibreOffice Writer pdf export crash
https://bugs.freedesktop.org/show_bug.cgi?id=76233 Peter Stolz p.stol...@gmail.com changed: What|Removed |Added Severity|normal |major -- 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 37559] 1x1 extra points in some shapes violate PDF export
https://bugs.freedesktop.org/show_bug.cgi?id=37559 Mike Kaganski mikekagan...@hotmail.com changed: What|Removed |Added CC|pascal.gagg...@bfh.ch |mikekagan...@hotmail.com Version|3.3.1 release |3.3.0 release Component|Drawing |graphics stack --- Comment #73 from Mike Kaganski mikekagan...@hotmail.com --- Adjusting the earliest affected version to 3.3.0 (according to comment 54 and my own testing - already REPRODUCIBLE with 3.3.0.4 under Win7x64). Adjusting the component: this problem not only affect Draw, but also any other module capable of using shapes, connectors etc. Tested with Version 4.3.0.0.alpha0+ Build ID: 335a8a84fe6349fd716d4978346cfff9c884dd9b, both Writer and Calc produce PDFs with dots around smileys (although there seems to be no way to convert them to polygons). Not sure if graphic stack is a proper component, maybe should be more generic Libreoffice? Removing defunct CC address with autoreply robot on other side (expecting one more unwanted message). I have a proposition. What if we don't fix this, but simply call it feature: imagine the new LO logo having smiling face and those two (not so tiny) dots! '*_*, -- 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 76346] New: FORMATTING: the page number in the view- page break preview does not show correctly
https://bugs.freedesktop.org/show_bug.cgi?id=76346 Priority: medium Bug ID: 76346 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: the page number in the view- page break preview does not show correctly Severity: normal Classification: Unclassified OS: All Reporter: ahamedck...@yahoo.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.1.2 release Component: Spreadsheet Product: LibreOffice Problem description: The page number in the view- page break preview does not show correctly. suppose there are two sheets only and in each sheet contain THREE pages of data only. while in sheet 2 then select the first sheet also using CTL button pressed or SHFT button pressed, then in the second sheet page number should reflect the page number considering the whole two sheets ie. it should start the page number from 4 then 5 and then 6 etc. Steps to reproduce: 1. 2. 3. Current behavior: the page number shows only 1 2 3 etc, not 4 , 5 and then 6 Expected behavior: it should show 4 , 5 and then 6 (THIS should be the case when the first page number is insisted to get started with yet another number say 10 then the page numbers should reflect 11 then, 12 and then 13 etc. Operating System: All Version: 4.1.1.2 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 76346] FORMATTING: the page number in the view- page break preview does not show correctly
https://bugs.freedesktop.org/show_bug.cgi?id=76346 Ahamed ahamedck...@yahoo.com changed: What|Removed |Added Severity|normal |major Priority|medium |high --- Comment #1 from Ahamed ahamedck...@yahoo.com --- Also I wish to have a pageNo() function something similar to that in http://www.oraxcel.com/projects/litlib/ for MS office -- 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 76346] FORMATTING: the page number in the view- page break preview does not show correctly
https://bugs.freedesktop.org/show_bug.cgi?id=76346 Ahamed ahamedck...@yahoo.com changed: What|Removed |Added Severity|normal |major Priority|medium |high -- 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 76346] FORMATTING: the page number in the view- page break preview does not show correctly
https://bugs.freedesktop.org/show_bug.cgi?id=76346 Ahamed ahamedck...@yahoo.com changed: What|Removed |Added Severity|major |normal Priority|high|medium --- Comment #2 from Ahamed ahamedck...@yahoo.com --- Also I wish to have the pageNo() function something similar to that is available in MS Office through http://www.oraxcel.com/projects/litlib/ -- 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 56036] DATALOSS IMPORT XLSX: CRLF (newline) in formula garbles the formula
https://bugs.freedesktop.org/show_bug.cgi?id=56036 Mike Kaganski mikekagan...@hotmail.com changed: What|Removed |Added Attachment #80214|0 |1 is obsolete|| -- 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 76337] WIKI: internal error
https://bugs.freedesktop.org/show_bug.cgi?id=76337 Volker Merschmann merschm...@gmail.com changed: What|Removed |Added CC||a...@documentfoundation.org ||, cl...@cup.uni-muenchen.de --- Comment #4 from Volker Merschmann merschm...@gmail.com --- I understand you came from https://www.libreoffice.org/get-help/feedback/ Can you tell us which inputs you did? -- 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 76347] New: [UI] the popup of drawing toolbox icon won't go upside but going down
https://bugs.freedesktop.org/show_bug.cgi?id=76347 Priority: medium Bug ID: 76347 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: [UI] the popup of drawing toolbox icon won't go upside but going down Severity: normal Classification: Unclassified OS: All Reporter: mail2to...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.2.1 release Component: Writer Product: LibreOffice Created attachment 96029 -- https://bugs.freedesktop.org/attachment.cgi?id=96029action=edit showing the error of drawing toolbar icon The icon in the drawing toolbar is not normally behave. The pop-up is going down when clicked. The writer must be resize for access the tool/icon. -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 74401, which changed state. Bug 74401 Summary: FILEOPEN: DOCX: Figures with text which are on canvas become rectangles https://bugs.freedesktop.org/show_bug.cgi?id=74401 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. 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 76347] [UI] the popup of drawing toolbox icon won't go upside but going down
https://bugs.freedesktop.org/show_bug.cgi?id=76347 kr1st0 mail2to...@gmail.com changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) OS|All |Linux (All) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72966] [FILESAVE] LibreOffice-4 creates fake SVM files
https://bugs.freedesktop.org/show_bug.cgi?id=72966 --- Comment #7 from ape idler@mail.ru --- (In reply to comment #4) I see, that dpi of the png has been reduced from OOo341 to LO41. But that is a different issue than using svm and effects the embedded .png file as well. What do you want to be the content of the .svm file? ODF1.0 makes only sense to be read from old OOo versions, and those cannot read .svg format. So you would need to break the .svg image into Draw objects. I saw that SVM format is also used in the charts. Look at this attachment 93391 (Eckert.ods\Object 2\Pictures\..). -- 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 76348] New: FILESAVE: crash saving particular .docx file
https://bugs.freedesktop.org/show_bug.cgi?id=76348 Priority: medium Bug ID: 76348 CC: ravindra.vidh...@synerzip.com Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: crash saving particular .docx file Severity: major Classification: Unclassified OS: All Reporter: jore...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Depends on: 76312 Product: LibreOffice Created attachment 96031 -- https://bugs.freedesktop.org/attachment.cgi?id=96031action=edit Assertion error message +++ This bug was initially created as a clone of Bug #76312 +++ How to reproduce: * Download attachment 95994 * Open using LibreOffice * Save as .docx Behavior: crash Tested using Windows 8.1 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 87efec9cc27b18aa09e50c289b503ba1127eb0b8 TinderBox: Win-x86@39, Branch:master, Time: 2014-03-18_02:50:50 Not sure the attached assertion message is related to this crash. And I'm not sure this build from tinderbox 39 is a debug build. (Not sure why it crashes on assertion). Kind regards, Joren -- 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 76348] FILESAVE: crash saving particular .docx file
https://bugs.freedesktop.org/show_bug.cgi?id=76348 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #96031|text/plain |image/png mime type|| -- 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 76348] FILESAVE: crash saving particular .docx file
https://bugs.freedesktop.org/show_bug.cgi?id=76348 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on|76312 | Blocks||76312 -- 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 74787] Crash on importing template
https://bugs.freedesktop.org/show_bug.cgi?id=74787 Jorendc jore...@libreoffice.org changed: What|Removed |Added CC||stephenaustinm...@gmail.com --- Comment #11 from Jorendc jore...@libreoffice.org --- *** Bug 76342 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76342] FILEOPEN: Unexpected crash upon editing template
https://bugs.freedesktop.org/show_bug.cgi?id=76342 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Jorendc jore...@libreoffice.org --- This issue is fixed, thanks to http://cgit.freedesktop.org/libreoffice/core/commit/?id=b071644756772d0b6930ac2e6d27237b67e7febc which is fixed in bug 74787 and other bug reports. This problem is all related to a (de-)selection bug. Can you please retest using LibreOffice 4.2.3 or later (you can download the RC here: http://www.libreoffice.org/download/libreoffice-fresh/?version=4.2.3). Feel free if you can still reproduce this behavior with this version or later. Kind regards, Joren *** This bug has been marked as a duplicate of bug 74787 *** -- 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 76348] FILESAVE: crash saving particular .docx file
https://bugs.freedesktop.org/show_bug.cgi?id=76348 Ravindra Vidhate ravindra.vidh...@synerzip.com changed: What|Removed |Added Depends on||76074 -- 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 76074] FILESAVE : LO crashes while saving the DOCX file
https://bugs.freedesktop.org/show_bug.cgi?id=76074 Ravindra Vidhate ravindra.vidh...@synerzip.com changed: What|Removed |Added Blocks||76348 -- 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 76349] New: FILEOPEN: DOCX : 'Page Break - Column Break' (in 1 column per page) not being preserved in RT
https://bugs.freedesktop.org/show_bug.cgi?id=76349 Priority: medium Bug ID: 76349 CC: jore...@libreoffice.org, pallavi.jad...@synerzip.com, pje335...@hotmail.com Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: DOCX : 'Page Break - Column Break' (in 1 column per page) not being preserved in RT Severity: normal Classification: Unclassified OS: All Reporter: jore...@libreoffice.org Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Depends on: 74153 Product: LibreOffice This bug is about the FILEOPEN part of bug 74153. Thanks to the fix of bug 74153, the column break is being preserved during roundtrip. Only issue left is the fact it isn't imported correctly in LibreOffice. +++ This bug was initially created as a clone of Bug #74153 +++ Steps to reproduce : 1] Open attached document in LO Current behavior : Document containing Column break(1 column per page) is displayed as a document without a Column break. Expected behavior : Text 'This is text in the 2nd page (after a column break).' should be on the second page. Tested using Windows 8.1 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 87efec9cc27b18aa09e50c289b503ba1127eb0b8 TinderBox: Win-x86@39, Branch:master, Time: 2014-03-18_02:50:50 Kind regards, Joren -- 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 76349] FILEOPEN: DOCX : 'Page Break - Column Break' (in 1 column per page) not correctly imported
https://bugs.freedesktop.org/show_bug.cgi?id=76349 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW Summary|FILEOPEN: DOCX : 'Page |FILEOPEN: DOCX : 'Page |Break - Column Break' (in 1 |Break - Column Break' (in 1 |column per page) not being |column per page) not |preserved in RT |correctly imported Ever confirmed|0 |1 --- Comment #1 from Jorendc jore...@libreoffice.org --- Already confirmed in bug 74153 thanks to Thomas. -- 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 76350] New: EDITING: Calculation errors
https://bugs.freedesktop.org/show_bug.cgi?id=76350 Priority: medium Bug ID: 76350 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Calculation errors Severity: normal Classification: Unclassified OS: Windows (All) Reporter: j...@lesberries.co.uk Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.1.1 release Component: Spreadsheet Product: LibreOffice Created attachment 96032 -- https://bugs.freedesktop.org/attachment.cgi?id=96032action=edit Snapshot showing errors on recently edited lines but not on earlier. Problem description: Entering a reference to another cell as part of a calculation produces a #VALUE error. However, if saved and opened in an earlier version, displays correctly. Error is not consistent. Identical calculations on different rows work or don't work. See attachment Operating System: Windows XP Version: 4.2.1.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73206] NoSuchElementException from acceleratorconfiguration.cxx:126
https://bugs.freedesktop.org/show_bug.cgi?id=73206 --- Comment #3 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #2) I observe the error message (BASIC-runtime-error [...] com.sun.star.container.NoSuchElementException, message: .) with version 4.2.2.1 when saving a writer document that has BASIC macros. Error message does not occur with version 4.1.5. Error message does occur with version 4.3.0.0-alpha0+ (master, last pull yesterday). I cannot reproduce the error with the steps in comment#1, neither with version 4.2.2 nor with master. Both give 8.6 when running the macro. Our problem has been 'fixed' by changing the macro, which was looking for a table with a non-existing name. As the problem did not occur with version 4.1.5 (and doesn't with the modified macro), something has changed in Writer. But FWIW that may also be an improvement, i.e. detecting a mismatch that was disrearded before. BTW, the macro -which just puts a version number in a table in the page footer- works on all versions. -- 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 43938] UI: Default area color without name in Impress/Draw
https://bugs.freedesktop.org/show_bug.cgi?id=43938 Jan Holesovsky ke...@collabora.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #22 from Jan Holesovsky ke...@collabora.com --- Looks like this is resolved by: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c59320fe391ac98ad344623f803583c26a9b93c -- 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 38414] FILEOPEN FORMATTING complex table layout in DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=38414 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|target:4.3.0 target:4.2.4 |target:4.3.0 target:4.2.4 ||target:4.1.6 --- Comment #9 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- LuboÅ¡ LuÅak committed a patch related to this issue. It has been pushed to libreoffice-4-1: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e8b686149f2a9f21a7a52bb5710a8a6362cd7a35h=libreoffice-4-1 workaround for rounding errors when handling merged cells (fdo#38414) It will be available in LibreOffice 4.1.6. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 76249] FILESAVE: DOCX with Locked Canvas inside a text box corrupts after round trip
https://bugs.freedesktop.org/show_bug.cgi?id=76249 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED CC||jore...@libreoffice.org --- Comment #5 from Jorendc jore...@libreoffice.org --- Hi Vinaya, Thanks for fixing the corruption! I can confirm that attachment 95907 is not corrupt after roundtripping. The image in the optimized file isn't preserved after roundtripping? Is this due the fact this is a PolyPolygon, and we just ignore the writing of it (see comment 3 of bug 75254)? Tested using Windows 8.1 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 90dd4320de6ace24e464979630a2c9fbab35f64b TinderBox: Win-x86@39, Branch:master, Time: 2014-03-19_00:22:53 Kind regards, Joren -- 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 74983] ACCESSIBILITY: Instability in A11y after integration of IA2-branch
https://bugs.freedesktop.org/show_bug.cgi?id=74983 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|BSA |BSA target:4.3.0 --- Comment #3 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Niklas Johansson committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3fa4b0a00f78e940b32d546bac410890719502fd fdo#74983: Instability in A11y after integration of IA2-branch The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 76351] New: FILESAVE: Severe performance issues of Writer saving file with linked graphics
https://bugs.freedesktop.org/show_bug.cgi?id=76351 Priority: medium Bug ID: 76351 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Severe performance issues of Writer saving file with linked graphics Severity: normal Classification: Unclassified OS: All Reporter: gerry.trep...@googlemail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.4.2 release Component: Writer Product: LibreOffice Created attachment 96035 -- https://bugs.freedesktop.org/attachment.cgi?id=96035action=edit zip-folder-with-odt_performance-issue-with-linked-graphics.zip Saving attached file (to .odt) is incredibly slow (~7 min). There seems to be some severe inefficiency in the .odt saving mechanism, as the .docx export filter is much quicker. Expected behaviour: Saving .odt with linked graphics should be much quicker (at least as quick as saving the same file to .docx!) Details: Attached document uses five linked graphics which are applied about 50 times. I created the document to test, whether LibreOffice Writer is capable for a certain task for which I need linked graphics in a long document. The result is that Writer is not capable enough. There is a severe (prohibitive) performance issue when saving documents with linked graphics to .odt (no problem with .docx!). Measurements: * Loading .odt (no problem!) ~4sec. (3.78 / 3.92 / 4.09 / 4.18 / 4.27 sec) * Save file as .odt (big problem!) ~7 min. (07:44 / 07:51 / 06:02 / 07:32 min) All in all, the saving process takes lots of CPU (roughly a third of CPU, quickly fluctuating between cores) but only about 30MB additional RAM usage. How to reproduce: * Download and unpack attached .zip folder. (There is one .odt file and three graphics in a subfolder) * Open the .odt file (this will take just a few seconds) * Make a small change, e.g. add one character a, to the text. * Save the file again. This will take incredibly long. ~7 min * More supplementary measurements: ** Saving the same file with linked graphics as .docx takes only ~4 sec. ! ** Loading that .docx-file again takes ~4min. ** Breaking the links via Edit-Links-Break(all) to embed the graphics takes ~ 8 min (no big problem as the user does that only once). ** Saving that file with embedded graphics to .odt takes ~24sec. ** Loading that .odt-file with embedded graphics takes long: ~4min. ** Saving file with embedded graphics to .docx takes only ~8sec. ! ** Loading that .docx file with embedded graphics takes only ~20 sec. ! - All in all, the .docx filter in Writer seems to work much more efficient than the native .odt filter! System: Lenovo Thinkpad Notebook with Intel® Core™ i3-3120M CPU @ 2.50GHz × 4 (Ivybridge) (8GB RAM). OS: Ubuntu 13.04, 64-Bit LibreOffice: Version: 4.1.4.2, Build ID: 410m0(Build:2) -- 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 76226] mail merge fields not working
https://bugs.freedesktop.org/show_bug.cgi?id=76226 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|critical|enhancement Priority|highest |medium Ever confirmed|0 |1 --- Comment #4 from sophie gautier.sop...@gmail.com --- Hi, there is a lot of documentation in several languages on the wiki about mail merge feature, may be reading it will help not wasting your time. Note also that you can create a csv file from LibreOffice. Setting has enhancement, lowering priority - Sophie -- 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 76226] enhance documentation on mail merge fields
https://bugs.freedesktop.org/show_bug.cgi?id=76226 sophie gautier.sop...@gmail.com changed: What|Removed |Added Summary|mail merge fields not |enhance documentation on |working |mail merge fields -- 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
