[PATCH libreoffice-4-0] the print range can start in row 0, fdo#62938
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4138
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/4138/1
the print range can start in row 0, fdo#62938
Change-Id: I8569e4e120a6fd2b626db0bdaadf5d9234d09a36
---
M sc/source/filter/xml/xmlrowi.cxx
M sc/source/filter/xml/xmlrowi.hxx
M sc/source/filter/xml/xmltabi.cxx
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index ec4c5a5..e27abea 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -218,7 +218,7 @@
const ::rtl::OUString rLName,
const ::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XAttributeList xAttrList,
- const bool bTempHeader, const bool
bTempGroup ) :
+ const bool bTempHeader, const bool
bTempGroup, bool bFirstRow ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
nHeaderStartRow(0),
nHeaderEndRow(0),
@@ -232,12 +232,14 @@
if (bHeader)
{
nHeaderStartRow = rImport.GetTables().GetCurrentRow();
-++nHeaderStartRow;
+if(!bFirstRow)
+++nHeaderStartRow;
}
else if (bGroup)
{
nGroupStartRow = rImport.GetTables().GetCurrentRow();
-++nGroupStartRow;
+if(!bFirstRow)
+++nGroupStartRow;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList-getLength() : 0;
for( sal_Int16 i=0; i nAttrCount; ++i )
{
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index a900ff7..fc90639 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -70,7 +70,7 @@
const ::rtl::OUString rLName,
const ::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XAttributeList xAttrList,
- const bool bHeader, const bool bGroup);
+ const bool bHeader, const bool bGroup, bool bFirstRow =
false);
virtual ~ScXMLTableRowsContext();
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index f8dd920..af77d90 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -292,17 +292,17 @@
case XML_TOK_TABLE_ROW_GROUP:
pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
rLName, xAttrList,
- false, true );
+ false, true, true );
break;
case XML_TOK_TABLE_HEADER_ROWS:
pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
rLName, xAttrList,
- true, false );
+ true, false, true );
break;
case XML_TOK_TABLE_ROWS:
pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
rLName, xAttrList,
- false, false );
+ false, false, true );
break;
case XML_TOK_TABLE_ROW:
pContext = new ScXMLTableRowContext( GetScImport(), nPrefix,
--
To view, visit https://gerrit.libreoffice.org/4138
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8569e4e120a6fd2b626db0bdaadf5d9234d09a36
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] r is an optional attribute in c and r, fdo#65059
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4088
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/4088/1
r is an optional attribute in c and r, fdo#65059
Change-Id: Ic954cc5692ddc899f8a6fa99466bc0c8a83da352
---
M sc/source/filter/inc/sheetdatacontext.hxx
M sc/source/filter/oox/sheetdatacontext.cxx
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index 52d20da..72da911 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -117,6 +117,9 @@
BinAddress maCurrPos; /// Current cell position (BIFF12
only).
boolmbHasFormula; /// True = current cell has
formula data (OOXML only).
boolmbValidRange; /// True = maFmlaData.maFormulaRef
is valid (OOXML only).
+
+sal_Int32 mnRow;
+sal_Int32 mnCol;
};
//
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index bd5b146..11047f0 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -111,7 +111,9 @@
WorksheetContextBase( rFragment ),
SheetDataContextBase( rFragment ),
mbHasFormula( false ),
-mbValidRange( false )
+mbValidRange( false ),
+mnRow( -1 ),
+mnCol( -1 )
{
}
@@ -294,7 +296,13 @@
void SheetDataContext::importRow( const AttributeList rAttribs )
{
RowModel aModel;
-aModel.mnRow = rAttribs.getInteger( XML_r, -1 );
+sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
+if(nRow != -1)
+aModel.mnRow = nRow;
+else
+aModel.mnRow = ++mnRow;
+mnCol = -1;
+
aModel.mfHeight = rAttribs.getDouble( XML_ht, -1.0 );
aModel.mnXfId = rAttribs.getInteger( XML_s, -1 );
aModel.mnLevel= rAttribs.getInteger( XML_outlineLevel, 0 );
@@ -328,8 +336,21 @@
bool SheetDataContext::importCell( const AttributeList rAttribs )
{
-bool bValidAddr = mrAddressConv.convertToCellAddress(
maCellData.maCellAddr, rAttribs.getString( XML_r, OUString() ), mnSheet, true );
-if( bValidAddr )
+OUString aCellAddrStr = rAttribs.getString( XML_r, OUString() );
+bool bValid = true;
+if(aCellAddrStr.isEmpty())
+{
+++mnCol;
+maCellData.maCellAddr = CellAddress( mnSheet, mnCol, mnRow );
+}
+else
+{
+bValid = mrAddressConv.convertToCellAddress( maCellData.maCellAddr,
aCellAddrStr, mnSheet, true );
+
+mnCol = maCellData.maCellAddr.Column;
+}
+
+if( bValid )
{
maCellData.mnCellType = rAttribs.getToken( XML_t, XML_n );
maCellData.mnXfId = rAttribs.getInteger( XML_s, -1 );
@@ -343,7 +364,7 @@
// update used area of the sheet
extendUsedArea( maCellData.maCellAddr );
}
-return bValidAddr;
+return bValid;
}
void SheetDataContext::importFormula( const AttributeList rAttribs )
--
To view, visit https://gerrit.libreoffice.org/4088
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic954cc5692ddc899f8a6fa99466bc0c8a83da352
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] range names need to be checked upper case, fdo#64031
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4050
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/4050/1
range names need to be checked upper case, fdo#64031
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
---
M sc/source/ui/docshell/arealink.cxx
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index 84d30be..ee322d5 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -193,10 +193,11 @@
bool ScAreaLink::FindExtRange( ScRange rRange, ScDocument* pSrcDoc, const
String rAreaName )
{
bool bFound = false;
+rtl::OUString aUpperName = ScGlobal::pCharClass-uppercase(rAreaName);
ScRangeName* pNames = pSrcDoc-GetRangeName();
if (pNames) // benannte Bereiche
{
-const ScRangeData* p = pNames-findByUpperName(rAreaName);
+const ScRangeData* p = pNames-findByUpperName(aUpperName);
if (p p-IsValidReference(rRange))
bFound = true;
}
@@ -205,7 +206,7 @@
ScDBCollection* pDBColl = pSrcDoc-GetDBCollection();
if (pDBColl)
{
-const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(ScGlobal::pCharClass-uppercase(rAreaName));
+const ScDBData* pDB =
pDBColl-getNamedDBs().findByUpperName(aUpperName);
if (pDB)
{
SCTAB nTab;
--
To view, visit https://gerrit.libreoffice.org/4050
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] we need a reference to the DifParser.aData, fdo#64920
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4054
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/4054/1
we need a reference to the DifParser.aData, fdo#64920
regression from 6191fa0847ac5b27083efe1a8c6cd84d080a638c
Change-Id: If7fc18e7d0bcbf1075a0ecdb1c0dcf3d207f1bda
---
M sc/source/filter/dif/difimp.cxx
M sc/source/filter/inc/dif.hxx
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 4487915..dfc68a3 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,7 +61,7 @@
sal_BoolbSyntErrWarn = false;
sal_BoolbOverflowWarn = false;
-rtl::OUString aData = aDifParser.aData;
+rtl::OUString aData = aDifParser.aData;
sal_BoolbData = false;
rIn.Seek( 0 );
@@ -372,7 +372,7 @@
if( aLine.getLength() 2 )
aData = aLine.copy( 1, aLine.getLength() - 2 );
else
-aData.Erase();
+aData = OUString();
eS = S_END;
break;
case S_END:
@@ -395,20 +395,14 @@
}
-static void lcl_DeEscapeQuotesDif( String rString )
+static void lcl_DeEscapeQuotesDif( OUString rString )
{
// Special handling for DIF import: Escaped (duplicated) quotes are
resolved.
// Single quote characters are left in place because older versions didn't
// escape quotes in strings (and Excel doesn't when using the clipboard).
// The quotes around the string are removed before this function is
called.
-static const sal_Unicode aDQ[] = { '', '', 0 };
-xub_StrLen nPos = 0;
-while ( (nPos = rString.Search( aDQ, nPos )) != STRING_NOTFOUND )
-{
-rString.Erase( nPos, 1 );
-++nPos;
-}
+rString = rString.replaceAll(\\, \);
}
// Determine if passed in string is numeric data and set fVal/nNumFormat if so
@@ -528,18 +522,14 @@
ReadNextLine( aTmpLine );
if ( eRet == D_SYNT_ERROR )
{ // for broken records write #ERR: data to cell
-String aTmp( RTL_CONSTASCII_USTRINGPARAM( #ERR: ));
-aTmp += pAktBuffer;
-aTmp.AppendAscii( ( );
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN -
aTmp.Len() - 1, GetNextDataset(): line doesn't fit into data);
-aTmp += aTmpLine;
-aTmp += sal_Unicode(')');
-aData = aTmp;
+OUStringBuffer aTmp(#ERR: );
+aTmp.append(pAktBuffer).append( ();
+aTmp.append(aTmpLine).append(')');
+aData = aTmp.makeStringAndClear();
eRet = D_STRING;
}
else
{
-OSL_ENSURE( aTmpLine.getLength() = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aTmpLine;
}
}
@@ -561,7 +551,6 @@
// Single line string
if( nLineLength = 2 pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( aLine.getLength() - 2 =
STRING_MAXLEN, GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1, nLineLength - 2 );
lcl_DeEscapeQuotesDif( aData );
eRet = D_STRING;
@@ -570,12 +559,11 @@
else
{
// Multiline string
-OSL_ENSURE( aLine.getLength() - 1 = STRING_MAXLEN,
GetNextDataset(): line doesn't fit into data);
aData = aLine.copy( 1 );
bool bContinue = true;
while ( bContinue )
{
-aData.Append( '\n' );
+aData = aData + \n;
bContinue = !rIn.IsEof() ReadNextLine( aLine );
if( bContinue )
{
@@ -586,13 +574,11 @@
bContinue = !LookAhead();
if( bContinue )
{
-OSL_ENSURE( aLine.getLength() =
STRING_MAXLEN - aData.Len(), GetNextDataset(): line doesn't fit into data);
-aData.Append( aLine );
+aData = aData + aLine;
}
else if( pLine[nLineLength - 1] == '' )
{
-OSL_ENSURE( nLineLength - 1 =
STRING_MAXLEN - aData.Len(),
[PUSHED libreoffice-4-1] Typo in optsecuritypage.ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4057 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4057 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Typo in optsecuritypage.ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4056 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4056 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] restore old behavior for external references, fdo#64229
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4062
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/4062/1
restore old behavior for external references, fdo#64229
Change-Id: Iae160607447ff6e1133f9e1e6f9c6a9f1e7bd7ab
---
M sc/source/core/tool/interpr1.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 994bc2b..5ee90fa 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5490,7 +5490,7 @@
case svExternalSingleRef:
case svExternalDoubleRef:
{
-pQueryMatrix = PopMatrix();
+pQueryMatrix = GetMatrix();
if (!pQueryMatrix)
{
SetError( errIllegalParameter);
--
To view, visit https://gerrit.libreoffice.org/4062
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae160607447ff6e1133f9e1e6f9c6a9f1e7bd7ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] correctly delete note captions, fdo#64068
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4066
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/4066/1
correctly delete note captions, fdo#64068
This fixes fdo#64068 and correctly without reintroducing the crash with
Undo/Redo.
Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
---
M sc/source/core/data/table2.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 47cd340..00d0632 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -565,7 +565,9 @@
{
ScRange* pRange = aRangeList[i];
if (nDelFlag IDF_NOTE pRange)
-maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(),
pRange-aEnd.Col(), pRange-aEnd.Row(), true);
+{
+maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(),
pRange-aEnd.Col(), pRange-aEnd.Row(), nDelFlag IDF_NOCAPTIONS);
+}
if((nDelFlag IDF_ATTRIB) pRange pRange-aStart.Tab() == nTab)
mpCondFormatList-DeleteArea( pRange-aStart.Col(),
pRange-aStart.Row(), pRange-aEnd.Col(), pRange-aEnd.Row() );
--
To view, visit https://gerrit.libreoffice.org/4066
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Delete double whitespace in optsecuritypage.ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4040 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4040 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-1] Delete double whitespace in optsecuritypage.ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4041 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4041 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] remove chart listener when chart is deleted, fdo#64639
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4045
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/4045/1
remove chart listener when chart is deleted, fdo#64639
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
---
M sc/inc/chartlis.hxx
M sc/source/core/tool/chartlis.cxx
M sc/source/ui/unoobj/chartuno.cxx
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 788c326..e32a1f0 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -171,6 +171,8 @@
const ScChartListener* findByName(const rtl::OUString rName) const;
bool hasListeners() const;
+void removeByName(const OUString rName);
+
const ListenersType getListeners() const;
ListenersType getListeners();
StringSetType getNonOleObjectNames();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 67da747..712c60a404 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -469,6 +469,11 @@
maListeners.insert(aName, pListener);
}
+void ScChartListenerCollection::removeByName(const rtl::OUString rName)
+{
+maListeners.erase(rName);
+}
+
ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString
rName)
{
ListenersType::iterator it = maListeners.find(rName);
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 8072f3b..092ddce 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -298,6 +298,7 @@
if (pObj)
{
ScDocument* pDoc = pDocShell-GetDocument();
+pDoc-GetChartListenerCollection()-removeByName(aName);
ScDrawLayer* pModel = pDoc-GetDrawLayer(); // ist nicht 0
SdrPage* pPage = pModel-GetPage(static_castsal_uInt16(nTab));//
ist nicht 0
--
To view, visit https://gerrit.libreoffice.org/4045
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] remove chart listener when chart is deleted, fdo#64639
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4046
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/4046/1
remove chart listener when chart is deleted, fdo#64639
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
---
M sc/inc/chartlis.hxx
M sc/source/core/tool/chartlis.cxx
M sc/source/ui/unoobj/chartuno.cxx
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 8ca2760..791efef 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -181,6 +181,8 @@
const ScChartListener* findByName(const rtl::OUString rName) const;
bool hasListeners() const;
+void removeByName(const OUString rName);
+
const ListenersType getListeners() const;
ListenersType getListeners();
StringSetType getNonOleObjectNames();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d49fdeb..55239a0 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -486,6 +486,11 @@
maListeners.insert(aName, pListener);
}
+void ScChartListenerCollection::removeByName(const rtl::OUString rName)
+{
+maListeners.erase(rName);
+}
+
ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString
rName)
{
ListenersType::iterator it = maListeners.find(rName);
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 4996586..71bc893 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -309,6 +309,7 @@
if (pObj)
{
ScDocument* pDoc = pDocShell-GetDocument();
+pDoc-GetChartListenerCollection()-removeByName(aName);
ScDrawLayer* pModel = pDoc-GetDrawLayer(); // ist nicht 0
SdrPage* pPage = pModel-GetPage(static_castsal_uInt16(nTab));//
ist nicht 0
--
To view, visit https://gerrit.libreoffice.org/4046
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] resolved fdo#64384 check subtotal row filtered also for sing...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3847 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3847 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Calc sort: Use method GetSortKeyCount from SortParam
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3816 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3816 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4500ba71abeba5fe8293cea22b10fd910e46059f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#51828 - UI: Sort: can use more than 3 criteria once only...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3772 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3772 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I569766945d96eae74479e310d674c9420e9a2b4b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] map full transparent solid fill to no fill, fdo#64224
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3792
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3792/1
map full transparent solid fill to no fill, fdo#64224
Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e
(cherry picked from commit 6e2292b3cdd032edff21f0016b7f61e9bb420699)
---
M oox/source/export/drawingml.cxx
1 file changed, 9 insertions(+), 0 deletions(-)
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4eefc90..00c869f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1504,6 +1504,15 @@
aFillStyle == FillStyle_HATCH )
return;
+if ( aFillStyle == FillStyle_SOLID GetProperty( xPropSet,
FillTransparence ) )
+{
+// map full transparent background to no fill
+sal_Int16 nVal;
+xPropSet-getPropertyValue( FillTransparence ) = nVal;
+if ( nVal == 100 )
+aFillStyle = FillStyle_NONE;
+}
+
switch( aFillStyle )
{
case ::com::sun::star::drawing::FillStyle_SOLID :
--
To view, visit https://gerrit.libreoffice.org/3792
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] let us be explicit about default values
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3793 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3793/1 let us be explicit about default values Different MSO versions behave differently in respect to the default values. 2007 is not compliant to OOXML and is what our export filter expects, 2010+ are compliant to OOXML and therefore our charts look awful. Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0 (cherry picked from commit 93abb2082ad3cae1432d69b65a89dace6646785a) --- M oox/source/export/drawingml.cxx 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 4eefc90..611dcbe 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1500,8 +1500,7 @@ FillStyle aFillStyle( FillStyle_NONE ); xPropSet-getPropertyValue( S( FillStyle ) ) = aFillStyle; -if( aFillStyle == FillStyle_NONE || -aFillStyle == FillStyle_HATCH ) +if( aFillStyle == FillStyle_HATCH ) return; switch( aFillStyle ) @@ -1515,6 +1514,9 @@ case ::com::sun::star::drawing::FillStyle_BITMAP : WriteBlipFill( xPropSet, S( FillBitmapURL ) ); break; +case ::com::sun::star::drawing::FillStyle_NONE: +mpFS-singleElementNS( XML_a, XML_noFill, FSEND ); +break; default: ; } -- To view, visit https://gerrit.libreoffice.org/3793 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] export zoom factor correctly to OOXML
Markus Mohrhard has abandoned this change. Change subject: export zoom factor correctly to OOXML .. Patch Set 1: Abandoned Noel fixed it already -- To view, visit https://gerrit.libreoffice.org/3691 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6ab21e46e63a4d1597eb79de91533448fef0cfbc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] change order to allow validation of chart part
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3657 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/3657/1 change order to allow validation of chart part My simple test file is finally valid but is still now shown in Excel. There must be another bug in our exporter. Change-Id: Ib55e5b32edc3a556e9081b3008df539275dc289b (cherry picked from commit e81d0c400c02a87d7fa492dbc5ac9f7921167920) --- M oox/source/export/chartexport.cxx 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 37abe5d..5211a76 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2187,6 +2187,9 @@ XML_val, sTickLblPos, FSEND ); +// shape properties +exportShapeProps( xAxisProp ); + pFS-singleElement( FSNS( XML_c, XML_crossAx ), XML_val, I32S( aAxisIdPair.nCrossAx ), FSEND ); @@ -2281,8 +2284,6 @@ FSEND ); } -// shape properties -exportShapeProps( xAxisProp ); // TODO: text properties pFS-endElement( FSNS( XML_c, nAxisType ) ); -- To view, visit https://gerrit.libreoffice.org/3657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib55e5b32edc3a556e9081b3008df539275dc289b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Resolves: fdo#51556 allow tab traversing into the conditiona...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3656 Approvals: Markus Mohrhard: Verified; Looks good to me, approved Tor Lillqvist: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3656 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie08a7312df0d42efc3697089cf766ceeefd623b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] c:varyColor is true by default in Excel
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3683 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3683/1 c:varyColor is true by default in Excel And another step closer to opening my test file correctly in Excel. Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d (cherry picked from commit 81b9d431678bc270e7592e9bedb81d2d445e2122) --- M oox/source/export/chartexport.cxx 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 37abe5d..745b953 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1341,6 +1341,10 @@ XML_val, scatterStyle, FSEND ); +pFS-singleElement( FSNS( XML_c, XML_varyColors ), +XML_val, 0, +FSEND ); + // FIXME: should export xVal and yVal sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y; exportSeries( xChartType, nAttachedAxis ); -- To view, visit https://gerrit.libreoffice.org/3683 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] c:delete is true by default in Excel
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3684
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3684/1
c:delete is true by default in Excel
One step closer to opening my simple test file correctly in Excel.
Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
(cherry picked from commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47)
---
M oox/source/export/chartexport.cxx
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 745b953..9cb85db 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2088,13 +2088,9 @@
OUString (Visible)) = bVisible;
}
-if( !bVisible )
-{
-// other value?
-pFS-singleElement( FSNS( XML_c, XML_delete ),
-XML_val, 1,
+pFS-singleElement( FSNS( XML_c, XML_delete ),
+XML_val, bVisible ? 0 : 1,
FSEND );
-}
// FIXME: axPos, need to check the property ReverseDirection
pFS-singleElement( FSNS( XML_c, XML_axPos ),
--
To view, visit https://gerrit.libreoffice.org/3684
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] c:varyColor is true by default in Excel
Markus Mohrhard has abandoned this change. Change subject: c:varyColor is true by default in Excel .. Patch Set 1: Abandoned should have gone to libreoffice-4-0 -- To view, visit https://gerrit.libreoffice.org/3683 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] c:delete is true by default in Excel
Markus Mohrhard has abandoned this change. Change subject: c:delete is true by default in Excel .. Patch Set 1: Abandoned should have gone to libreoffice-4-0 -- To view, visit https://gerrit.libreoffice.org/3684 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] c:delete is true by default in Excel
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3685
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3685/1
c:delete is true by default in Excel
One step closer to opening my simple test file correctly in Excel.
Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
(cherry picked from commit 6ddd7fccdc8fc292200e581dbc4e456ec86cef47)
---
M oox/source/export/chartexport.cxx
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 37abe5d..138c469 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2084,13 +2084,9 @@
OUString (Visible)) = bVisible;
}
-if( !bVisible )
-{
-// other value?
-pFS-singleElement( FSNS( XML_c, XML_delete ),
-XML_val, 1,
+pFS-singleElement( FSNS( XML_c, XML_delete ),
+XML_val, bVisible ? 0 : 1,
FSEND );
-}
// FIXME: axPos, need to check the property ReverseDirection
pFS-singleElement( FSNS( XML_c, XML_axPos ),
--
To view, visit https://gerrit.libreoffice.org/3685
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] c:varyColor is true by default in Excel
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3686 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3686/1 c:varyColor is true by default in Excel And another step closer to opening my test file correctly in Excel. Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d (cherry picked from commit 81b9d431678bc270e7592e9bedb81d2d445e2122) --- M oox/source/export/chartexport.cxx 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 37abe5d..745b953 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1341,6 +1341,10 @@ XML_val, scatterStyle, FSEND ); +pFS-singleElement( FSNS( XML_c, XML_varyColors ), +XML_val, 0, +FSEND ); + // FIXME: should export xVal and yVal sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y; exportSeries( xChartType, nAttachedAxis ); -- To view, visit https://gerrit.libreoffice.org/3686 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] export zoom factor correctly to OOXML
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3691
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3691/1
export zoom factor correctly to OOXML
Change-Id: I6ab21e46e63a4d1597eb79de91533448fef0cfbc
---
M sc/source/filter/excel/xeview.cxx
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/sc/source/filter/excel/xeview.cxx
b/sc/source/filter/excel/xeview.cxx
index 37d4090..6c8b5e74 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -282,6 +282,9 @@
/** Converts a Calc zoom factor into an Excel zoom factor. Returns 0 for a
default zoom value. */
sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom )
{
+if(!nScZoom)
+return 0;
+
sal_uInt16 nXclZoom = limit_cast sal_uInt16 ( nScZoom, EXC_ZOOM_MIN,
EXC_ZOOM_MAX );
return (nXclZoom == nDefXclZoom) ? 0 : nXclZoom;
}
--
To view, visit https://gerrit.libreoffice.org/3691
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ab21e46e63a4d1597eb79de91533448fef0cfbc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] show formula results of new formulas even if auto calc is di...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3625
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3625/1
show formula results of new formulas even if auto calc is disabled
This change might cost us a bit of performance in large sheets but
finally makes it possible to effectively work in sheets where auto calc
is disabled as we now don't only show an empty cell for new cells with
formulas.
It also fixes a problem with errors in matrix formulas during cached
value import where we were calling ScFormulaCell::Interpret while the
cell still was not compiled and therefore resetting the dirty flag.
Change-Id: I10abb477d2384a4a3b83a58f3a81b6de582b435f
---
M sc/source/core/data/formulacell.cxx
M sc/source/ui/docshell/docsh4.cxx
M sc/source/ui/unoobj/confuno.cxx
M sc/source/ui/unoobj/docuno.cxx
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index ab70344..4485073 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1569,7 +1569,8 @@
void ScFormulaCell::SetDirtyVar()
{
-bDirty = true;
+if(pDocument-GetAutoCalc())
+bDirty = true;
// mark the sheet of this cell to be calculated
//#FIXME do we need to revert this remnant of old fake vba events?
pDocument-AddCalculateTable( aPos.Tab() );
}
@@ -1689,11 +1690,10 @@
void ScFormulaCell::MaybeInterpret()
{
-if (!IsDirtyOrInTableOpDirty())
+if (!IsDirtyOrInTableOpDirty() || pDocument-IsImportingXML())
return;
-if (pDocument-GetAutoCalc() || (cMatrixFlag != MM_NONE))
-Interpret();
+Interpret();
}
bool ScFormulaCell::IsHyperLinkCell() const
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 9bc4a40..7eb66cb 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -393,7 +393,10 @@
bNewVal = ((const SfxBoolItem*)pItem)-GetValue();
else
bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer
Menue
+bool bOldVal = aDocument.GetAutoCalc();
aDocument.SetAutoCalc( bNewVal );
+if( !bOldVal bNewVal)
+DoHardRecalc(false);
SetDocumentModified();
if (pBindings)
{
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index d72a9c3..c025f0e 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -168,7 +168,12 @@
else if ( aPropertyName.compareToAscii( SC_UNO_OUTLSYMB ) == 0 )
aViewOpt.SetOption(VOPT_OUTLINER,
ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aPropertyName.compareToAscii( SC_UNO_AUTOCALC ) == 0 )
+{
+bool bOldAutoCalc = pDoc-GetAutoCalc();
pDoc-SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue
) );
+if(!bOldAutoCalc ScUnoHelpFunctions::GetBoolFromAny( aValue
))
+pDocShell-DoHardRecalc(true);
+}
else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 )
{
OUString sPrinterName;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 4f66cca..1c21bcb 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1403,6 +1403,8 @@
if ( pDoc-GetAutoCalc() != bEnabled )
{
pDoc-SetAutoCalc( bEnabled );
+if(bEnabled)
+pDocShell-DoHardRecalc(true);
pDocShell-SetDocumentModified();
}
}
--
To view, visit https://gerrit.libreoffice.org/3625
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10abb477d2384a4a3b83a58f3a81b6de582b435f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] enable symbols and disable optimization in openssl for a dbg...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3489 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3489/1 enable symbols and disable optimization in openssl for a dbgutil build Change-Id: I2100d40264c067b22548025ab3a3be32a23835a6 --- M openssl/ExternalProject_openssl.mk 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 97cd10f..2666965 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -19,8 +19,9 @@ $(if $(filter I,$(CPU)),\ $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\ $(if $(filter X,$(CPU)),\ - $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,linux-generic64),\ - linux-generic32)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64)),\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32))),\ $(if $(filter SOLARIS,$(OS)),\ $(if $(filter INTEL,$(CPUNAME)),\ $(if $(filter X,$(CPU)),\ -- To view, visit https://gerrit.libreoffice.org/3489 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2100d40264c067b22548025ab3a3be32a23835a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix https://-related crashes.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3488 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3488/1 Fix https://-related crashes. The internal openssl on 64bit linux was built as linux-generic32, instead of linux-generi64, which caused crashes later when used. This patch alignes it with the logic before gbuildization. Change-Id: I2919a91138e8f33ad50e64728496144bac815321 --- M openssl/ExternalProject_openssl.mk 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index aa5492f..97cd10f 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -17,9 +17,10 @@ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ $(if $(filter I,$(CPU)),\ - $(if $(filter GNU/kFreeBSD,$(shell uname)),\ - debian-kfreebsd-i386,linux-elf),\ - linux-generic32),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\ + $(if $(filter X,$(CPU)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,linux-generic64),\ + linux-generic32)),\ $(if $(filter SOLARIS,$(OS)),\ $(if $(filter INTEL,$(CPUNAME)),\ $(if $(filter X,$(CPU)),\ -- To view, visit https://gerrit.libreoffice.org/3488 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2919a91138e8f33ad50e64728496144bac815321 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Fix https://-related crashes.
Markus Mohrhard has abandoned this change. Change subject: Fix https://-related crashes. .. Patch Set 1: Abandoned already merged, was just cherry-picked into that build -- To view, visit https://gerrit.libreoffice.org/3488 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2919a91138e8f33ad50e64728496144bac815321 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#61135: adding help button to stepped lines dialog.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3445 -- To view, visit https://gerrit.libreoffice.org/3445 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved rhbz#918544 do not attempt to access non-existing f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3460 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3460 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb3e01ccbf8182bdf8eed1d52263ab34c9b297ff Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Adding the dialog for setting stepped lines.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3345 -- To view, visit https://gerrit.libreoffice.org/3345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bc5ebe5167eca9a5b1341d9328a7d74b62cf819 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#51828 - UI: Sort: can use more than 3 criteria once only
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3350 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3350 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7480e8d606e1eafde45635e36dfafa4232f529cb Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] disable cached value import for ODS for now, fdo#60215
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3290 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3290/1 disable cached value import for ODS for now, fdo#60215 Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 --- M officecfg/registry/schema/org/openoffice/Office/Calc.xcs 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index ee5c513..d77c260 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1558,7 +1558,7 @@ /info /enumeration /constraints -value1/value +value0/value /prop /group /group -- To view, visit https://gerrit.libreoffice.org/3290 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#51656 Mean value line starts in wrong place
Markus Mohrhard has abandoned this change. Change subject: fdo#51656 Mean value line starts in wrong place .. Patch Set 1: Abandoned See https://gerrit.libreoffice.org/#/c/3122/ for the original review request. Please note also that in the bug report Prashant mentioned that he is working on it and assigned the bug to him. I'm sorry but I'm sure you'll find another Easy Hack to work on. -- To view, visit https://gerrit.libreoffice.org/3156 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I056423b3214e8f904202e6e6a3aeaec12122e62d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#51656 : Mean value line starts in wrong place in column ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3122 -- To view, visit https://gerrit.libreoffice.org/3122 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2389687e54cec4c0e873bcc120cc21b3c3d11d78 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use local utility functions instead of SbxSimpleCharClass
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3132 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3132 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c4bc8cc44c0b4e78feb55dcd2c15b82c414e0ef Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Converting spline dialog box to glade.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3102 -- To view, visit https://gerrit.libreoffice.org/3102 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I945445ab703b146b048cd45768d256d8b6a833d5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0-2] resolved fdo#44286 some historical dates were decremented
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3037 Approvals: Markus Mohrhard: Verified; Looks good to me, approved Petr Mladek: Verified; Looks good to me, but someone else must approve Thorsten Behrens: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-2] use the right range representation, fdo#52159
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2982
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2982/1
use the right range representation, fdo#52159
Change-Id: I36ede89ccb8836708a4f87c4815bbe2fb6d6f3cf
(cherry picked from commit a6d12acda9bb24f2acca45e0bd1aea577e49fbbf)
Reviewed-on: https://gerrit.libreoffice.org/2818
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 4bdfeabe6e65f865d5cec16b31cda524eb8b9b90)
---
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 0b9b205..0a3eca0 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -956,7 +956,7 @@
static void lcl_setErrorBarSequence ( const uno::Reference
chart2::XChartDocument xDoc,
const uno::Reference beans::XPropertySet
xBarProp,
- const rtl::OUString aRange,
+ const rtl::OUString aXMLRange,
bool bPositiveValue, bool bYError )
{
uno::Reference com::sun::star::chart2::data::XDataProvider
xDataProvider(xDoc-getDataProvider());
@@ -965,7 +965,7 @@
assert( xDataSink.is() xDataSource.is() xDataProvider.is() );
-rtl::OUString aXMLRange(lcl_ConvertRange(aRange,xDoc));
+rtl::OUString aRange(lcl_ConvertRange(aXMLRange,xDoc));
uno::Reference chart2::data::XDataSequence xNewSequence(
xDataProvider-createDataSequenceByRangeRepresentation( aRange ));
--
To view, visit https://gerrit.libreoffice.org/2982
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36ede89ccb8836708a4f87c4815bbe2fb6d6f3cf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-2] for internal data providers this makes no sense
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2983 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2983/1 for internal data providers this makes no sense Change-Id: Ic2651defd0ec8846dc0b0a81faee5dd6743310fb (cherry picked from commit 7b12b4677f658fd2dc9ff40371823da59533fa45) Reviewed-on: https://gerrit.libreoffice.org/2819 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org (cherry picked from commit 7b73ff9932f4bd8ab428855ea4fe34898fe74527) --- M sc/source/ui/view/drawvie4.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 651aea2..ceebfbd 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -169,6 +169,9 @@ if (!xChartDoc.is()) return; +if(xChartDoc-hasInternalDataProvider()) +return; + uno::Referencechart2::data::XDataSource xDataSource(xChartDoc, uno::UNO_QUERY); if (!xDataSource.is()) return; -- To view, visit https://gerrit.libreoffice.org/2983 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2651defd0ec8846dc0b0a81faee5dd6743310fb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-2] error bar range is also part of chart range, related fdo#521...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2984
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/2984/1
error bar range is also part of chart range, related fdo#52159
Change-Id: I38db559de8435dcc26e2be4597c385724a7b
(cherry picked from commit e15d8ef44fbf9fc23da58648e4d288782a81c7c1)
Reviewed-on: https://gerrit.libreoffice.org/2820
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 875a8fb01238e998fc6e64fbf7a4e51c18973e61)
---
M sc/source/ui/view/drawvie4.cxx
1 file changed, 70 insertions(+), 17 deletions(-)
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index ceebfbd..adf45ee 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -46,6 +46,9 @@
#include com/sun/star/embed/Aspects.hpp
#include com/sun/star/embed/XEmbeddedObject.hpp
#include com/sun/star/embed/XComponentSupplier.hpp
+#include com/sun/star/chart2/XChartTypeContainer.hpp
+#include com/sun/star/chart2/XCoordinateSystemContainer.hpp
+#include com/sun/star/chart2/XDataSeriesContainer.hpp
using namespace com::sun::star;
@@ -151,6 +154,70 @@
namespace {
+void getRangeFromDataSource( uno::Reference chart2::data::XDataSource
xDataSource, std::vectorOUString rRangeRep)
+{
+uno::Sequenceuno::Referencechart2::data::XLabeledDataSequence xSeqs =
xDataSource-getDataSequences();
+for (sal_Int32 i = 0, n = xSeqs.getLength(); i n; ++i)
+{
+uno::Referencechart2::data::XLabeledDataSequence xLS = xSeqs[i];
+uno::Referencechart2::data::XDataSequence xSeq = xLS-getValues();
+if (xSeq.is())
+{
+OUString aRep = xSeq-getSourceRangeRepresentation();
+rRangeRep.push_back(aRep);
+}
+xSeq = xLS-getLabel();
+if (xSeq.is())
+{
+OUString aRep = xSeq-getSourceRangeRepresentation();
+rRangeRep.push_back(aRep);
+}
+}
+}
+
+
+void getRangeFromErrorBar(const uno::Reference chart2::XChartDocument
xChartDoc, std::vectorOUString rRangeRep)
+{
+uno::Reference chart2::XDiagram xDiagram = xChartDoc-getFirstDiagram();
+if(!xDiagram.is())
+return;
+
+uno::Reference chart2::XCoordinateSystemContainer xCooSysContainer(
xDiagram, uno::UNO_QUERY);
+if(!xCooSysContainer.is())
+return;
+
+uno::Sequence uno::Reference chart2::XCoordinateSystem
xCooSysSequence( xCooSysContainer-getCoordinateSystems());
+for(sal_Int32 i = 0; i xCooSysSequence.getLength(); ++i)
+{
+uno::Reference chart2::XChartTypeContainer xChartTypeContainer(
xCooSysSequence[i], uno::UNO_QUERY);
+if(!xChartTypeContainer.is())
+continue;
+
+uno::Sequence uno::Reference chart2::XChartType
xChartTypeSequence( xChartTypeContainer-getChartTypes() );
+for(sal_Int32 nChartType = 0; nChartType
xChartTypeSequence.getLength(); ++nChartType)
+{
+uno::Reference chart2::XDataSeriesContainer
xDataSequenceContainer( xChartTypeSequence[nChartType], uno::UNO_QUERY);
+if(!xDataSequenceContainer.is())
+continue;
+
+uno::Sequence uno::Reference chart2::XDataSeries
xSeriesSequence( xDataSequenceContainer-getDataSeries() );
+for(sal_Int32 nDataSeries = 0; nDataSeries
xSeriesSequence.getLength(); ++nDataSeries)
+{
+uno::Reference chart2::XDataSeries xSeries =
xSeriesSequence[nDataSeries];
+uno::Reference beans::XPropertySet xPropSet( xSeries,
uno::UNO_QUERY);
+uno::Reference chart2::data::XDataSource xErrorBarY;
+xPropSet-getPropertyValue(ErrorBarY) = xErrorBarY;
+if(xErrorBarY.is())
+getRangeFromDataSource(xErrorBarY, rRangeRep);
+uno::Reference chart2::data::XDataSource xErrorBarX;
+xPropSet-getPropertyValue(ErrorBarX) = xErrorBarX;
+if(xErrorBarX.is())
+getRangeFromDataSource(xErrorBarX, rRangeRep);
+}
+}
+}
+}
+
void getRangeFromOle2Object(const SdrOle2Obj rObj, std::vectorOUString
rRangeRep)
{
if (!rObj.IsChart())
@@ -172,28 +239,14 @@
if(xChartDoc-hasInternalDataProvider())
return;
+getRangeFromErrorBar(xChartDoc, rRangeRep);
+
uno::Referencechart2::data::XDataSource xDataSource(xChartDoc,
uno::UNO_QUERY);
if (!xDataSource.is())
return;
// Get all data sources used in this chart.
-uno::Sequenceuno::Referencechart2::data::XLabeledDataSequence xSeqs =
xDataSource-getDataSequences();
-for (sal_Int32 i = 0, n = xSeqs.getLength(); i n; ++i)
-{
-uno::Referencechart2::data::XLabeledDataSequence xLS = xSeqs[i];
-uno::Referencechart2::data::XDataSequence xSeq = xLS-getValues();
-if
[PATCH libreoffice-4-0-2] we need to register data sequences during import, fdo#52159
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2985
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2985/1
we need to register data sequences during import, fdo#52159
Change-Id: I203be719a6ee19c87ed232218f7700d875c2871f
(cherry picked from commit 094bab7f9097fba62800d3dd578bd42640d8c6e2)
Reviewed-on: https://gerrit.libreoffice.org/2821
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit bdfaf33419a9720d2afb48238a110a3cf8238aec)
---
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
M xmloff/source/chart/SchXMLPlotAreaContext.hxx
M xmloff/source/chart/SchXMLSeries2Context.cxx
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 0a3eca0..49da97c 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -957,7 +957,8 @@
static void lcl_setErrorBarSequence ( const uno::Reference
chart2::XChartDocument xDoc,
const uno::Reference beans::XPropertySet
xBarProp,
const rtl::OUString aXMLRange,
- bool bPositiveValue, bool bYError )
+ bool bPositiveValue, bool bYError,
+ tSchXMLLSequencesPerIndex rSequences)
{
uno::Reference com::sun::star::chart2::data::XDataProvider
xDataProvider(xDoc-getDataProvider());
uno::Reference com::sun::star::chart2::data::XDataSource xDataSource(
xBarProp, uno::UNO_QUERY );
@@ -998,6 +999,9 @@
Reference chart2::data::XLabeledDataSequence xLabelSeq(
xFact-createInstance(com.sun.star.chart2.data.LabeledDataSequence),
uno::UNO_QUERY );
+rSequences.insert( tSchXMLLSequencesPerIndex::value_type(
+tSchXMLIndexWithPart( -2, SCH_XML_PART_ERROR_BARS ),
xLabelSeq ) );
+
xLabelSeq-setValues( xNewSequence );
uno::Sequence Reference chart2::data::XLabeledDataSequence
aSequences(
@@ -1020,7 +1024,8 @@
const ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries,
ContextType eContextType,
-const awt::Size rChartSize ) :
+const awt::Size rChartSize,
+tSchXMLLSequencesPerIndex rLSequencesPerIndex) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
@@ -1028,7 +1033,8 @@
m_xSeries( xSeries ),
meContextType( eContextType ),
maChartSize( rChartSize ),
-maSeriesStyleName( rSeriesStyleName)
+maSeriesStyleName( rSeriesStyleName),
+mrLSequencesPerIndex(rLSequencesPerIndex)
{}
SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
@@ -1216,10 +1222,10 @@
uno::Reference chart2::XChartDocument
xDoc(GetImport().GetModel(),uno::UNO_QUERY);
if (!aPosRange.isEmpty())
-
lcl_setErrorBarSequence(xDoc,xBarProp,aPosRange,true,bYError);
+
lcl_setErrorBarSequence(xDoc,xBarProp,aPosRange,true,bYError,
mrLSequencesPerIndex);
if (!aNegRange.isEmpty())
-
lcl_setErrorBarSequence(xDoc,xBarProp,aNegRange,false,bYError);
+
lcl_setErrorBarSequence(xDoc,xBarProp,aNegRange,false,bYError,
mrLSequencesPerIndex);
if ( !bYError )
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 8ed329a..3f4d133 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -265,7 +265,8 @@
const ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries,
ContextType eContextType,
-const ::com::sun::star::awt::Size rChartSize );
+const ::com::sun::star::awt::Size rChartSize,
+tSchXMLLSequencesPerIndex rLSequencesPerIndex );
virtual ~SchXMLStatisticsObjectContext();
@@ -283,6 +284,7 @@
ContextTypemeContextType;
::com::sun::star::awt::SizemaChartSize;
rtl::OUString maSeriesStyleName;
+tSchXMLLSequencesPerIndex mrLSequencesPerIndex;
};
//
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index e3188b9..8e6bbf0 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -648,7 +648,7 @@
nPrefix, rLocalName, msAutoStyleName,
mrStyleList, m_xSeries,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE,
-
[PATCH libreoffice-4-0] URM_INSDEL we need to update the src position, fdo#62206
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2986
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2986/1
URM_INSDEL we need to update the src position, fdo#62206
See ScFormulaCell::UpdateReference for a similar update
Change-Id: I1f98d26adb5085e4bdab63cc23f97a81928d6b13
(cherry picked from commit 9261c0bf6ecf6633a5577879f003edfcb569f4d7)
---
M sc/source/core/data/conditio.cxx
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index a6ba736..d37891a 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -526,6 +526,15 @@
{
bool bInsertTab = ( eUpdateRefMode == URM_INSDEL nDz = 1 );
bool bDeleteTab = ( eUpdateRefMode == URM_INSDEL nDz = -1 );
+if(pCondFormat)
+aSrcPos = pCondFormat-GetRange().Combine().aStart;
+ScAddress aOldSrcPos = aSrcPos;
+bool bChangedPos = false;
+if(eUpdateRefMode == URM_INSDEL rRange.In(aSrcPos))
+{
+aSrcPos.Move(nDx, nDy, nDz);
+bChangedPos = aSrcPos != aOldSrcPos;
+}
bool bChanged1 = false;
bool bChanged2 = false;
@@ -533,7 +542,7 @@
if (pFormula1)
{
if ( bInsertTab )
-lcl_CondUpdateInsertTab( *pFormula1, rRange.aStart.Tab(),
aSrcPos.Tab(), bChanged1, nDz );
+lcl_CondUpdateInsertTab( *pFormula1, rRange.aStart.Tab(),
aOldSrcPos.Tab(), bChanged1, nDz );
else
{
ScCompiler aComp( mpDoc, aSrcPos, *pFormula1 );
@@ -543,18 +552,18 @@
else
{
bool bSizeChanged;
-aComp.UpdateReference( eUpdateRefMode, aSrcPos, rRange, nDx,
+aComp.UpdateReference( eUpdateRefMode, aOldSrcPos, rRange, nDx,
nDy, nDz, bChanged1, bSizeChanged );
}
}
-if (bChanged1)
+if (bChanged1 || bChangedPos)
DELETEZ(pFCell1); // is created again in IsValid
}
if (pFormula2)
{
if ( bInsertTab )
-lcl_CondUpdateInsertTab( *pFormula2, rRange.aStart.Tab(),
aSrcPos.Tab(), bChanged2, nDz );
+lcl_CondUpdateInsertTab( *pFormula2, rRange.aStart.Tab(),
aOldSrcPos.Tab(), bChanged2, nDz );
else
{
ScCompiler aComp( mpDoc, aSrcPos, *pFormula2);
@@ -564,12 +573,12 @@
else
{
bool bSizeChanged;
-aComp.UpdateReference( eUpdateRefMode, aSrcPos, rRange, nDx,
+aComp.UpdateReference( eUpdateRefMode, aOldSrcPos, rRange, nDx,
nDy, nDz, bChanged2, bSizeChanged );
}
}
-if (bChanged2)
+if (bChanged2 || bChangedPos)
DELETEZ(pFCell2); // is created again in IsValid
}
}
--
To view, visit https://gerrit.libreoffice.org/2986
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f98d26adb5085e4bdab63cc23f97a81928d6b13
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Fix build
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2767 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2767 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d203f8fb585b37524e63b94a6d1e15881a11882 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#989730 and coverity#989729: Uninitialized scalar fi...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2607 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2607 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaecfa720b898746d457de731734b332226d3e9c2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marc-André Laverdière marc-an...@atc.tcs.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#989728: uninitialized scalar
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2609 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2609 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8e248eff6db54f407ec894cab28a27957c6fd0f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marc-André Laverdière marc-an...@atc.tcs.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] use direct calls to set row height, fdo#61721
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2615
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/2615/1
use direct calls to set row height, fdo#61721
Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
(cherry picked from commit e1c281c6c1a2bd55d99e1af2023444c960cf02a3)
---
M sc/source/filter/oox/worksheethelper.cxx
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 4d29ad3..f736393 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1216,20 +1216,23 @@
// row height: convert points to row height in 1/100 mm
double fHeight = (rModel.mfHeight = 0.0) ? rModel.mfHeight : fDefHeight;
sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT );
+SCROW nStartRow = rRowRange.mnFirst;
+SCROW nEndRow = rRowRange.mnLast;
+SCTAB nTab = getSheetIndex();
if( nHeight 0 )
{
/* always import the row height, ensures better layout */
-PropertySet aPropSet( getRows( rRowRange ) );
-aPropSet.setProperty( PROP_Height, nHeight );
+ScDocument rDoc = getScDocument();
+rDoc.SetRowHeightOnly( nStartRow, nEndRow, nTab,
(sal_uInt16)sc::HMMToTwips(nHeight) );
+if(rModel.mbCustomHeight)
+rDoc.SetManualHeight( nStartRow, nEndRow, nTab, true );
}
// hidden rows: TODO: #108683# hide rows later?
if( rModel.mbHidden )
{
-PropertySet aPropSet( getRows( rRowRange ) );
-// #i116460# Use VisibleFlag instead of IsVisible: directly set the
flag,
-// without drawing layer update etc. (only possible before shapes are
inserted)
-aPropSet.setProperty( PROP_VisibleFlag, false );
+ScDocument rDoc = getScDocument();
+rDoc.SetRowHidden( nStartRow, nEndRow, nTab, true );
}
// outline settings for this row range
--
To view, visit https://gerrit.libreoffice.org/2615
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] group undo action when hiding/showing sheets
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2579 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2579 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86196c6bb0f5fd6ba5b44c69efadc16b119a7f11 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Laurent Godard lgodard.li...@laposte.net Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] respect nDelFlags, fdo#57661
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2616 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/2616/1 respect nDelFlags, fdo#57661 Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894 (cherry picked from commit 41095e934bcd83e08a472c8fb53743cd3f8e926c) --- M sc/source/core/data/table2.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 936e597..47cd340 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -567,7 +567,7 @@ if (nDelFlag IDF_NOTE pRange) maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(), pRange-aEnd.Col(), pRange-aEnd.Row(), true); -if(pRange pRange-aStart.Tab() == nTab) +if((nDelFlag IDF_ATTRIB) pRange pRange-aStart.Tab() == nTab) mpCondFormatList-DeleteArea( pRange-aStart.Col(), pRange-aStart.Row(), pRange-aEnd.Col(), pRange-aEnd.Row() ); } -- To view, visit https://gerrit.libreoffice.org/2616 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] handle note export correctly, fdo#61165
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2629
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/2629/1
handle note export correctly, fdo#61165
This code was horribly over-optimized and that actually with an error.
There is a nasty corner cases that has been left out in the code. Note
captions are actually normally not deleted from the document even if the
note is deleted. So we had now wrong note captions in the list that we
should not process but they were screwing up the export code that only
exports captions for existing notes.
When we only add the caption data for existing notes the code becomes so
much cleaner and the bug is immediately gone.
Change-Id: I51f1e9042f88f3f1b2d7aae75942629771d39012
(cherry picked from commit c7937e2a38501266ed658553c19db5b4a2237864)
---
M sc/source/filter/xml/XMLExportIterator.cxx
M sc/source/filter/xml/xmlexprt.cxx
2 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index cfbbe54..1662db7 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -861,33 +861,21 @@
table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 );
UpdateAddress( aAddress );
-if( (maNoteExportListItr != maNoteExportList.end())
IsNoteBeforeNextCell(maNoteExportListItr-nCol, maNoteExportListItr-nRow,
aAddress) )
-{
-//we have a note before the new cell
-aAddress.Column = maNoteExportListItr-nCol;
-aAddress.Row = maNoteExportListItr-nRow;
-++maNoteExportListItr;
-}
-else
-{
-if(maNoteExportListItr != maNoteExportList.end()
maNoteExportListItr-nCol == aAddress.Column maNoteExportListItr-nRow ==
aAddress.Row)
-++maNoteExportListItr;
-if( pShapes )
-pShapes-UpdateAddress( aAddress );
-if( pNoteShapes )
-pNoteShapes-UpdateAddress( aAddress );
-if( pEmptyDatabaseRanges )
-pEmptyDatabaseRanges-UpdateAddress( aAddress );
-if( pMergedRanges )
-pMergedRanges-UpdateAddress( aAddress );
-if( pAreaLinks )
-pAreaLinks-UpdateAddress( aAddress );
-if( pDetectiveObj )
-pDetectiveObj-UpdateAddress( aAddress );
-if( pDetectiveOp )
-pDetectiveOp-UpdateAddress( aAddress );
-}
+if( pShapes )
+pShapes-UpdateAddress( aAddress );
+if( pNoteShapes )
+pNoteShapes-UpdateAddress( aAddress );
+if( pEmptyDatabaseRanges )
+pEmptyDatabaseRanges-UpdateAddress( aAddress );
+if( pMergedRanges )
+pMergedRanges-UpdateAddress( aAddress );
+if( pAreaLinks )
+pAreaLinks-UpdateAddress( aAddress );
+if( pDetectiveObj )
+pDetectiveObj-UpdateAddress( aAddress );
+if( pDetectiveOp )
+pDetectiveOp-UpdateAddress( aAddress );
bool bFoundCell((aAddress.Column = MAXCOL) (aAddress.Row = MAXROW));
if( bFoundCell )
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index b599e6e..3882e2f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2531,13 +2531,16 @@
// collect note caption objects from all layers (internal or
hidden)
if( ScDrawObjData* pCaptData = ScDrawLayer::GetNoteCaptionData(
pObject, static_cast SCTAB ( nCurrentTable ) ) )
{
-pSharedData-AddNoteObj( xShape, pCaptData-maStart );
+
if(pDoc-GetNotes(nCurrentTable)-findByAddress(pCaptData-maStart))
+{
+pSharedData-AddNoteObj( xShape, pCaptData-maStart );
-// #i60851# When the file is saved while editing a new note,
-// the cell is still empty - last column/row must be updated
-OSL_ENSURE( pCaptData-maStart.Tab() == nCurrentTable,
invalid table in object data );
-pSharedData-SetLastColumn( nCurrentTable,
pCaptData-maStart.Col() );
-pSharedData-SetLastRow( nCurrentTable,
pCaptData-maStart.Row() );
+// #i60851# When the file is saved while editing a new
note,
+// the cell is still empty - last column/row must be
updated
+OSL_ENSURE( pCaptData-maStart.Tab() == nCurrentTable,
invalid table in object data );
+pSharedData-SetLastColumn( nCurrentTable,
pCaptData-maStart.Col() );
+pSharedData-SetLastRow( nCurrentTable,
pCaptData-maStart.Row() );
+}
}
// other objects from internal layer only (detective)
else if( pObject-GetLayer() == SC_LAYER_INTERN )
--
To view, visit https://gerrit.libreoffice.org/2629
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
[PUSHED libreoffice-4-0] fdo#54651: Only pick non-default number format for pivot fie...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2585 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2585 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia88282803c8df8389ed24efd8b1ca7600a39bf23 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] make all chart ranges explicitly 3D refs during import/expor...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2561 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/2561/1 make all chart ranges explicitly 3D refs during import/export, fdo#61781 Change-Id: I66657ce38456e4a8dc3a602997c451cf1cdd983b (cherry picked from commit a26217815d4e69ec2485c370dfef0fbb41d6c8ab) --- M sc/source/ui/unoobj/chart2uno.cxx 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index e877469..60b19c9 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -963,7 +963,8 @@ setRelative(aData.Ref1); setRelative(aData.Ref2); -// In XML, the end range must explicitly specify sheet name. +// In XML, the range must explicitly specify sheet name. +aData.Ref1.SetFlag3D(true); aData.Ref2.SetFlag3D(true); if (bExternal) -- To view, visit https://gerrit.libreoffice.org/2561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66657ce38456e4a8dc3a602997c451cf1cdd983b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] prevent non-3D refs from being accepted in chart2, related f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2562
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2562/1
prevent non-3D refs from being accepted in chart2, related fdo#61781
Change-Id: I4c7f79393721bff3d5e6fda98b8d4bf16a5ee398
(cherry picked from commit 47ec29ae934c82a58436bca057503568e907)
---
M sc/inc/reftokenhelper.hxx
M sc/source/core/tool/reftokenhelper.cxx
M sc/source/ui/unoobj/chart2uno.cxx
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index fed8232..d4fc698 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -46,7 +46,7 @@
*/
static void compileRangeRepresentation(
::std::vectorScTokenRef rRefTokens, const ::rtl::OUString
rRangeStr, ScDocument* pDoc,
-const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar);
+const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar,
bool bOnly3DRef = false);
static bool getRangeFromToken(ScRange rRange, const ScTokenRef pToken,
bool bExternal = false);
diff --git a/sc/source/core/tool/reftokenhelper.cxx
b/sc/source/core/tool/reftokenhelper.cxx
index b59d140..09d0712 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -35,7 +35,7 @@
void ScRefTokenHelper::compileRangeRepresentation(
vectorScTokenRef rRefTokens, const OUString rRangeStr, ScDocument*
pDoc,
-const sal_Unicode cSep, FormulaGrammar::Grammar eGrammar)
+const sal_Unicode cSep, FormulaGrammar::Grammar eGrammar, bool bOnly3DRef)
{
const sal_Unicode cQuote = '\'';
@@ -80,12 +80,22 @@
switch (pT-GetType())
{
case svSingleRef:
-if (!pT-GetSingleRef().Valid())
-bFailure = true;
+{
+const ScSingleRefData rRef = pT-GetSingleRef();
+if (!rRef.Valid())
+bFailure = true;
+else if (bOnly3DRef !rRef.IsFlag3D())
+bFailure = true;
+}
break;
case svDoubleRef:
-if (!pT-GetDoubleRef().Valid())
-bFailure = true;
+{
+const ScComplexRefData rRef = pT-GetDoubleRef();
+if (!rRef.Valid())
+bFailure = true;
+else if (bOnly3DRef !rRef.Ref1.IsFlag3D())
+bFailure = true;
+}
break;
case svExternalSingleRef:
if (!pT-GetSingleRef().ValidExternal())
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 60b19c9..ff095af 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -34,6 +34,7 @@
#include chartlis.hxx
#include stlalgorithm.hxx
#include tokenuno.hxx
+#include docsh.hxx
#include formula/opcode.hxx
@@ -1052,7 +1053,7 @@
vectorScTokenRef aTokens;
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
-aTokens, aRangeRepresentation, m_pDocument, cSep,
m_pDocument-GetGrammar());
+aTokens, aRangeRepresentation, m_pDocument, cSep,
m_pDocument-GetGrammar(), true);
return !aTokens.empty();
}
@@ -1484,7 +1485,7 @@
vectorScTokenRef aRefTokens;
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
-aRefTokens, aRangeRepresentation, m_pDocument, cSep,
m_pDocument-GetGrammar());
+aRefTokens, aRangeRepresentation, m_pDocument, cSep,
m_pDocument-GetGrammar(), true);
if (aRefTokens.empty())
// Invalid range representation. Bail out.
throw lang::IllegalArgumentException();
@@ -1818,7 +1819,7 @@
vectorScTokenRef aTokens;
const sal_Unicode cSep =
ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
-aTokens, xLabel-getSourceRangeRepresentation(),
m_pDocument, cSep, m_pDocument-GetGrammar());
+aTokens, xLabel-getSourceRangeRepresentation(),
m_pDocument, cSep, m_pDocument-GetGrammar(), true);
aLabel.initRangeAnalyzer(aTokens);
vectorScTokenRef::const_iterator itr = aTokens.begin(),
itrEnd = aTokens.end();
for (; itr != itrEnd; ++itr)
@@ -1837,7 +1838,7 @@
vectorScTokenRef aTokens;
const sal_Unicode cSep =
ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
-aTokens, xValues-getSourceRangeRepresentation(),
m_pDocument, cSep,
[PUSHED] Translate German comments to English in svmain.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2529 -- To view, visit https://gerrit.libreoffice.org/2529 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f27a839c6403c08983f0366402c852b0710029c Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] and one more fix for error bar import, related fdo#60083
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2559
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2559/1
and one more fix for error bar import, related fdo#60083
Change-Id: I76ff4849137aaad175b3c95dce6644d612871201
---
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 4463ebf..2218931 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1110,6 +1110,14 @@
aAny = aNegRange;
}
+aAny = SchXMLTools::getPropertyFromContext(PercentageError,
+pSeriesStyleContext, pStylesCtxt);
+if( aAny.hasValue() aBarStyle ==
com::sun::star::chart::ErrorBarStyle::RELATIVE )
+{
+xBarProp-setPropertyValue(PositiveError, aAny);
+xBarProp-setPropertyValue(NegativeError, aAny);
+}
+
switch(aBarStyle)
{
case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
--
To view, visit https://gerrit.libreoffice.org/2559
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76ff4849137aaad175b3c95dce6644d612871201
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] another fix for error bar import, related fdo#60083
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2560
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/2560/1
another fix for error bar import, related fdo#60083
Change-Id: I843a597702cb0cb66d8696c277666e1605091c09
---
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 2218931..0b9b205 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1110,6 +1110,13 @@
aAny = aNegRange;
}
+aAny = SchXMLTools::getPropertyFromContext(Weight,
+pSeriesStyleContext, pStylesCtxt);
+if( aAny.hasValue() )
+{
+xBarProp-setPropertyValue(Weight, aAny);
+}
+
aAny = SchXMLTools::getPropertyFromContext(PercentageError,
pSeriesStyleContext, pStylesCtxt);
if( aAny.hasValue() aBarStyle ==
com::sun::star::chart::ErrorBarStyle::RELATIVE )
--
To view, visit https://gerrit.libreoffice.org/2560
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I843a597702cb0cb66d8696c277666e1605091c09
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] we need to use GetParentDialog nowadays, fdo#60253
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2537
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2537/1
we need to use GetParentDialog nowadays, fdo#60253
Change-Id: I6317ce1f99af58439f7009cac5a4bc133e404dbf
(cherry picked from commit 1f810b3adf030d4e20e71845bd6368b119a53bc7)
---
M chart2/source/controller/dialogs/tp_ErrorBars.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 6956550..b7b00fa 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -35,7 +35,7 @@
m_aErrorBarResources(
this,
// the parent is the tab control, of which the parent is the dialog
-dynamic_cast Dialog * ( pParent-GetParent() ),
+dynamic_cast Dialog * ( pParent-GetParentDialog() ),
rInAttrs, /* bNoneAvailable = */ false )
{
FreeResource();
--
To view, visit https://gerrit.libreoffice.org/2537
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6317ce1f99af58439f7009cac5a4bc133e404dbf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translated German comment, other comments updated for clarit...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2525 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6db4f5dd66b928c9424cefebec3016e5bf5e8c49 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german-english sw/source/ui/uno/
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2530 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2530 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I350aa56bd27ef55a44d5a7140e78fa36b350b302 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] No need for commented out code.
Markus Mohrhard has abandoned this change. Change subject: No need for commented out code. .. Patch Set 1: Abandoned Has been committed manually without the dictionaries and helpcontent2 change as http://cgit.freedesktop.org/libreoffice/core/commit/?id=2d8cb19057e81f4f3297ffac803e11c6cb84b3db -- To view, visit https://gerrit.libreoffice.org/2528 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8a8b7735574d712aea2a3f2b42941669b2db00b8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] coverity#988423: fix memory leak
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2458
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/2458/1
coverity#988423: fix memory leak
Change-Id: I3ac2cca7e24e6cc1b47b42c2d42bc7caee91b559
---
M sd/source/ui/remotecontrol/BluetoothServer.cxx
M sd/source/ui/remotecontrol/BluetoothServer.hxx
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 9c271aa..475e0c1 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -586,7 +586,7 @@
mpCommunicators( pCommunicators )
{
#ifdef LINUX_BLUETOOTH
-mpImpl = new BluetoothServerImpl();
+mpImpl.reset(new BluetoothServerImpl());
#endif
(void) mpImpl; // Avoid warning: private field 'mpImpl' is not used
}
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx
b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index 8078ede..bfaeccc 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -12,6 +12,8 @@
#include osl/thread.hxx
#include vector
+#include boost/scoped_ptr.hpp
+
namespace sd
{
class Communicator;
@@ -40,7 +42,7 @@
enum { UNKNOWN, DISCOVERABLE, NOT_DISCOVERABLE } meWasDiscoverable;
static BluetoothServer *spServer;
-BluetoothServerImpl *mpImpl;
+boost::scoped_ptrBluetoothServerImpl mpImpl;
virtual void SAL_CALL run();
void cleanupCommunicators();
--
To view, visit https://gerrit.libreoffice.org/2458
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ac2cca7e24e6cc1b47b42c2d42bc7caee91b559
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] one more fix for error bar import, fdo#60083
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2434
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/2434/1
one more fix for error bar import, fdo#60083
This makes it finally possible to import the original test document.
Change-Id: I5941f2ce303a28674dcf04aeac2d178c0913
---
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index e5b16fd..4463ebf 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -980,8 +980,6 @@
else
aRoleBuffer.append( sal_Unicode( 'x' ));
-rtl::OUString aPlainRole = aRoleBuffer.makeStringAndClear();
-aRoleBuffer.append( aPlainRole );
aRoleBuffer.append( sal_Unicode( '-' ));
if( bPositiveValue )
@@ -1040,7 +1038,7 @@
namespace {
void SetErrorBarPropertiesFromStyleName( const OUString aStyleName,
uno::Reference beans::XPropertySet xBarProp,
-SchXMLImportHelper rImportHelper)
+SchXMLImportHelper rImportHelper,
OUString aPosRange, OUString aNegRange)
{
const SvXMLStylesContext* pStylesCtxt =
rImportHelper.GetAutoStylesContext();
const SvXMLStyleContext* pStyle =
pStylesCtxt-FindStyleChildContext(rImportHelper.GetChartFamilyID(),
@@ -1096,6 +1094,20 @@
if(aAny.hasValue())
xBarProp-setPropertyValue(NegativeError, aAny);
+}
+
+aAny = SchXMLTools::getPropertyFromContext(ErrorBarRangePositive,
+pSeriesStyleContext, pStylesCtxt);
+if( aAny.hasValue() )
+{
+aAny = aPosRange;
+}
+
+aAny = SchXMLTools::getPropertyFromContext(ErrorBarRangeNegative,
+pSeriesStyleContext, pStylesCtxt);
+if( aAny.hasValue() )
+{
+aAny = aNegRange;
}
switch(aBarStyle)
@@ -1183,8 +1195,8 @@
// first import defaults from parent style
-SetErrorBarPropertiesFromStyleName( maSeriesStyleName,
xBarProp, mrImportHelper );
-SetErrorBarPropertiesFromStyleName( sAutoStyleName,
xBarProp, mrImportHelper );
+SetErrorBarPropertiesFromStyleName( maSeriesStyleName,
xBarProp, mrImportHelper, aPosRange, aNegRange );
+SetErrorBarPropertiesFromStyleName( sAutoStyleName,
xBarProp, mrImportHelper, aPosRange, aNegRange );
uno::Reference chart2::XChartDocument
xDoc(GetImport().GetModel(),uno::UNO_QUERY);
--
To view, visit https://gerrit.libreoffice.org/2434
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5941f2ce303a28674dcf04aeac2d178c0913
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] remove the copied cond format cell attr entries, fdo#60306
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2435 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2435/1 remove the copied cond format cell attr entries, fdo#60306 The old exisiting conditional format entries in the ScAttrArray will not be overwritten in 4.0 so that we might have gotten a wrong conditional format before our existing conditional format. Change-Id: Ib619f6a1b335e9bbdffc8b518fe41b729775d24c --- M sc/source/core/data/table2.cxx 1 file changed, 8 insertions(+), 0 deletions(-) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1127f52..35d9f51 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -739,6 +739,14 @@ for ( SCCOL i = nCol1; i = nCol2; i++) aCol[i].CopyFromClip(nRow1, nRow2, nDy, nInsFlag, bAsLink, bSkipAttrForEmpty, pTable-aCol[i - nDx]); + +// make sure that there are no old references to the cond formats +sal_uInt16 nWhichArray[2]; +nWhichArray[0] = ATTR_CONDITIONAL; +nWhichArray[1] = 0; +for ( SCCOL i = nCol1; i = nCol2; ++i) +aCol[i].ClearItems(nRow1, nRow2, nWhichArray); + //remove old notes if (nInsFlag (IDF_NOTE|IDF_ADDNOTES)) maNotes.erase(nCol1, nRow1, nCol2, nRow2); -- To view, visit https://gerrit.libreoffice.org/2435 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib619f6a1b335e9bbdffc8b518fe41b729775d24c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english - redo of writer.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2140 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2140 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf885dc8d47077800bdc648072aa45eb46c9a286 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] support new attribute also in 3.6, fdo#60760
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2159
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2159/1
support new attribute also in 3.6, fdo#60760
Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
---
M sc/source/filter/xml/xmlcondformat.cxx
M sc/source/filter/xml/xmlimprt.cxx
M sc/source/filter/xml/xmlimprt.hxx
M xmloff/inc/xmloff/xmltoken.hxx
M xmloff/source/core/xmltoken.cxx
5 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index dbb5028..83daa86 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -294,6 +294,9 @@
case XML_TOK_DATABAR_DATABARENTRY:
pContext = new ScXMLDataBarFormatEntryContext( GetScImport(),
nPrefix, rLocalName, xAttrList, mpFormatData );
break;
+case XML_TOK_DATABAR_FORMATTINGENTRY:
+pContext = new ScXMLDataBarFormatEntryContext( GetScImport(),
nPrefix, rLocalName, xAttrList, mpFormatData );
+break;
default:
break;
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 204a3fa..aa925f7 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -706,6 +706,7 @@
static SvXMLTokenMapEntry aDataBarElemTokenMap[] =
{
{ XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY,
XML_TOK_DATABAR_DATABARENTRY },
+{ XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY,
XML_TOK_DATABAR_FORMATTINGENTRY },
XML_TOKEN_MAP_END
};
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index c4a4412..0974491 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -189,7 +189,8 @@
enum ScXMLDataBarFormatTokens
{
-XML_TOK_DATABAR_DATABARENTRY
+XML_TOK_DATABAR_DATABARENTRY,
+XML_TOK_DATABAR_FORMATTINGENTRY
};
enum ScXMLDataBarAttrTokens
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 16fe5e8..dca9fcf 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -850,6 +850,7 @@
XML_FOREIGN_OBJECT,
XML_FORMAT_CHANGE,
XML_FORMAT_SOURCE,
+XML_FORMATTING_ENTRY,
XML_FORMS,
XML_FORMULA,
XML_FORMULA_HIDDEN,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a1147aa..b21d7fa 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -854,6 +854,7 @@
TOKEN( foreign-object, XML_FOREIGN_OBJECT ),
TOKEN( format-change, XML_FORMAT_CHANGE ),
TOKEN( format-source, XML_FORMAT_SOURCE ),
+TOKEN( formatting-entry,XML_FORMATTING_ENTRY ),
TOKEN( forms, XML_FORMS ),
TOKEN( formula, XML_FORMULA ),
TOKEN( formula-hidden, XML_FORMULA_HIDDEN ),
--
To view, visit https://gerrit.libreoffice.org/2159
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation german - english - redo of 5 files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2143 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2143 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7668f30d4c813ce656e9d8d5fcc0060d1a6aff5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] bnc#802350: Cell validation is not a special (cell) content.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2128 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2128 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Comment translation - german-english - 3 files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2157 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2157 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie665a8dffc41ee057c0277788282eea96cbbe6a3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] CELL needs to be recalculated during import as well, fdo#606...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2168 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2168 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86e2d2c8156e50c14e4e9ae269e8b97e4560c68f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#39135: Prevent integer overflow update the character d...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2008 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2008 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] bnc#801152: Scan all columns to determine the first data row...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1959 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1959 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I693ec169857b181c6b4237efcba3fa6a46eaa531 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved fdo#60078 correctly calculate IMCSCH and IMSECH
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1927 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1927 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: make it possible to update DDE links after loading, fdo#5903...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1940 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1940/1 make it possible to update DDE links after loading, fdo#59032 Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 --- M formula/source/core/api/FormulaCompiler.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c402113..8323e15 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1076,6 +1076,9 @@ pArr-SetRecalcModeOnLoad(); pArr-SetHyperLink(true); break; +case ocDde: +pArr-SetRecalcModeOnLoad(); +break; default: ; // nothing } -- To view, visit https://gerrit.libreoffice.org/1940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Hyperlink is an optional property, fdo#58858
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1941
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1941/1
Hyperlink is an optional property, fdo#58858
Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Reviewed-on: https://gerrit.libreoffice.org/1930
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
---
M sc/source/filter/xml/xmlexprt.cxx
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 7ac0351..b599e6e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3092,9 +3092,16 @@
{
// #i66550 HLINK_FOR_SHAPES
rtl::OUString sHlink;
-uno::Reference beans::XPropertySet xProps( xShape, uno::UNO_QUERY );
-if ( xProps.is() )
-xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+try
+{
+uno::Reference beans::XPropertySet xProps( xShape,
uno::UNO_QUERY );
+if ( xProps.is() )
+xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+}
+catch ( const beans::UnknownPropertyException )
+{
+// no hyperlink property
+}
std::auto_ptr SvXMLElementExport pDrawA;
// enlose shapes with draw:a element only if sHlink contains
something
--
To view, visit https://gerrit.libreoffice.org/1941
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: if no cond format is valid use the existing protection, fdo#...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1942
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1942/1
if no cond format is valid use the existing protection, fdo#58826
Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
---
M sc/source/core/data/attarray.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 201538d..8059b17 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1278,6 +1278,8 @@
const ScProtectionAttr* pCondProtect =
static_castconst ScProtectionAttr*(pItem);
if( pCondProtect-GetProtection() ||
pProtect-GetHideCell() )
bFoundCond = true;
+else
+break;
}
else
{
@@ -1285,7 +1287,7 @@
// but existing one + cell where conditional
// formatting does not remove it
// = we have a protected cell
-bFoundCond = true;
+bFoundCond = bFoundTemp;
}
}
bFoundTemp = bFoundCond;
--
To view, visit https://gerrit.libreoffice.org/1942
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: show style when dialog is created with existing cond format, ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1943
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1943/1
show style when dialog is created with existing cond format, fdo#59778
Change-Id: Ic1218179cd9c87ec15826adc861d505339a05f2d
---
M sc/source/ui/condformat/condformatdlgentry.cxx
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index fb4a30a..f750ed5 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -516,6 +516,8 @@
{
maLbStyle.SelectEntryPos(1);
}
+
+StyleSelectHdl(NULL);
}
void ScFormulaFrmtEntry::Init()
@@ -1175,6 +1177,8 @@
rtl::OUString aStyleName = pFormat-GetStyleName();
maLbStyle.SelectEntry(aStyleName);
}
+
+StyleSelectHdl(NULL);
}
void ScDateFrmtEntry::Init()
--
To view, visit https://gerrit.libreoffice.org/1943
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1218179cd9c87ec15826adc861d505339a05f2d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to parse the cell address after import, fdo#59843
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1944 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1944/1 we need to parse the cell address after import, fdo#59843 Otherwise we may have problems with sheet names from sheets that are not yet imported. Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0 --- M sc/source/filter/xml/xmlcondformat.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index ae0c2d7..443361a 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -567,12 +567,10 @@ rtl::OUString aExpr2; ScConditionMode eMode; GetConditionData(sExpression, eMode, aExpr1, aExpr2); -ScAddress aPos; -sal_Int32 nIndex = 0; -ScRangeStringConverter::GetAddressFromString(aPos, sAddress, GetScImport().GetDocument(), formula::FormulaGrammar::CONV_ODF, nIndex); -ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), aPos, sStyle, +ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle, rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); +pFormatEntry-SetSrcString(sAddress); pFormat-AddEntry(pFormatEntry); } -- To view, visit https://gerrit.libreoffice.org/1944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to use SCROW for row numbers, fdo#59894
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1945
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1945/1
we need to use SCROW for row numbers, fdo#59894
This caused an overflow and resulted in adding endless number of values
until a bad_alloc was thrown.
Change-Id: I954acd801eb18e2c2fe6a449048856cb95d0d8b0
---
M sc/source/core/data/colorscale.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 55b8b43..3fe033a 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -293,7 +293,7 @@
SCTAB nTab = pRange-aStart.Tab();
for(SCCOL nCol = pRange-aStart.Col(); nCol = pRange-aEnd.Col();
++nCol)
{
-for(SCCOL nRow = pRange-aStart.Row(); nRow =
pRange-aEnd.Row(); ++nRow)
+for(SCROW nRow = pRange-aStart.Row(); nRow =
pRange-aEnd.Row(); ++nRow)
{
ScAddress aAddr(nCol, nRow, nTab);
CellType eType = mpDoc-GetCellType(aAddr);
--
To view, visit https://gerrit.libreoffice.org/1945
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I954acd801eb18e2c2fe6a449048856cb95d0d8b0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: ODFF: write RRI as RRI, not ZGZ, fdo#60077
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1922 -- To view, visit https://gerrit.libreoffice.org/1922 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Hyperlink is an optional property, fdo#58858
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1930
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1930/1
Hyperlink is an optional property, fdo#58858
Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
---
M sc/source/filter/xml/xmlexprt.cxx
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 5782dbc..2a595b0 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3095,9 +3095,16 @@
{
// #i66550 HLINK_FOR_SHAPES
rtl::OUString sHlink;
-uno::Reference beans::XPropertySet xProps( xShape, uno::UNO_QUERY );
-if ( xProps.is() )
-xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+try
+{
+uno::Reference beans::XPropertySet xProps( xShape,
uno::UNO_QUERY );
+if ( xProps.is() )
+xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+}
+catch ( const beans::UnknownPropertyException )
+{
+// no hyperlink property
+}
std::auto_ptr SvXMLElementExport pDrawA;
// enlose shapes with draw:a element only if sHlink contains
something
--
To view, visit https://gerrit.libreoffice.org/1930
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#615357: Recompile cells with #NAME! for English function...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1931 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1931 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Use a method from UnoApitest instead of implement a new one ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1923 -- To view, visit https://gerrit.libreoffice.org/1923 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic02f13777503729ac70da590f4a42866f17ea9b2 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: reset automatic row height flag after import, fdo#59193
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1831 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1831/1 reset automatic row height flag after import, fdo#59193 Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b --- M sc/source/ui/docshell/docsh.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 948f622..43fd526 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -469,11 +469,14 @@ // still need to recalc volatile formula cells. aDocument.CalcFormulaTree(false, true, false); +bool bAdjustHeightOld = aDocument.IsAdjustHeightEnabled(); aDocument.EnableAdjustHeight(false); aDocument.SetXMLFromWrapper( false ); AfterXMLLoading(bRet); +aDocument.EnableAdjustHeight(bAdjustHeightOld); + return bRet; } -- To view, visit https://gerrit.libreoffice.org/1831 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: reset automatic row height flag after import, fdo#59193
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1832 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1832/1 reset automatic row height flag after import, fdo#59193 Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b --- M sc/source/ui/docshell/docsh.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 948f622..43fd526 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -469,11 +469,14 @@ // still need to recalc volatile formula cells. aDocument.CalcFormulaTree(false, true, false); +bool bAdjustHeightOld = aDocument.IsAdjustHeightEnabled(); aDocument.EnableAdjustHeight(false); aDocument.SetXMLFromWrapper( false ); AfterXMLLoading(bRet); +aDocument.EnableAdjustHeight(bAdjustHeightOld); + return bRet; } -- To view, visit https://gerrit.libreoffice.org/1832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: don't use ScDrawLayer::GetObjDataTab to get Anchor fix for f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1828 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1828 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0-0]: bnc#798271: Don't delete the PropertyMapEntry instance prema...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1860 Approvals: Markus Mohrhard: Verified; Looks good to me, approved Miklos Vajna: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1860 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: import inherited number formats with cached values, fdo#5972...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1866
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1866/1
import inherited number formats with cached values, fdo#59724
Change-Id: I698f60daf4e591b57d8d99c130d2e524dc10c306
---
M formula/inc/formula/token.hxx
M sc/inc/cell.hxx
M sc/inc/formularesult.hxx
M sc/inc/token.hxx
M sc/source/core/data/cell.cxx
M sc/source/core/data/cell2.cxx
M sc/source/core/tool/cellform.cxx
M sc/source/core/tool/formularesult.cxx
M sc/source/core/tool/token.cxx
M sc/source/filter/xml/xmlcelli.cxx
M sc/source/filter/xml/xmlcelli.hxx
M sc/source/ui/docshell/docsh.cxx
12 files changed, 123 insertions(+), 52 deletions(-)
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index b72234e..3a174d7 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -58,6 +58,9 @@
// and/or string result and a formula
// string to be compiled.
+svHybridValueCell, // A temporary formula cell with an
value
+// and possibily a string
representation
+
svExternalSingleRef,
svExternalDoubleRef,
svExternalName,
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 008b510..0322db6 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -429,6 +429,7 @@
// display as empty string if formula::svEmptyCell result
boolIsEmptyDisplayedAsString();
boolIsValue(); // also true if formula::svEmptyCell
+boolIsHybridValueCell(); // for cells after import to deal
with inherited number formats
double GetValue();
double GetValueAlways(); // ignore errors
rtl::OUString GetString();
@@ -492,6 +493,13 @@
const formula::FormulaGrammar::Grammar
eGrammar )
{ aResult.SetHybridFormula( r); eTempGrammar =
eGrammar; }
+/**
+ * For import only: use for formula cells that return a number
+ * formatted as some kind of string
+ */
+void SetHybridValueString( double nVal, const OUString r )
+{ aResult.SetHybridValueString( nVal, r ); }
+
void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef
pMat, formula::FormulaToken* pUL )
{
aResult.SetMatrix(nCols, nRows, pMat, pUL);
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2128636..673bcdb 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -162,7 +162,7 @@
ScConstMatrixRef GetMatrix() const;
/** Return formula string if type formula::svHybridCell, else empty
string. */
-const String GetHybridFormula() const;
+const OUString GetHybridFormula() const;
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString(), or only SetHybridString() for
@@ -179,6 +179,8 @@
SetHybridFormula() for formula string to be compiled later. */
SC_DLLPUBLIC void SetHybridFormula( const String rFormula );
+void SetHybridValueString( double nVal, const OUString rStr );
+
SC_DLLPUBLIC void SetMatrix( SCCOL nCols, SCROW nRows, const
ScConstMatrixRef pMat, formula::FormulaToken* pUL );
/** Get the const ScMatrixFormulaCellToken* if token is of that type, else
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index e08db6c..a540555 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -414,26 +414,37 @@
class SC_DLLPUBLIC ScHybridCellToken : public ScToken
{
private:
-double fDouble;
-String aString;
-String aFormula;
+double mfDouble;
+String maString;
+OUString maFormula;
public:
-ScHybridCellToken( double f,
-const String rStr,
-const String rFormula ) :
-ScToken( formula::svHybridCell ),
-fDouble( f ), aString( rStr ),
-aFormula( rFormula ) {}
-ScHybridCellToken( const ScHybridCellToken r
) :
-ScToken( r ), fDouble( r.fDouble),
-aString( r.aString), aFormula( r.aFormula)
{}
-const String GetFormula() const { return aFormula; }
-virtual double GetDouble() const;
-virtual const String GetString() const;
-virtual booloperator==( const formula::FormulaToken
rToken ) const;
-virtual FormulaToken* Clone() const { return new
ScHybridCellToken(*this); }
+ScHybridCellToken( double f,
+const OUString rStr,
+const
[PUSHED] Change in core[libreoffice-3-6]: bnc#798271: Don't delete the PropertyMapEntry instance prema...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1859 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1859 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: import inherited number formats with cached values, fdo#5972...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1870
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1870/1
import inherited number formats with cached values, fdo#59724
Change-Id: I698f60daf4e591b57d8d99c130d2e524dc10c306
Reviewed-on: https://gerrit.libreoffice.org/1866
Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com
Tested-by: Kohei Yoshida kohei.yosh...@gmail.com
---
M formula/inc/formula/token.hxx
M sc/inc/cell.hxx
M sc/inc/formularesult.hxx
M sc/inc/token.hxx
M sc/source/core/data/cell.cxx
M sc/source/core/data/cell2.cxx
M sc/source/core/tool/cellform.cxx
M sc/source/core/tool/formularesult.cxx
M sc/source/core/tool/token.cxx
M sc/source/filter/xml/xmlcelli.cxx
M sc/source/filter/xml/xmlcelli.hxx
M sc/source/ui/docshell/docsh.cxx
12 files changed, 123 insertions(+), 52 deletions(-)
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index b72234e..3a174d7 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -58,6 +58,9 @@
// and/or string result and a formula
// string to be compiled.
+svHybridValueCell, // A temporary formula cell with an
value
+// and possibily a string
representation
+
svExternalSingleRef,
svExternalDoubleRef,
svExternalName,
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 008b510..0322db6 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -429,6 +429,7 @@
// display as empty string if formula::svEmptyCell result
boolIsEmptyDisplayedAsString();
boolIsValue(); // also true if formula::svEmptyCell
+boolIsHybridValueCell(); // for cells after import to deal
with inherited number formats
double GetValue();
double GetValueAlways(); // ignore errors
rtl::OUString GetString();
@@ -492,6 +493,13 @@
const formula::FormulaGrammar::Grammar
eGrammar )
{ aResult.SetHybridFormula( r); eTempGrammar =
eGrammar; }
+/**
+ * For import only: use for formula cells that return a number
+ * formatted as some kind of string
+ */
+void SetHybridValueString( double nVal, const OUString r )
+{ aResult.SetHybridValueString( nVal, r ); }
+
void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef
pMat, formula::FormulaToken* pUL )
{
aResult.SetMatrix(nCols, nRows, pMat, pUL);
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2128636..673bcdb 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -162,7 +162,7 @@
ScConstMatrixRef GetMatrix() const;
/** Return formula string if type formula::svHybridCell, else empty
string. */
-const String GetHybridFormula() const;
+const OUString GetHybridFormula() const;
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString(), or only SetHybridString() for
@@ -179,6 +179,8 @@
SetHybridFormula() for formula string to be compiled later. */
SC_DLLPUBLIC void SetHybridFormula( const String rFormula );
+void SetHybridValueString( double nVal, const OUString rStr );
+
SC_DLLPUBLIC void SetMatrix( SCCOL nCols, SCROW nRows, const
ScConstMatrixRef pMat, formula::FormulaToken* pUL );
/** Get the const ScMatrixFormulaCellToken* if token is of that type, else
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index e08db6c..a540555 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -414,26 +414,37 @@
class SC_DLLPUBLIC ScHybridCellToken : public ScToken
{
private:
-double fDouble;
-String aString;
-String aFormula;
+double mfDouble;
+String maString;
+OUString maFormula;
public:
-ScHybridCellToken( double f,
-const String rStr,
-const String rFormula ) :
-ScToken( formula::svHybridCell ),
-fDouble( f ), aString( rStr ),
-aFormula( rFormula ) {}
-ScHybridCellToken( const ScHybridCellToken r
) :
-ScToken( r ), fDouble( r.fDouble),
-aString( r.aString), aFormula( r.aFormula)
{}
-const String GetFormula() const { return aFormula; }
-virtual double GetDouble() const;
-virtual const String GetString() const;
-virtual booloperator==( const formula::FormulaToken
rToken ) const;
-virtual FormulaToken*
[PUSHED] Change in core[libreoffice-4-0]: bnc#590020: Sort data points stably.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1871 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1871 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: bnc#590020: Sort data points stably.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1872 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1872 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove fprintf usage from vcl/builder
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1813 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1813 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I185cedfaff30063fe0d0deb64eecff8796ac1ff9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: resolved fdo#59583 prevent inappropriate column/row label de...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1796 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1796 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib86687bdecfcf5897f4700086fc9969cc3fab0f0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: resolved fdo#59583 prevent inappropriate column/row label de...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1797 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1797 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28d2e2492bddc02c07e139edbc69595a4f3f4a63 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: don't create multiple dialogs in the loop, fdo#59314
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1778 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1778/1 don't create multiple dialogs in the loop, fdo#59314 Change-Id: Ia48262cdf8b07caf6622f2d4a48f366f3f26c0fd --- M sc/source/ui/view/cellsh1.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 68be16dd..2227c19 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1805,6 +1805,7 @@ // found a matching range, edit this conditional format nKey = pCondFormat-GetKey(); pCondFormatDlg.reset( new ScCondFormatDlg( pTabViewShell-GetDialogParent(), pDoc, pCondFormat, rCondFormatRange, aPos, condformat::dialog::NONE ) ); +break; } } -- To view, visit https://gerrit.libreoffice.org/1778 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia48262cdf8b07caf6622f2d4a48f366f3f26c0fd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: prevent to create cond formats with empty range, fdo#58778
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1780
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/1780/1
prevent to create cond formats with empty range, fdo#58778
Change-Id: I54bac843dc60c419c23c6d3f22c8d2f4b5805327
---
M sc/source/ui/condformat/condformatdlg.cxx
M sc/source/ui/condformat/condformatmgr.cxx
M sc/source/ui/view/cellsh1.cxx
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 9a7be09..1af8118 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -463,12 +463,20 @@
ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const
{
rtl::OUString aRangeStr = maEdRange.GetText();
+if(aRangeStr.isEmpty())
+return NULL;
+
ScRangeList aRange;
sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID,
mpDoc-GetAddressConvention(), maPos.Tab());
ScConditionalFormat* pFormat = maCondFormList.GetConditionalFormat();
if(nFlags SCA_VALID !aRange.empty() pFormat)
pFormat-AddRange(aRange);
+else
+{
+delete pFormat;
+pFormat = NULL;
+}
return pFormat;
}
diff --git a/sc/source/ui/condformat/condformatmgr.cxx
b/sc/source/ui/condformat/condformatmgr.cxx
index 5a5ea1b..e9278a0 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -276,14 +276,14 @@
if(pDlg-Execute() == RET_OK)
{
ScConditionalFormat* pNewFormat = pDlg-GetConditionalFormat();
-if(!pNewFormat)
-return 0;
+if(pNewFormat)
+{
+mpFormatList-InsertNew(pNewFormat);
+pNewFormat-SetKey(FindKey(mpFormatList));
+maCtrlManager.Update();
-mpFormatList-InsertNew(pNewFormat);
-pNewFormat-SetKey(FindKey(mpFormatList));
-maCtrlManager.Update();
-
-mbModified = true;
+mbModified = true;
+}
}
Show(true, 0);
pScMod-SetRefDialog( nId, false );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 2227c19..f67717d 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1879,7 +1879,10 @@
if( pCondFormatDlg-Execute() == RET_OK )
{
ScConditionalFormat* pFormat =
pCondFormatDlg-GetConditionalFormat();
-
pData-GetDocShell()-GetDocFunc().ReplaceConditionalFormat(nKey, pFormat,
aPos.Tab(), pFormat-GetRange());
+if(pFormat)
+
pData-GetDocShell()-GetDocFunc().ReplaceConditionalFormat(nKey, pFormat,
aPos.Tab(), pFormat-GetRange());
+else
+
pData-GetDocShell()-GetDocFunc().ReplaceConditionalFormat(nKey, NULL,
aPos.Tab(), ScRangeList());
}
pScMod-SetRefDialog( nId, false );
--
To view, visit https://gerrit.libreoffice.org/1780
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bac843dc60c419c23c6d3f22c8d2f4b5805327
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: add missing data bar axis import, fdo#59578
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1781
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/1781/1
add missing data bar axis import, fdo#59578
Change-Id: Id035741b2372c76f9afe54f59f2203c5edfbb0ae
---
M sc/source/filter/xml/xmlcondformat.cxx
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 8b97a78..ae0c2d7 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -254,6 +254,14 @@
else
mpFormatData-mbNeg = false;
+if(!sAxisPosition.isEmpty())
+{
+if(sAxisPosition == middle)
+mpFormatData-meAxisPosition = databar::MIDDLE;
+else if (sAxisPosition == none)
+mpFormatData-meAxisPosition = databar::NONE;
+}
+
if(!sAxisColor.isEmpty())
{
sal_Int32 nColor = 0;
--
To view, visit https://gerrit.libreoffice.org/1781
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id035741b2372c76f9afe54f59f2203c5edfbb0ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
