LibreOffice Gerrit News for core on 2014-02-09
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#74112 Write Chart Displayunits information back to XML. in https://gerrit.libreoffice.org/7722 from Sushil Shinde about module chart2, oox + fdo#74112 Preserve Chart displayunits properties during ODF import/export in https://gerrit.libreoffice.org/7721 from Sushil Shinde about module chart2, include, offapi, xmloff + FDO#74430: File Corruption due to repetition of docPr Id in https://gerrit.libreoffice.org/7916 from Umesh Kadam about module chart2, sw End of freshness + Changes to IsClipRegion and ImplIsAntiparallel in https://gerrit.libreoffice.org/7949 from Chris Sherlock about module editeng, include, vcl + fdo#74424 Move ReMirror into wrapper functions in https://gerrit.libreoffice.org/7943 from Chris Sherlock about module include, vcl + fdo#74424 HasMirroredGraphics changes in https://gerrit.libreoffice.org/7912 from Chris Sherlock about module include, vcl + Translated some German comments in https://gerrit.libreoffice.org/7948 from Alexander Wilms about module sw + Linked with -> Inherit from in style dialog in https://gerrit.libreoffice.org/7941 from Alexander Wilms about module sfx2 + fdo#74115 Fix for DOCX GradientFill for Chart Wall in https://gerrit.libreoffice.org/7739 from Vinaya Mandke about module chart2, include, oox + fdo#74115 Fix for DOCX BitmapFill for Chart Wall in https://gerrit.libreoffice.org/7792 from Vinaya Mandke about module chart2, include, oox, sc, sw * Merged changes on master for project core changed in the last 25 hours: + fdo#52461 Multiple instances of same cell now get same color. in https://gerrit.libreoffice.org/7514 from Rachit Gupta + The accessible action "click" changed name to "press", adjust wrapper acc in https://gerrit.libreoffice.org/7932 from Niklas Johansson * Abandoned changes on master for project core changed in the last 25 hours: + Bug #63962 Dynamically scan the config directory for icon themes in https://gerrit.libreoffice.org/7935 from Tobias Lippert * Open changes needing tweaks, but being untouched for more than a week: + fdo#50763: handle inlined base64 images in https://gerrit.libreoffice.org/7773 from Christina Roßmanith + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gerrit turorial in the Wiki: Bad file permission
Hi Miklos, Alright, I added the hint to each guide -- View this message in context: http://nabble.documentfoundation.org/Gerrit-turorial-in-the-Wiki-Bad-file-permission-tp4096159p4096272.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 mariosv changed: What|Removed |Added CC||mari...@miguelangel.mobi Depends on||74479 --- Comment #88 from mariosv --- Nominating https://bugs.freedesktop.org/show_bug.cgi?id=74479, SUMPRODUCT function treat empty cells as 1 when there are calculations or comparisons or functions as last parameter, and ranges with empty cells in others ranges. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx | 20
sc/source/core/tool/compiler.cxx | 28
2 files changed, 28 insertions(+), 20 deletions(-)
New commits:
commit 83cdcdb9f0fe11309939f5dca4fb46e426559896
Author: Kohei Yoshida
Date: Sat Feb 8 18:19:42 2014 -0500
fdo#74512: Generate escaped sheet names after the grammer is set.
Otherwise the single quote characters wouldn't be properly doubled.
Change-Id: I864ca8912a35049905e52e002d92d648e1278015
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 8c6dee9..f8d00f1 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -238,6 +238,14 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar
eGrammar )
if (eMyGrammar != GetGrammar())
SetGrammarAndRefConvention( eMyGrammar, eOldGrammar);
}
+
+if (pDoc && maTabNames.empty())
+{
+maTabNames = pDoc->GetAllTableNames();
+std::vector::iterator it = maTabNames.begin(), itEnd =
maTabNames.end();
+for (; it != itEnd; ++it)
+ScCompiler::CheckTabQuotes(*it,
formula::FormulaGrammar::extractRefConvention(meGrammar));
+}
}
void ScCompiler::SetNumberFormatter( SvNumberFormatter* pFormatter )
@@ -1546,16 +1554,6 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const
ScAddress& rPos,ScTokenArra
mbRewind( false )
{
nMaxTab = pDoc ? pDoc->GetTableCount() - 1 : 0;
-
-if (pDoc)
-{
-maTabNames = pDoc->GetAllTableNames();
-{
-std::vector::iterator it = maTabNames.begin(), itEnd =
maTabNames.end();
-for (; it != itEnd; ++it)
-ScCompiler::CheckTabQuotes(*it,
formula::FormulaGrammar::extractRefConvention(meGrammar));
-}
-}
}
ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos
) :
@@ -1589,16 +1587,6 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const
ScAddress& rPos)
mbRewind( false )
{
nMaxTab = pDoc ? pDoc->GetTableCount() - 1 : 0;
-
-if (pDoc)
-{
-maTabNames = pDoc->GetAllTableNames();
-{
-std::vector::iterator it = maTabNames.begin(), itEnd =
maTabNames.end();
-for (; it != itEnd; ++it)
-ScCompiler::CheckTabQuotes(*it,
formula::FormulaGrammar::extractRefConvention(meGrammar));
-}
-}
}
ScCompiler::~ScCompiler()
commit c4987cd730be2d4aa7c76e69fad4e3195413fb0c
Author: Kohei Yoshida
Date: Sat Feb 8 18:01:08 2014 -0500
fdo#74512: Add test for this.
Change-Id: I472a91375c6408761d9c300b3575cfe101649fca
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 411ed9e..05ff6b6 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -217,6 +217,26 @@ void Test::testFormulaParseReference()
m_pDoc->GetName(4, aTabName);
CPPUNIT_ASSERT_EQUAL(aTab4, aTabName);
+// Make sure the formula input and output match.
+{
+const char* aChecks[] = {
+"'90''s Music'.B12",
+"'90''s and 70''s'.$AB$100",
+"'All Others'.Z$100",
+"NoQuote.$C111"
+};
+
+for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+// Use the 'Dummy' sheet for this.
+OUString aInput("=");
+aInput += OUString::createFromAscii(aChecks[i]);
+m_pDoc->SetString(ScAddress(0,0,0), aInput);
+if (!checkFormula(*m_pDoc, ScAddress(0,0,0), aChecks[i]))
+CPPUNIT_FAIL("Wrong formula");
+}
+}
+
ScAddress aPos;
ScAddress::ExternalInfo aExtInfo;
sal_uInt16 nRes = aPos.Parse("'90''s Music'.D10", m_pDoc,
formula::FormulaGrammar::CONV_OOO, &aExtInfo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/shape/WpsContext.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c96d1ddf579fdce1e0afa8b7804d081e631deb22
Author: Miklos Vajna
Date: Sat Feb 8 23:45:30 2014 +0100
oox: whitespace fix in WpsContext
Just make sure that these two new lines match the style of the
rest of the file, which was so far consistent.
Change-Id: I6113753157fec7fd0e0dc95b36b477c301b2
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 7d37fc1..c30992d 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -89,9 +89,9 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
xPropertySet->setPropertyValue(aProps[i],
uno::makeAny(*oInsets[i]));
// Handle text vertical adjustment inside a text frame
-if( rAttribs.hasAttribute( XML_anchor ) )
+if (rAttribs.hasAttribute(XML_anchor))
{
-drawing::TextVerticalAdjust eAdjust =
drawingml::GetTextVerticalAdjust( rAttribs.getToken( XML_anchor, XML_t ) );
+drawing::TextVerticalAdjust eAdjust =
drawingml::GetTextVerticalAdjust(rAttribs.getToken(XML_anchor, XML_t));
xPropertySet->setPropertyValue("TextVerticalAdjust",
uno::makeAny(eAdjust));
}
return this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/rfindlst.hxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 4987ae04cf5b2c5e3b5c1439cab31bcf7c132f8b
Author: Markus Mohrhard
Date: Sat Feb 8 22:33:28 2014 +0100
fix my patch
How did I forget to attach this part?
Change-Id: I5f54793c3248c1ea8805426be1437abe730c5d45
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 28f1fac..f41d875 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -34,10 +34,8 @@ struct ScRangeFindData
sal_Int32 nSelEnd;
ScRangeFindData( const ScRange& rR, sal_uInt16 nF, sal_Int32 nS, sal_Int32
nE ) :
-ColorData nColorData;
-
-ScRangeFindData( const ScRange& rR, sal_uInt16 nF, xub_StrLen nS,
xub_StrLen nE) :
aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {}
+ColorData nColorData;
};
class ScRangeFindList
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |4 ++--
sc/source/ui/app/rfindlst.cxx | 17 -
sc/source/ui/inc/rfindlst.hxx | 11 +++
sc/source/ui/view/gridwin4.cxx |2 +-
4 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit 5ff8e1d8e31f23492ee1ccc3af0b73791cd5101b
Author: Rachit Gupta
Date: Sat Jan 18 16:07:02 2014 +0530
fdo#52461 Multiple instances of same cell now get same color.
nColorData added to ScRangeFindData for color assigned to cell.
While inserting a range in maEntries, vector is checked.
If the range is already present, the color is returned.
Else, a new entry is pushed in the vector and it's color is returned.
Conflicts:
sc/source/ui/inc/rfindlst.hxx
Change-Id: I38b93092cd22fa42ada55fa5d28eec9b71c12703
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 531a244..53ea0bb 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -277,11 +277,11 @@ handle_r1c1:
pRangeFindList = new ScRangeFindList( pDocSh->GetTitle() );
}
-pRangeFindList->Insert( ScRangeFindData( aRange, nFlags,
nStart, nPos ) );
+ColorData nColorData = pRangeFindList->Insert(
ScRangeFindData( aRange, nFlags, nStart, nPos ) );
ESelection aSel( 0, nStart, 0, nPos );
SfxItemSet aSet( pEngine->GetEmptyItemSet() );
-aSet.Put( SvxColorItem( Color( ScRangeFindList::GetColorName(
nCount ) ),
+aSet.Put( SvxColorItem( Color( nColorData ),
EE_CHAR_COLOR ) );
pEngine->QuickSetAttribs( aSet, aSel );
++nCount;
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index f24b9eb..b3c16f4 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -35,7 +35,22 @@ ScRangeFindList::ScRangeFindList(const OUString& rName) :
{
}
-ColorData ScRangeFindList::GetColorName( size_t nIndex )
+ColorData ScRangeFindList::Insert( const ScRangeFindData &rNew )
+{
+for(std::vector::iterator it=maEntries.begin();
it!=maEntries.end(); ++it)
+{
+if(it->aRef == rNew.aRef)
+{
+return it->nColorData;
+}
+}
+ScRangeFindData insertData(rNew);
+insertData.nColorData = aColNames[maEntries.size() % SC_RANGECOLORS];
+maEntries.push_back(insertData);
+return insertData.nColorData;
+}
+
+ColorData ScRangeFindList::GetColorName( const size_t nIndex )
{
return aColNames[nIndex % SC_RANGECOLORS];
}
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 090ea65..28f1fac 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -28,12 +28,15 @@
struct ScRangeFindData
{
-ScRange aRef;
-sal_uInt16 nFlags;
+ScRangeaRef;
+sal_uInt16 nFlags;
sal_Int32 nSelStart;
sal_Int32 nSelEnd;
ScRangeFindData( const ScRange& rR, sal_uInt16 nF, sal_Int32 nS, sal_Int32
nE ) :
+ColorData nColorData;
+
+ScRangeFindData( const ScRange& rR, sal_uInt16 nF, xub_StrLen nS,
xub_StrLen nE) :
aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {}
};
@@ -47,7 +50,7 @@ public:
ScRangeFindList(const OUString& rName);
sal_uLong Count() const { return maEntries.size();
}
-voidInsert( const ScRangeFindData &rNew ) {
maEntries.push_back(rNew); }
+ColorDataInsert( const ScRangeFindData &rNew );
ScRangeFindData* GetObject( sal_uLong nIndex ) { return
&(maEntries[nIndex]); }
@@ -56,7 +59,7 @@ public:
const OUString& GetDocName() const { return aDocName; }
boolIsHidden() const{ return bHidden; }
-static ColorData GetColorName( size_t nIndex );
+static ColorData GetColorName(const size_t nIndex);
};
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 6390f8b..729073b 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -805,7 +805,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2,
SCROW nY2, ScUpdateMod
if ( aRef.aStart.Tab() >= nTab && aRef.aEnd.Tab() <= nTab )
aOutputData.DrawRefMark( aRef.aStart.Col(),
aRef.aStart.Row(),
aRef.aEnd.Col(), aRef.aEnd.Row(),
-Color(
ScRangeFindList::GetColorName( i ) ),
+Color( pData->nColorData ),
sal_True );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - chart2/inc chart2/source i18npool/source include/sax sax/source sc/inc sc/source svx/source sw/source ucb/source
chart2/inc/ChartView.hxx |2 -
chart2/source/view/main/ChartView.cxx|2 -
i18npool/source/localedata/saxparser.cxx | 45 +++
include/sax/fastparser.hxx |2 -
sax/source/fastparser/fastparser.cxx |3 +-
sc/inc/styleuno.hxx |3 +-
sc/source/ui/unoobj/styleuno.cxx |3 +-
svx/source/svdraw/svdouno.cxx|2 -
sw/source/core/text/itrtxt.hxx |9 --
sw/source/ui/ribbar/workctrl.cxx |6 ++--
ucb/source/ucp/cmis/cmis_content.cxx |3 +-
11 files changed, 55 insertions(+), 25 deletions(-)
New commits:
commit dec544be7c929a5c006008ddd3b901f18f4fbbe1
Author: Caolán McNamara
Date: Sat Feb 8 21:07:58 2014 +
coverity#169849 Uncaught exception
Change-Id: I7c41fcd5be19ed9a0ba7e06920da4eadd0ea15a9
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 53507d6..ca20f18 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -325,7 +325,8 @@ public:
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName
)
throw(::com::sun::star::beans::UnknownPropertyException,
-::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
const OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 8c2c60f..6205774 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1252,7 +1252,8 @@ uno::Sequence SAL_CALL
ScStyleObj::getPropertyStates(
}
void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName )
-throw(beans::UnknownPropertyException,
uno::RuntimeException)
+throw(beans::UnknownPropertyException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
commit 120cd03989394896cdcc928303546254b1e956ac
Author: Caolán McNamara
Date: Sat Feb 8 21:06:15 2014 +
coverity#1169818 Dereference after null check
Change-Id: Ie8afd01a36b797ef7733f1cdd36775ff086a278a
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 5f3d27b..f56d10e 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -289,10 +289,13 @@ class SwTxtCursor : public SwTxtAdjuster
void _GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* );
protected:
void CtorInitTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
-inline SwTxtCursor(SwTxtNode* pTxtNode) : SwTxtAdjuster(pTxtNode) { }
+SwTxtCursor(SwTxtNode* pTxtNode) : SwTxtAdjuster(pTxtNode) { }
public:
-inline SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) :
SwTxtAdjuster(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
- { CtorInitTxtCursor( pTxtFrm, pTxtSizeInf ); }
+SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf )
+: SwTxtAdjuster(pTxtFrm->GetTxtNode())
+{
+CtorInitTxtCursor(pTxtFrm, pTxtSizeInf);
+}
bool GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
commit f4e984edfa2f72d36f8e8db4de0d8ba49639b034
Author: Caolán McNamara
Date: Sat Feb 8 20:58:40 2014 +
coverity#1169810 Logically dead code
Change-Id: I565b3fc948c66a7b8e9815cf746714f9a2a70267
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 4a683c7..9a34dea 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -544,7 +544,7 @@ uno::Reference< awt::XControl >
SdrUnoObj::GetUnoControl(const SdrView& _rView,
if ( !pPageView || GetPage() != pPageView->GetPage() )
return NULL;
-SdrPageWindow* pPageWindow = pPageView ? pPageView->FindPageWindow( _rOut
) : NULL;
+SdrPageWindow* pPageWindow = pPageView->FindPageWindow( _rOut );
OSL_ENSURE( pPageWindow, "SdrUnoObj::GetUnoControl: did not find my
SdrPageWindow!" );
if ( !pPageWindow )
return NULL;
commit e6242ef5bf398cb598b5eeac1141576e87b0baf3
Author: Caolán McNamara
Date: Sat Feb 8 20:57:12 2014 +
coverity#1169809 regression on long->bool
regression since 04683f14883f4cd64febadd71b327639f1e7edcc
apparently
Change-Id: I35b154dafd9534fb8234a82683cb3e879e136834
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 2833fef..0b449af 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/wor
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.hxx|2 +
sc/qa/unit/ucalc_sharedformula.cxx | 39
sc/source/core/data/formulacell.cxx |8 +++
3 files changed, 49 insertions(+)
New commits:
commit 1556dbc451f067d8744378fb9bac0eaa7ef8f5ac
Author: Kohei Yoshida
Date: Sat Feb 8 15:13:18 2014 -0500
fdo#74453: Only adjust tokens for top formula cells of formula group.
Change-Id: Id04387dffac271b3d617da0fbc19c862c929d60a
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index a1e9ec1..88ca441 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3023,6 +3023,10 @@ void ScFormulaCell::UpdateInsertTabAbs(SCTAB nTable)
if (pDocument->IsClipOrUndo())
return;
+bool bAdjustCode = !mxGroup || mxGroup->mpTopCell == this;
+if (!bAdjustCode)
+return;
+
pCode->Reset();
ScToken* p = static_cast(pCode->GetNextReferenceRPN());
while (p)
@@ -3045,6 +3049,10 @@ bool ScFormulaCell::TestTabRefAbs(SCTAB nTable)
if (pDocument->IsClipOrUndo())
return false;
+bool bAdjustCode = !mxGroup || mxGroup->mpTopCell == this;
+if (!bAdjustCode)
+return false;
+
bool bRet = false;
pCode->Reset();
ScToken* p = static_cast(pCode->GetNextReferenceRPN());
commit ac5682aa3013550e3643026c571b5d851b9e7b67
Author: Kohei Yoshida
Date: Sat Feb 8 14:42:31 2014 -0500
fdo#74453: Write unit test for this.
Change-Id: Ic8cbc650d6608ff7af5d1d58deeeba409bb81725
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index f595467..053e607 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -252,6 +252,7 @@ public:
void testSharedFormulasRefUpdateRange();
void testSharedFormulasDeleteRows();
void testSharedFormulasRefUpdateMoveSheets();
+void testSharedFormulasRefUpdateCopySheets();
void testSharedFormulasCopyPaste();
void testSharedFormulaInsertColumn();
void testFormulaPosition();
@@ -414,6 +415,7 @@ public:
CPPUNIT_TEST(testSharedFormulasRefUpdateRange);
CPPUNIT_TEST(testSharedFormulasDeleteRows);
CPPUNIT_TEST(testSharedFormulasRefUpdateMoveSheets);
+CPPUNIT_TEST(testSharedFormulasRefUpdateCopySheets);
CPPUNIT_TEST(testSharedFormulasCopyPaste);
CPPUNIT_TEST(testSharedFormulaInsertColumn);
CPPUNIT_TEST(testFormulaPosition);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index 04e917f..a64398b 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -600,6 +600,45 @@ void Test::testSharedFormulasRefUpdateMoveSheets()
m_pDoc->DeleteTab(0);
}
+void Test::testSharedFormulasRefUpdateCopySheets()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // make sure auto calc is on.
+
+m_pDoc->InsertTab(0, "Sheet1");
+m_pDoc->InsertTab(1, "Sheet2");
+
+m_pDoc->SetValue(ScAddress(0,0,1), 1.0); // A1 on Sheet2
+m_pDoc->SetValue(ScAddress(0,1,1), 2.0); // A2 on Sheet2
+
+// Reference values on Sheet2, but use absolute sheet references.
+m_pDoc->SetString(ScAddress(0,0,0), "=$Sheet2.A1");
+m_pDoc->SetString(ScAddress(0,1,0), "=$Sheet2.A2");
+
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(0,1,0)));
+
+// Copy Sheet1 and insert the copied sheet before the current Sheet1
position.
+m_pDoc->CopyTab(0, 0);
+
+if (!checkFormula(*m_pDoc, ScAddress(0,0,0), "$Sheet2.A1"))
+CPPUNIT_FAIL("Wrong formula");
+
+if (!checkFormula(*m_pDoc, ScAddress(0,1,0), "$Sheet2.A2"))
+CPPUNIT_FAIL("Wrong formula");
+
+// Check the values on the copied sheet.
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(0,1,0)));
+
+// Check the values on the original sheet.
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,1)));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(0,1,1)));
+
+m_pDoc->DeleteTab(2);
+m_pDoc->DeleteTab(1);
+m_pDoc->DeleteTab(0);
+}
+
void Test::testSharedFormulasCopyPaste()
{
m_pDoc->InsertTab(0, "Test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#66822: refactor HTML export of image bullet list
Fixed HTML export of image bullet list. Removed width, height, align
attributes in . Removed two unused variables.
This code is contributed under the LGPLv3+ / MPL.
From b9b6146ab0651c44f99a6a13ee85c1782f3d955b Mon Sep 17 00:00:00 2001
From: Timothy Markle
Date: Sat, 8 Feb 2014 20:11:56 +0100
Subject: [PATCH] fdo#66822 - refactor HTML export of image to bullet list
Replaced src attribute with style attribute in .
Removed invalid width, height, and align attributes.
Removed two unused variables rSize and pVert.
Change-Id: I40390bd02c7fb11a445da44d33492a59c8e6372c
---
sw/source/filter/html/htmlatr.cxx | 3 +--
sw/source/filter/html/htmlfly.cxx | 57 +++
sw/source/filter/html/htmlnum.cxx | 4 +--
sw/source/filter/html/wrthtml.hxx | 4 +--
4 files changed, 7 insertions(+), 61 deletions(-)
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 351d4ff..c691f9d 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -974,8 +974,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
-OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush(),
- rNumFmt.GetGraphicSize(), rNumFmt.GetGraphicOrientation() );
+OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush() );
}
rHWrt.GetNumInfo() = aNumInfo;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 4c07230..7e67b99 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1188,9 +1188,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
Writer& OutHTML_BulletImage( Writer& rWrt,
const sal_Char *pTag,
- const SvxBrushItem* pBrush,
- const Size &rSize,
- const SwFmtVertOrient* pVertOrient )
+ const SvxBrushItem* pBrush )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -1213,59 +1211,12 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
sOut.append('<').append(pTag);
sOut.append(' ');
-sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"").
+sOut.append(OOO_STRING_SVTOOLS_HTML_O_style).append("=\"").
+append("list-style-image: ").append("url(").
append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-sOut.append('\"');
-
-// Groesse des Objekts Twips ohne Raender
-Size aPixelSz( 0, 0 );
-if( (rSize.Width() || rSize.Height()) && Application::GetDefaultDevice() )
-{
-aPixelSz =
-Application::GetDefaultDevice()->LogicToPixel( rSize,
-MapMode(MAP_TWIP) );
-if( !aPixelSz.Width() && rSize.Width() )
-aPixelSz.Width() = 1;
-if( !aPixelSz.Height() && rSize.Height() )
-aPixelSz.Height() = 1;
-}
-
-if( aPixelSz.Width() )
-{
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).
-append("=\"").append(static_cast(aPixelSz.Width())).append("\"");
-}
-
-if( aPixelSz.Height() )
-{
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).
-append("=\"").append(static_cast(aPixelSz.Height())).append("\"");
-}
-
-if( pVertOrient )
-{
-const sal_Char *pStr = 0;
-switch( pVertOrient->GetVertOrient() )
-{
-case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top;break;
-case text::VertOrientation::CHAR_TOP:
-case text::VertOrientation::BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_texttop;break; // geht nicht
-case text::VertOrientation::LINE_CENTER:
-case text::VertOrientation::CHAR_CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_absmiddle; break; // geht nicht
-case text::VertOrientation::CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_middle; break;
-case text::VertOrientation::LINE_BOTTOM:
-case text::VertOrientation::CHAR_BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_absbottom; break; // geht nicht
-case text::VertOrientation::TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_bottom; break;
-case text::VertOrientation::NONE: break;
-}
-if( pStr )
-{
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).
-append("=\"").append(pStr).append("\"");
-}
-}
+sOut.append(");")
Re: OpenGL on Linux
Bit late to the party, but here you go: http://pastie.org/8712627 System: openSUSE 13.1 Hardware: Dell Latitude D830 with a "Mobile GM965/GL960 Integrated Graphics Controller" Cheers, Philipp On 29 January 2014 09:30, Alex Thurgood wrote: > Le 11/01/2014 18:54, Markus Mohrhard a écrit : > > Hi Markus, > > Here's one of mine : > > AMD Radeon HD 6310 Graphics > with Linux Mint 16 Petra 64bit and Cinnamon desktop > > > Alex > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - filter/source include/filter
filter/source/flash/swfexporter.cxx | 13
include/filter/msfilter/msdffimp.hxx | 15 --
include/filter/msfilter/svdfppt.hxx | 37 +++
3 files changed, 55 insertions(+), 10 deletions(-)
New commits:
commit 2d04286f258603a7fbb1d63cccaa7f1f81b22075
Author: Norbert Thiebaud
Date: Fri Feb 7 23:38:23 2014 -0600
coverity#707788 Unitialized scalar field
Change-Id: I0098ef6ca7f2463f9de7bada44272507c3b6e104
diff --git a/filter/source/flash/swfexporter.cxx
b/filter/source/flash/swfexporter.cxx
index 1c9b715..f672697 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -61,10 +61,15 @@ using com::sun::star::lang::XServiceInfo;
//
-
PageInfo::PageInfo()
-: meFadeEffect( FadeEffect_NONE ),
-meFadeSpeed( AnimationSpeed_MEDIUM ),
-mnDuration( 0 ),
-mnChange( 0 )
+: meFadeEffect( FadeEffect_NONE )
+, meFadeSpeed( AnimationSpeed_MEDIUM )
+, mnDuration( 0 )
+, mnChange( 0 )
+, mnBackgroundID( 0 )
+, mnObjectsID( 0)
+, mnForegroundID( 0)
+, mbBackgroundVisible( sal_False )
+, mbBackgroundObjectsVisible( sal_False )
{
}
commit 7ab03b245d255a66678bda4c622af3096fd4e5aa
Author: Norbert Thiebaud
Date: Fri Feb 7 23:26:52 2014 -0600
coverity#707785 Unitialized scalar field
Change-Id: If3a54628ae6dc0deb605ff075695147d6a58762b
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index b37bcb0..2e9f099 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -891,8 +891,19 @@ struct ImplPPTParaPropSet
sal_uInt32 nDontKnow2;
sal_uInt16 nDontKnow2bit06;
-ImplPPTParaPropSet()
-{ mnRefCount = 1; mnAttrSet = 0; mnExtParagraphMask = 0;
mnDepth = 0; };
+ImplPPTParaPropSet()
+: mnRefCount( 1 )
+, mnDepth( 0 )
+, mnAttrSet( 0 )
+, mnBulletColor( 0 )
+, mnExtParagraphMask( 0 )
+, mnAnmScheme( 0 )
+, mnHasAnm( 0 )
+, mnBuBlip( 0 )
+, nDontKnow1( 0 )
+, nDontKnow2( 0 )
+, nDontKnow2bit06( 0 )
+{ }
};
struct PPTParaPropSet
commit 618891adc69a27e9461bbc6ba69f4168426223ef
Author: Norbert Thiebaud
Date: Fri Feb 7 23:21:21 2014 -0600
coverity#707784 Unitialized scalar field
Change-Id: Iac0a1bb3dd01cc51d17e040a96a8c866fac01058
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index a64e05a..b37bcb0 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -921,7 +921,17 @@ struct ImplPPTCharPropSet
sal_uInt16 mnEscapement;
sal_uInt16 mnSymbolFont;
-ImplPPTCharPropSet(){ mnRefCount = 1; mnAttrSet = 0; };
+ImplPPTCharPropSet()
+: mnRefCount ( 1 )
+, mnAttrSet( 0 )
+, mnFlags( 0 )
+, mnFont( 0 )
+, mnAsianOrComplexFont( 0 )
+, mnANSITypeface( 0 )
+, mnFontHeight( 0 )
+, mnEscapement( 0 )
+, mnSymbolFont( 0)
+{ }
};
struct PPTCharPropSet
commit 47a82e10ca56a09846b275c0cf5af036791d31b0
Author: Norbert Thiebaud
Date: Fri Feb 7 23:14:58 2014 -0600
coverity#707783 Unitialized scalar field
Change-Id: I7d294c217da28b45fd94fb256d8f990d0f9427f5
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 286c1a0..a64e05a 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -286,7 +286,15 @@ struct PptUserEditAtom
sal_Int16 eLastViewType; // enum view type
public:
-PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {}
+PptUserEditAtom()
+: nLastSlideID( 0 )
+, nVersion( 0 )
+, nOffsetLastEdit( 0 )
+, nOffsetPersistDirectory( 0 )
+, nDocumentRef( 0 )
+, nMaxPersistWritten( 0 )
+, eLastViewType( 0 )
+{}
friend SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom&
rAtom );
};
commit bfcd369f9b9072494b893dbdeee09f5e4341deac
Author: Norbert Thiebaud
Date: Fri Feb 7 21:24:04 2014 -0600
coverity#707774: Uninitialized scalar value
Change-Id: Icba50e53a162276b90c1602d22f28fa3ef42f05d
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index c2bf039..0460830 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -176,8 +176,19 @@ struct SvxMSDffConnectorRule
SdrObject* pBObj; ///< pPtr of object (corresponding to shape B)
SdrObject* pCObj; ///< pPtr of connector object
-SvxMSDffConnectorRule() : nSpFlagsA( 0 ), nSpFlagsB( 0 ), pAObj( NULL ),
- pBObj( NULL ), pCObj( NULL ) {};
+Svx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/excdoc.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 7586a2ebb8eacae6b45910cb248694c27dfdb901
Author: Kohei Yoshida
Date: Sat Feb 8 11:37:46 2014 -0500
fdo#74521: Only pick cell notes for that sheet, and skip the rest.
Change-Id: I06a069e835eb7f2f90d34f4fcdfd935aff0234de
(cherry picked from commit 771b9d2718f28beedbc1a913e8965cdd1fc75a88)
Reviewed-on: https://gerrit.libreoffice.org/7945
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index a8bfbf7..9cf433d 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -421,7 +421,12 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
rDoc.GetAllNoteEntries(aNotes);
std::vector::const_iterator it = aNotes.begin(), itEnd =
aNotes.end();
for (; it != itEnd; ++it)
+{
+if (it->maPos.Tab() != mnScTab)
+continue;
+
mxNoteList->AppendNewRecord(new XclExpNote(GetRoot(), it->maPos,
it->mpNote, OUString()));
+}
if( GetOutput() != EXC_OUTPUT_BINARY )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/column3.cxx |4 1 file changed, 4 deletions(-) New commits: commit 92fa709032696af2fa1d23184d1bde282f94ff9e Author: Kohei Yoshida Date: Fri Feb 7 16:02:25 2014 -0500 fdo#74273: Let's not shift the note twice. Once is enough. The notes already are shifted at the top of the function. We don't need this bottom one. Change-Id: I10858d937674e236eecbc42ee08bf6eba197755a (cherry picked from commit 8f60dd0223f8834224b196153f0d8601403d76dc) Reviewed-on: https://gerrit.libreoffice.org/7938 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 4fdaf11..13ee606 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -291,10 +291,6 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize ) maCellTextAttrs.erase(nStartRow, nEndRow); maCellTextAttrs.resize(MAXROWCOUNT); -// Shift the cell notes array too (before the broadcast). -maCellNotes.erase(nStartRow, nEndRow); -maCellNotes.resize(MAXROWCOUNT); - CellStorageModified(); if (!bShiftCells) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c565eba9ef96798c3b584c7c0f887f92cf9ae572 Author: Kohei Yoshida Date: Sat Feb 8 09:42:46 2014 -0500 fdo#74414: No need to incremenet nRow here... It's just plain wrong. Change-Id: Iecdbb3eba46ddf2f2bc4f2334c7d45a4e2d801c8 (cherry picked from commit 1e3ef350d730bc54a3e9c393c2df6fd1f839a3a8) Reviewed-on: https://gerrit.libreoffice.org/7944 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 31da531..487e3a0 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1928,7 +1928,7 @@ public: std::vector aCloned; aCloned.reserve(nDataSize); -for (; it != itEnd; ++it, ++nRow) +for (; it != itEnd; ++it) aCloned.push_back(ScEditUtil::Clone(**it, mrDestCol.GetDoc())); maDestPos.miCellPos = mrDestCol.GetCellStore().set( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/data/ods/notes-on-3-sheets.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 45 ++
sc/source/filter/excel/excdoc.cxx |5 +++
3 files changed, 50 insertions(+)
New commits:
commit 771b9d2718f28beedbc1a913e8965cdd1fc75a88
Author: Kohei Yoshida
Date: Sat Feb 8 11:37:46 2014 -0500
fdo#74521: Only pick cell notes for that sheet, and skip the rest.
Change-Id: I06a069e835eb7f2f90d34f4fcdfd935aff0234de
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index a8bfbf7..9cf433d 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -421,7 +421,12 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
rDoc.GetAllNoteEntries(aNotes);
std::vector::const_iterator it = aNotes.begin(), itEnd =
aNotes.end();
for (; it != itEnd; ++it)
+{
+if (it->maPos.Tab() != mnScTab)
+continue;
+
mxNoteList->AppendNewRecord(new XclExpNote(GetRoot(), it->maPos,
it->mpNote, OUString()));
+}
if( GetOutput() != EXC_OUTPUT_BINARY )
{
commit 7d71fd489c39f348c43477cafdc1bc150bf1ff68
Author: Kohei Yoshida
Date: Sat Feb 8 10:46:47 2014 -0500
fdo#74521: Write unit test for this first.
Change-Id: I1815464e25703f1b0181211ac74341edb41793be
diff --git a/sc/qa/unit/data/ods/notes-on-3-sheets.ods
b/sc/qa/unit/data/ods/notes-on-3-sheets.ods
new file mode 100644
index 000..e7b6399
Binary files /dev/null and b/sc/qa/unit/data/ods/notes-on-3-sheets.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 47278e0..2db6307 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -70,6 +70,7 @@ public:
void testCellValuesExportODS();
void testCellNoteExportODS();
+void testCellNoteExportXLS();
void testFormatExportODS();
void testInlineArrayXLS();
@@ -91,6 +92,7 @@ public:
CPPUNIT_TEST(testRichTextExportODS);
CPPUNIT_TEST(testCellValuesExportODS);
CPPUNIT_TEST(testCellNoteExportODS);
+CPPUNIT_TEST(testCellNoteExportXLS);
CPPUNIT_TEST(testFormatExportODS);
CPPUNIT_TEST(testInlineArrayXLS);
CPPUNIT_TEST(testEmbeddedChartXLS);
@@ -775,6 +777,49 @@ void ScExportTest::testCellNoteExportODS()
xNewDocSh->DoClose();
}
+void ScExportTest::testCellNoteExportXLS()
+{
+// Start with an empty document.s
+ScDocShellRef xOrigDocSh = loadDoc("notes-on-3-sheets.", ODS);
+ScDocument* pDoc = xOrigDocSh->GetDocument();
+CPPUNIT_ASSERT_MESSAGE("This document should have 3 sheets.",
pDoc->GetTableCount() == 3);
+
+// Check note's presence.
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,0,0)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,1,0)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,2,0)));
+
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,0,1)));
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,1,1)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,2,1)));
+
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,0,2)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,1,2)));
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,2,2)));
+
+// save and reload as XLS.
+ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh, XLS);
+xOrigDocSh->DoClose();
+CPPUNIT_ASSERT(xNewDocSh.Is());
+pDoc = xNewDocSh->GetDocument();
+CPPUNIT_ASSERT_MESSAGE("This document should have 3 sheets.",
pDoc->GetTableCount() == 3);
+
+// Check note's presence again.
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,0,0)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,1,0)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,2,0)));
+
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,0,1)));
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,1,1)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,2,1)));
+
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,0,2)));
+CPPUNIT_ASSERT(!pDoc->HasNote(ScAddress(0,1,2)));
+CPPUNIT_ASSERT( pDoc->HasNote(ScAddress(0,2,2)));
+
+xNewDocSh->DoClose();
+}
+
namespace {
void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/frmdlg/frmmgr.cxx | 140 -
sw/source/ui/inc/frmmgr.hxx| 36 +-
2 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit bbe6ea29856f5a5e2aeb87334a86bf8e3193dc23
Author: Miklos Vajna
Date: Sat Feb 8 16:58:12 2014 +0100
SwFlyFrmAttrMgr: rename member variables missing their prefixes
Change-Id: I044168d7102b7c970ff5dd454c74262af7f3ac62
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index ab4085c..c271907 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -55,14 +55,14 @@ static sal_uInt16 aFrmMgrRange[] = {
Description: determine frame attributes via Shell
*/
SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8
nType ) :
-aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
-pOwnSh( pSh ),
-bAbsPos( sal_False ),
-bNewFrm( bNew ),
-bIsInVertical( sal_False ),
-bIsInVerticalL2R( sal_False )
+m_aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
+m_pOwnSh( pSh ),
+m_bAbsPos( sal_False ),
+m_bNewFrm( bNew ),
+m_bIsInVertical( sal_False ),
+m_bIsInVerticalL2R( sal_False )
{
-if ( bNewFrm )
+if ( m_bNewFrm )
{
// set defaults:
sal_uInt16 nId = 0;
@@ -72,32 +72,32 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew,
SwWrtShell* pSh, sal_uInt8 nTyp
case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break;
case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break;
}
-aSet.SetParent( &pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
-aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
+m_aSet.SetParent( &m_pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
+m_aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
if ( 0 != ::GetHtmlMode(pSh->GetView().GetDocShell()) )
-aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT,
text::RelOrientation::PRINT_AREA ) );
+m_aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT,
text::RelOrientation::PRINT_AREA ) );
}
else if ( nType == FRMMGR_TYPE_NONE )
{
-pOwnSh->GetFlyFrmAttr( aSet );
+m_pOwnSh->GetFlyFrmAttr( m_aSet );
sal_Bool bRightToLeft;
-bIsInVertical = pOwnSh->IsFrmVertical(sal_True, bRightToLeft,
bIsInVerticalL2R);
+m_bIsInVertical = m_pOwnSh->IsFrmVertical(sal_True, bRightToLeft,
m_bIsInVerticalL2R);
}
-::PrepareBoxInfo( aSet, *pOwnSh );
+::PrepareBoxInfo( m_aSet, *m_pOwnSh );
}
SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, const
SfxItemSet &rSet ) :
-aSet( rSet ),
-pOwnSh( pSh ),
-bAbsPos( sal_False ),
-bNewFrm( bNew ),
-bIsInVertical(sal_False),
-bIsInVerticalL2R(sal_False)
+m_aSet( rSet ),
+m_pOwnSh( pSh ),
+m_bAbsPos( sal_False ),
+m_bNewFrm( bNew ),
+m_bIsInVertical(sal_False),
+m_bIsInVerticalL2R(sal_False)
{
if(!bNew)
{
sal_Bool bRightToLeft;
-bIsInVertical = pSh->IsFrmVertical(sal_True, bRightToLeft,
bIsInVerticalL2R);
+m_bIsInVertical = pSh->IsFrmVertical(sal_True, bRightToLeft,
m_bIsInVerticalL2R);
}
}
@@ -106,24 +106,24 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew,
SwWrtShell* pSh, const SfxItemS
*/
void SwFlyFrmAttrMgr::UpdateAttrMgr()
{
-if ( !bNewFrm && pOwnSh->IsFrmSelected() )
-pOwnSh->GetFlyFrmAttr( aSet );
-::PrepareBoxInfo( aSet, *pOwnSh );
+if ( !m_bNewFrm && m_pOwnSh->IsFrmSelected() )
+m_pOwnSh->GetFlyFrmAttr( m_aSet );
+::PrepareBoxInfo( m_aSet, *m_pOwnSh );
}
void SwFlyFrmAttrMgr::_UpdateFlyFrm()
{
const SfxPoolItem* pItem = 0;
-if (aSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem) == SFX_ITEM_SET)
-pOwnSh->SetFlyName(((SfxStringItem *)pItem)->GetValue());
+if (m_aSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem) ==
SFX_ITEM_SET)
+m_pOwnSh->SetFlyName(((SfxStringItem *)pItem)->GetValue());
-pOwnSh->SetModified();
+m_pOwnSh->SetModified();
-if ( bAbsPos )
+if ( m_bAbsPos )
{
-pOwnSh->SetFlyPos( aAbsPos );
-bAbsPos = sal_False;
+m_pOwnSh->SetFlyPos( m_aAbsPos );
+m_bAbsPos = sal_False;
}
}
@@ -132,30 +132,30 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
*/
void SwFlyFrmAttrMgr::UpdateFlyFrm()
{
-OSL_ENSURE( pOwnSh->IsFrmSelected(),
+OSL_ENSURE( m_pOwnSh->IsFrmSelected(),
"no frame selected or no shell, update not possible");
-if( pOwnSh->IsFrmSelected() )
+if( m_pOwnSh->IsFrmSelected() )
{
//JP 6.8.2001: set never an invalid anchor into the core.
const SfxPool
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 33 +
sc/source/core/data/column.cxx |2 +-
2 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit 1e3ef350d730bc54a3e9c393c2df6fd1f839a3a8
Author: Kohei Yoshida
Date: Sat Feb 8 09:42:46 2014 -0500
fdo#74414: No need to incremenet nRow here... It's just plain wrong.
Change-Id: Iecdbb3eba46ddf2f2bc4f2334c7d45a4e2d801c8
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7d10c20..8e3d365 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1928,7 +1928,7 @@ public:
std::vector aCloned;
aCloned.reserve(nDataSize);
-for (; it != itEnd; ++it, ++nRow)
+for (; it != itEnd; ++it)
aCloned.push_back(ScEditUtil::Clone(**it,
mrDestCol.GetDoc()));
maDestPos.miCellPos = mrDestCol.GetCellStore().set(
commit 22cdd528d26d9e332df72135394f8d57bf227d03
Author: Kohei Yoshida
Date: Sat Feb 8 09:35:11 2014 -0500
fdo#74414: Add a bit more check in existing test to catch this.
Change-Id: I4ab844fe686e8c38968c34305936907380a1fe7b
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b91255e..83498b3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2042,15 +2042,27 @@ void Test::testCellCopy()
void Test::testSheetCopy()
{
m_pDoc->InsertTab(0, "TestTab");
-m_pDoc->SetString(ScAddress(0,0,0), "copy me");
CPPUNIT_ASSERT_MESSAGE("document should have one sheet to begin with.",
m_pDoc->GetTableCount() == 1);
+
+// Insert text in A1.
+m_pDoc->SetString(ScAddress(0,0,0), "copy me");
+
+// Insert edit cells in B1:B3.
+ScFieldEditEngine& rEE = m_pDoc->GetEditEngine();
+rEE.SetText("Edit 1");
+m_pDoc->SetEditText(ScAddress(1,0,0), rEE.CreateTextObject());
+rEE.SetText("Edit 2");
+m_pDoc->SetEditText(ScAddress(1,1,0), rEE.CreateTextObject());
+rEE.SetText("Edit 3");
+m_pDoc->SetEditText(ScAddress(1,2,0), rEE.CreateTextObject());
+
SCROW nRow1, nRow2;
bool bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2);
CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden
&& nRow1 == 0 && nRow2 == MAXROW);
// insert a note
-ScAddress aAdrA1 (0, 0, 0); // empty cell content
-OUString aHelloA1("Hello world in A1");
+ScAddress aAdrA1 (0,2,0); // empty cell content.
+OUString aHelloA1("Hello world in A3");
ScPostIt *pNoteA1 = m_pDoc->GetOrCreateNote(aAdrA1);
pNoteA1->SetText(aAdrA1, aHelloA1);
@@ -2059,7 +2071,20 @@ void Test::testSheetCopy()
CPPUNIT_ASSERT_MESSAGE("document now should have two sheets.",
m_pDoc->GetTableCount() == 2);
bHidden = m_pDoc->RowHidden(0, 1, &nRow1, &nRow2);
CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as
the original.", !bHidden && nRow1 == 0 && nRow2 == MAXROW);
-CPPUNIT_ASSERT_MESSAGE("There should be note on A1 in new sheet",
m_pDoc->HasNote(ScAddress (0, 0, 1)));
+CPPUNIT_ASSERT_MESSAGE("There should be note on A3 in new sheet",
m_pDoc->HasNote(ScAddress(0,2,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("copy me"),
m_pDoc->GetString(ScAddress(0,0,1)));
+
+// Check the copied edit cells.
+const EditTextObject* pEditObj = m_pDoc->GetEditText(ScAddress(1,0,1));
+CPPUNIT_ASSERT_MESSAGE("There should be an edit cell in B1.", pEditObj);
+CPPUNIT_ASSERT_EQUAL(OUString("Edit 1"), pEditObj->GetText(0));
+pEditObj = m_pDoc->GetEditText(ScAddress(1,1,1));
+CPPUNIT_ASSERT_MESSAGE("There should be an edit cell in B2.", pEditObj);
+CPPUNIT_ASSERT_EQUAL(OUString("Edit 2"), pEditObj->GetText(0));
+pEditObj = m_pDoc->GetEditText(ScAddress(1,2,1));
+CPPUNIT_ASSERT_MESSAGE("There should be an edit cell in B3.", pEditObj);
+CPPUNIT_ASSERT_EQUAL(OUString("Edit 3"), pEditObj->GetText(0));
+
m_pDoc->DeleteTab(1);
m_pDoc->SetRowHidden(5, 10, 0, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 18 commits - chart2/source cui/source framework/source sc/inc sc/source sw/source vcl/source writerfilter/source
chart2/source/view/inc/VDataSeries.hxx |2 +-
chart2/source/view/main/VDataSeries.cxx | 18 ++
cui/source/customize/macropg.cxx | 15 ---
framework/source/services/substitutepathvars.cxx | 13 ++---
sc/inc/cellsuno.hxx |9 ++---
sc/inc/optuno.hxx|3 ++-
sc/inc/styleuno.hxx | 19 +--
sc/source/ui/unoobj/cellsuno.cxx | 11 +++
sc/source/ui/unoobj/optuno.cxx |2 +-
sc/source/ui/unoobj/styleuno.cxx | 14 --
sc/source/ui/vba/vbarange.cxx|2 +-
sc/source/ui/vba/vbarange.hxx|3 ++-
sw/source/core/crsr/findattr.cxx | 10 +++---
sw/source/ui/utlui/content.cxx |2 +-
vcl/source/filter/sgfbram.cxx| 10 ++
vcl/source/filter/sgfbram.hxx|2 ++
vcl/source/filter/sgvmain.cxx|4
vcl/source/filter/sgvmain.hxx|1 +
vcl/source/window/window.cxx | 11 ++-
writerfilter/source/dmapper/GraphicImport.cxx|1 +
20 files changed, 109 insertions(+), 43 deletions(-)
New commits:
commit 7fe516a0ad42a2ec1f355b6ce45283d78fe210b4
Author: Caolán McNamara
Date: Sat Feb 8 14:06:49 2014 +
coverity#1169852 Uncaught exception
Change-Id: I52cd87c045eda2a11f48b0a28109bc7032033124
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 766800d..53507d6 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -340,7 +340,8 @@ public:
virtual void SAL_CALL setPropertiesToDefault( const
::com::sun::star::uno::Sequence<
OUString >& aPropertyNames )
throw
(::com::sun::star::beans::UnknownPropertyException,
-::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL
getPropertyDefaults( const
::com::sun::star::uno::Sequence<
OUString >& aPropertyNames )
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index e8489c9..8c2c60f 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1473,7 +1473,8 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault()
}
void SAL_CALL ScStyleObj::setPropertiesToDefault( const
uno::Sequence& aPropertyNames )
-throw (beans::UnknownPropertyException,
uno::RuntimeException)
+throw (beans::UnknownPropertyException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
commit f4897446c0ae9b9060562755351a3811c835e345
Author: Caolán McNamara
Date: Sat Feb 8 14:04:50 2014 +
coverity#1169853 Uncaught exception
Change-Id: I3f10fbc70e72f6788e8ecc6244cc89d0c6cfa07b
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 85f3698..a90e2a6 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1040,7 +1040,8 @@ protected:
virtual const SfxItemPropertyMap& GetItemPropertyMap();
virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
-throw(::com::sun::star::uno::RuntimeException);
+throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual voidSetOnePropertyValue( const
SfxItemPropertySimpleEntry* pEntry,
const
::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 7066610..eedda88 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8508,7 +8508,8 @@ void ScTableSheetObj::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pEn
void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry*
pEntry,
uno::Any& rAny )
-throw(uno::RuntimeException)
+throw(uno::RuntimeException,
+ std::exception)
{
if ( pEntry )
{
commit b39d5f1ebc9fd4b076d3ff1cb4c83fe07ef57329
Author: Caolán McNamara
Date: Sat Feb 8 14:02:46 2014 +
coverity#1169854 Uncaught exception
Change-Id: Id119394ea892dc44ec7f4c4679d1e3cd64203946
diff --git a/sc/inc/ce
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source
xmloff/source/style/cdouthdl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54583b6dec8ba17246f3422695b57795c64bc65d
Author: Kohei Yoshida
Date: Fri Feb 7 21:47:19 2014 -0500
fdo#73281: Why!?
This restriction makes absolutely no sense. It was likely someone's
temporarily hack that was totally forgotten in the past 10 years...
Not to mention removing this fixes my bug.
Change-Id: I7394cccdc9fe486fda6cdd9b7eaf98fd291895a9
(cherry picked from commit 503b7191737eafa5621dc0aa552092793676c998)
Reviewed-on: https://gerrit.libreoffice.org/7942
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index e2bf0e2..d559eb8 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -135,7 +135,7 @@ bool XMLCrossedOutTypePropHdl::exportXML( OUString&
rStrExpValue, const uno::Any
sal_Int16 nValue = sal_Int16();
OUStringBuffer aOut;
-if( (rValue >>= nValue) && awt::FontStrikeout::DOUBLE==nValue )
+if (rValue >>= nValue)
{
bRet = SvXMLUnitConverter::convertEnum(
aOut, (sal_uInt16)nValue, pXML_CrossedoutType_Enum );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - editeng/qa editeng/source include/editeng sw/source
editeng/qa/unit/core-test.cxx |4 ++--
editeng/source/editeng/edtspell.cxx |8
editeng/source/editeng/edtspell.hxx |2 +-
editeng/source/misc/svxacorr.cxx|6 +++---
include/editeng/svxacorr.hxx|2 +-
sw/source/core/edit/acorrect.cxx|9 +
sw/source/core/inc/acorrect.hxx |2 +-
7 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 2b3605bc8b2390bdde0d5ea52996fb4db42b0ce7
Author: Michael Stahl
Date: Sat Feb 8 00:23:10 2014 +0100
fdo#74363: fix auto correct of initial capitals on start of first para
The GetPrevPara() method apparently has to return 0 when there is no
previous paragraph.
(regression from ac85b6cff11d193f5f71d11b1f3cc1c474653f59)
Change-Id: I09a3e1d3a3adb33562e4e03c0755447047cbd433
(cherry picked from commit ebd0d0056d89a6a69d2cb75e28758132cb5c236b)
Reviewed-on: https://gerrit.libreoffice.org/7940
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 053e647..338a6cb7 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -267,10 +267,10 @@ private:
//fprintf(stderr, "TestAutoCorrDoc::SetINetAttr\n");
return true;
}
-virtual OUString GetPrevPara( sal_Bool )
+virtual OUString const* GetPrevPara(bool)
{
//fprintf(stderr, "TestAutoCorrDoc::GetPrevPara\n");
-return OUString();
+return 0;
}
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos,
sal_Int32 nEndPos, SvxAutoCorrect& rACorrect,
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index 68628f7..413435d 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -691,7 +691,7 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt,
sal_uInt16 nEnd,
return true;
}
-OUString EdtAutoCorrDoc::GetPrevPara( sal_Bool )
+OUString const* EdtAutoCorrDoc::GetPrevPara(bool const)
{
// Return previous paragraph, so that it can be determined,
// whether the current word is at the beginning of a sentence.
@@ -714,16 +714,16 @@ OUString EdtAutoCorrDoc::GetPrevPara( sal_Bool )
bBullet = true;
}
if ( bBullet )
-return OUString();
+return 0;
for ( sal_Int32 n = nPos; n; )
{
n--;
ContentNode* pNode = rNodes[n];
if ( pNode->Len() )
-return pNode->GetString();
+return & pNode->GetString();
}
-return OUString();
+return 0;
}
diff --git a/editeng/source/editeng/edtspell.hxx
b/editeng/source/editeng/edtspell.hxx
index 21d18bb..4f11774 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -147,7 +147,7 @@ public:
virtual sal_BoolSetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16
nSlotId, SfxPoolItem& );
virtual sal_BoolSetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const
OUString& rURL );
-virtual OUStringGetPrevPara( sal_Bool bAtNormalPos );
+virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE;
virtual boolChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
SvxAutoCorrect& rACorrect, OUString* pPara );
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 83a4707..667f561 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -873,8 +873,8 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc&
rDoc,
{
// Check out the previous paragraph, if it exists.
// If so, then check to paragraph separator at the end.
-OUString aPrevPara = rDoc.GetPrevPara( bNormalPos );
-if( !aPrevPara.isEmpty() )
+OUString const*const pPrevPara = rDoc.GetPrevPara(bNormalPos);
+if (!pPrevPara)
{
// valid separator -> replace
OUString sChar( *pWordStt );
@@ -883,7 +883,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc&
rDoc,
rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1,
sChar );
}
-aText = aPrevPara;
+aText = *pPrevPara;
bAtStart = sal_False;
pStart = aText.getStr();
pStr = pStart + aText.getLength();
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 2e3d5b3..82b76ce 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -101,7 +101,7 @@ public:
// TRUE: before the normal insertion position (TRUE)
// FALSE: in which the corrected word was inserted.
// (Does not to have to be the same paragraph )
-virtual OUString GetPrevPara( sal_Bool bAtNormalPos ) = 0;
+virtual OUString const* GetPrevPara(bool bAtNormalPos) = 0;
virtual bool ChgAutoCorrWord(
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/a11yactionwrapper.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 812da991eb3ea082e925eccf76698aa4415309b8
Author: Niklas Johansson
Date: Fri Feb 7 20:00:57 2014 +0100
The accessible action "click" changed name to "press", adjust wrapper
accordingly
The commit efb23f29983f87104a684e7fab00b84fc59d131d Integrate branch of
IAccessible2" changed the name of the accessible action click to press
we need to adjust the action wrapper class on mac accordingly.
Change-Id: I406a44e5b4fb31f4f12859ee5380b62cc5cccdf4
Reviewed-on: https://gerrit.libreoffice.org/7932
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/osx/a11yactionwrapper.mm b/vcl/osx/a11yactionwrapper.mm
index 31dc395..fa0de96 100644
--- a/vcl/osx/a11yactionwrapper.mm
+++ b/vcl/osx/a11yactionwrapper.mm
@@ -30,7 +30,7 @@
+(NSString *)nativeActionNameFor:(NSString *)actionName {
// TODO: Optimize ?
// Use NSAccessibilityActionDescription
-if ( [ actionName isEqualToString: @"click" ] ) {
+if ( [ actionName isEqualToString: @"press" ] ) {
return NSAccessibilityPressAction;
} else if ( [ actionName isEqualToString: @"togglePopup" ] ) {
return NSAccessibilityShowMenuAction;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Update on patch
I posted an update on my patch 7 days ago, but i am yet to receive any update/reply on the same. Can someone please take a look at it? Gerrit link: https://gerrit.libreoffice.org/#/c/7514 -- Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 43feacd5330b5652b58e8a75a0f41a78ee6ebe1c
Author: Miklos Vajna
Date: Sat Feb 8 12:23:57 2014 +0100
sw: fix build
1edca1fe0aaadbd48ea23b691dc244ad2a6b6f73 (fdo#74499: - FILESAVE:System
throws a segmentation fault while saving files, 2014-02-06) added a unit
test to make sure a crash doesn't occur, except that it forgot to fix
the problem itself. Disable that for now till the real fix arrives.
Change-Id: I2dd2e2f2bb6f518acf082534bb048fb2d13e58e8
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 27fba45..1de987d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2860,6 +2860,7 @@ DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx")
CPPUNIT_ASSERT(contents.match("PAGEREF _Toc355095261 \\h"));
}
+/* FIXME this still crashes
DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
"test_segfault_while_save.docx")
{
// fdo#74499
@@ -2867,7 +2868,7 @@ DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
"test_segfault_while_save.docx")
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(getXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").match("6138"));
-}
+}*/
DECLARE_OOXMLEXPORT_TEST(testDMLTextFrameVertAdjust,
"dml-textframe-vertadjust.docx")
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit turorial in the Wiki: Bad file permission
Hi Alex, On Sat, Feb 08, 2014 at 01:45:43AM +0100, Alexander Wilms wrote: > one issue that I noticed when following the tutorial > (https://wiki.documentfoundation.org/Development/gerrit) was that > the .ssh/config file had bad permissions after creating it via > gedit. Thus, "./logerrit test" failed. chmod 600 fixed this, so I'm > wondering whether this should be mentioned in the Wiki? Yes, it's a wiki, please just go ahead and fix it. :-) Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[SOLVED] Re: Cppcheck Same expression on both sides of '|' in PresenterPaneBorderManager.cxx (sdext)
On 07/02/2014 12:57, Caolán McNamara wrote: On Fri, 2014-01-31 at 06:49 -0800, julien2412 wrote: Hello, Cppcheck reported this: sdext/source/presenter/PresenterPaneBorderManager.cxx 171 duplicateExpression style Same expression on both sides of '|' I thought about putting this: case mnOutside: case mnOutside | mnLeft: Is it ok or do I miss something? I think you should go ahead with that. Seems the sane thing to do. Patch pushed on master (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=4415f6b7b19c1e6f805c6a7c190c2bebeebdd648) Thank you Caolán! Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sdext/source
sdext/source/presenter/PresenterPaneBorderManager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4415f6b7b19c1e6f805c6a7c190c2bebeebdd648
Author: Julien Nabet
Date: Sat Feb 8 09:08:07 2014 +0100
cppcheck: duplicateExpression
See
http://nabble.documentfoundation.org/Cppcheck-Same-expression-on-both-sides-of-in-PresenterPaneBorderManager-cxx-sdext-td4094873.html
Change-Id: I7dbb8d0254ca77127250d6ca02de7b945ef8051e
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx
b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 7285849..f02c4b0 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -168,7 +168,7 @@ PresenterPaneBorderManager::BorderElement
// Translate bits in nCode into BorderElement value.
switch (nCode)
{
-case mnOutside | mnOutside:
+case mnOutside:
case mnOutside | mnLeft:
case mnOutside | mnRight:
case mnOutside | mnHorizontalCenter:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - android/Module_android.mk sdext/CppunitTest_pdfimport.mk sdext/CppunitTest_sdext_pdfimport.mk sdext/Module_sdext.mk
android/Module_android.mk|3 + sdext/CppunitTest_pdfimport.mk | 61 --- sdext/CppunitTest_sdext_pdfimport.mk | 61 +++ sdext/Module_sdext.mk|2 - 4 files changed, 64 insertions(+), 63 deletions(-) New commits: commit 67316dd9ec0f93acf16c16e97f3e1472cfd2b8a8 Author: Matúš Kukan Date: Fri Feb 7 21:50:47 2014 +0100 Add CustomTarget_android_desktop back. Change-Id: I4bad098055c6c3b34dd5f02caf17df13cf4df797 diff --git a/android/Module_android.mk b/android/Module_android.mk index 336f118..e860449 100644 --- a/android/Module_android.mk +++ b/android/Module_android.mk @@ -12,7 +12,8 @@ $(eval $(call gb_Module_Module,android)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,android,\ -CustomTarget_lo4android \ + CustomTarget_lo4android \ + CustomTarget_android_desktop \ )) endif commit 0a1437b01bf27658c5dab5f1f99600cf4d57606f Author: Matúš Kukan Date: Sat Feb 8 08:57:43 2014 +0100 Rename makefile to match the name of test. Change-Id: I00f11f644b92f18f7a139bb8ece67c57a971f17e diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk similarity index 100% rename from sdext/CppunitTest_pdfimport.mk rename to sdext/CppunitTest_sdext_pdfimport.mk diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 5299cd8..f706e9c 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,sdext,\ )) $(eval $(call gb_Module_add_check_targets,sdext,\ -CppunitTest_pdfimport \ +CppunitTest_sdext_pdfimport \ Executable_pdf2xml \ Executable_pdfunzip \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
