sc/source/filter/excel/xecontent.cxx | 8 ++++++--
sc/source/filter/inc/xecontent.hxx | 8 +++++---
sc/source/ui/vba/vbapagesetup.cxx | 2 --
3 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 057beb5d95fc8704f5b98377d909856aa3b32bf6
Author: Noel Power <noel.po...@suse.com>
Date: Wed Apr 24 10:13:53 2013 +0100
follow fix for bnc#813528
Conflicts:
sc/source/ui/vba/vbapagesetup.cxx
Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5
diff --git a/sc/source/ui/vba/vbapagesetup.cxx
b/sc/source/ui/vba/vbapagesetup.cxx
index 19fa2e3..f0b801e 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -512,8 +512,6 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber()
throw (css::uno::Runtime
void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber)
throw (css::uno::RuntimeException)
{
- if( firstPageNumber < 0 )
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
if( firstPageNumber == excel::Constants::xlAutomatic )
firstPageNumber = 0;
commit c8468d6b0a11782bdd16e9ad575009903581ded6
Author: Noel Power <noel.po...@suse.com>
Date: Fri Jun 21 15:46:08 2013 +0100
write display attr of hyperlink only if value is different from stringtable
Conflicts:
sc/source/filter/inc/xecontent.hxx
Conflicts:
sc/source/filter/excel/xecontent.cxx
sc/source/filter/inc/xecontent.hxx
Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 35ad9b2..7278763 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -332,7 +332,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot,
const SvxURLField& rU
XclExpRecord( EXC_ID_HLINK ),
maScPos( rScPos ),
mxVarData( new SvMemoryStream ),
- mnFlags( 0 )
+ mnFlags( 0 ),
+ mbSetDisplay( true )
{
const OUString& rUrl = rUrlField.GetURL();
const OUString& rRepr = rUrlField.GetRepresentation();
@@ -501,6 +502,7 @@ void XclExpHyperlink::WriteEmbeddedData( XclExpStream&
rStrm )
void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
{
+ OString sTmp = XclXmlUtils::ToOString( maScPos );
OUString sId = !msTarget.isEmpty() ? rStrm.addRelation(
rStrm.GetCurrentStream()->getOutputStream(),
XclXmlUtils::ToOUString(
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
),
msTarget, true ) : OUString();
@@ -513,7 +515,9 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
? XclXmlUtils::ToOString( *mxTextMark
).getStr()
: NULL,
// OOXTODO: XML_tooltip, from record HLinkTooltip 800h wzTooltip
- XML_display, XclXmlUtils::ToOString(m_Repr).getStr(),
+ XML_display, mbSetDisplay
+ ?
XclXmlUtils::ToOString(m_Repr).getStr()
+ : NULL,
FSEND );
}
diff --git a/sc/source/filter/inc/xecontent.hxx
b/sc/source/filter/inc/xecontent.hxx
index 81ed8e8..64b98f6 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -109,6 +109,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm );
virtual void WriteEmbeddedData( XclExpStream& rStrm );
+ void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay;
}
private:
/** Builds file name from the passed file URL. Tries to convert to
relative file name.
@param rnLevel (out-param) The parent directory level.
@@ -128,7 +129,8 @@ private:
SvStreamPtr mxVarData; /// Buffer stream with variable
data.
sal_uInt32 mnFlags; /// Option flags.
XclExpStringRef mxTextMark; /// Location within m_Repr
- OUString msTarget; /// Target URL
+ OUString msTarget; /// Target URL
+ bool mbSetDisplay; /// True if display attribute it
written
};
typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList;
@@ -348,9 +350,9 @@ private:
XclExpString maErrorText; /// The error text.
XclExpStringRef mxString1; /// String for first condition formula.
XclTokenArrayRef mxTokArr1; /// Formula for first condition.
- OUString msFormula1; /// OOXML Formula for first condition.
+ OUString msFormula1; /// OOXML Formula for first condition.
XclTokenArrayRef mxTokArr2; /// Formula for second condition.
- OUString msFormula2; /// OOXML Formula for second condition.
+ OUString msFormula2; /// OOXML Formula for second condition.
sal_uInt32 mnFlags; /// Miscellaneous flags.
sal_uLong mnScHandle; /// The core handle for quick list
search.
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
