[Libreoffice-commits] core.git: 3 commits - solenv/bin sw/qa writerfilter/source
solenv/bin/create-tags|5 +++--
sw/qa/extras/ooxmlimport/data/tdf89702.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 ++
writerfilter/source/dmapper/DomainMapper.cxx |7 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 ++--
5 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit f46bbb9f60a487e62f1fb028570329c0f2dff959
Author: Miklos Vajna
Date: Tue Jul 21 09:07:45 2015 +0200
Use comphelper::containerToSequence()
Change-Id: Ia7cc48f6f1bc041b95164d551e2cbc9ea2dbf2e8
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8a875ae..6a4a85a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3462,15 +3462,10 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_pImpl->m_aInteropGrabBagName;
-
-uno::Sequence
aSeq(m_pImpl->m_aInteropGrabBag.size());
-beans::PropertyValue* pSeq = aSeq.getArray();
-for (std::vector::iterator i =
m_pImpl->m_aInteropGrabBag.begin(); i != m_pImpl->m_aInteropGrabBag.end(); ++i)
-*pSeq++ = *i;
+aRet.Value =
uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag));
m_pImpl->m_aInteropGrabBag.clear();
m_pImpl->m_aInteropGrabBagName.clear();
-aRet.Value = uno::makeAny(aSeq);
return aRet;
}
commit a5da2a353f21debba7ef6262c01957c43b4f1c6e
Author: Miklos Vajna
Date: Tue Jul 21 09:06:22 2015 +0200
create-tags: recognize C++11 features hidden behind SAL macros
With this, not only the definition, but also the declaration of e.g.
'SwTextFrm::Format' (or any other member function that is overriding a
virtual function from a base class) can be found again, just like before
SAL_OVERRIDE and the similar macros were introduced.
Change-Id: Ic9e429ad7cbb0a1212744115d1567bb79b7c6aa0
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 7334936..639111c 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -12,9 +12,10 @@ if test "$1" = "-e"; then
ctags=etags
fi
+saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL -ISAL_CONSTEXPR"
omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
-$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
+$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions
$omnicppoptions \
--languages=-HTML,Java,JavaScript \
-R --exclude=instdir --exclude=instdir_for_build --exclude=workdir
--exclude=workdir_for_build \
--exclude=clone --exclude=external --totals=yes ${SRCDIR:-*}
@@ -25,7 +26,7 @@ else
w=workdir
fi
-$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
+$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions
$omnicppoptions \
--languages=-HTML,Java,JavaScript \
-R --append=yes --totals=yes \
$w/UnoApiHeadersTarget/udkapi/normal \
commit fc7c1a07d0d5e21a4e1533a0e5b0ac256763f973
Author: Miklos Vajna
Date: Tue Jul 21 09:04:44 2015 +0200
tdf#89702 DOCX import: fix too large bullet character
Commit c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (fdo#83465 RTF import:
handle font of numbering, 2014-09-25), changed the "get the me character
style of the current numbering's current level" member function to be
successfull even in case we're inside a DOCX run, not when we're inside
a DOCX paragraph, but outside runs.
While this is necessary for RTF, the side effect of this was that
unwanted run properties started to affect the above mentioned character
style in case of DOCX.
Fix the problem by enabling the "in paragraph and run" looking for RTF
only.
Change-Id: I610bfce6cec15b918fe547402360f5a894401f7e
diff --git a/sw/qa/extras/ooxmlimport/data/tdf89702.docx
b/sw/qa/extras/ooxmlimport/data/tdf89702.docx
new file mode 100644
index 000..5542d1c
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf89702.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index afc1f02..6ae2e0b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2734,6 +2734,20 @@ DECLARE_OOXMLIMPORT_TEST(testTdf90611, "tdf90611.docx")
CPPUNIT_ASSERT_EQUAL(10.f, getProperty(getParagraphOfText(1,
xFootnoteText), "CharHeight"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf89702, "tdf89702.docx")
+{
+// Get the first paragraph's numbering style's 2nd level's character style
name.
+uno::Reference xParagraph = getParagraph(1);
+auto xLevels = getProperty< uno::Reference
>(xParagraph, "NumberingRules");
+uno::Sequence aLevel;
+xLevels->getByIndex(1) >>= aLevel; // 2nd level
+OUString aCharStyleName = std::find_if(aLevel.begin
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/random.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f6f415a6690baf5420bd2561353199d5dc1209a8
Author: Noel Grandin
Date: Tue Jul 21 09:11:23 2015 +0200
loplugin:cstylecast
Change-Id: If877cd61000fe6b82083a9fff79c25364d49e721
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index f463713..48dc886 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -333,7 +333,7 @@ rtlRandomError SAL_CALL rtl_random_getBytes (
if ((pImpl == NULL) || (pBuffer == NULL))
return rtl_Random_E_Argument;
-if(pImpl->m_hDigest || !osl_get_system_random_data((char*)Buffer, Bytes))
+if(pImpl->m_hDigest ||
!osl_get_system_random_data(static_cast(Buffer), Bytes))
{
if(!pImpl->m_hDigest)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDMetaData.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c6223727c94e83a7eb852ff5ae07a3610942cbd1
Author: Miklos Vajna
Date: Tue Jul 21 09:32:10 2015 +0200
VSDMetaData: need space for the terminating null-character
Change-Id: Ie9cab1687dd3187819ec8e3e89b3e9355da9b255
diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 6449384..e8d4919 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -109,7 +109,8 @@ void
libvisio::VSDMetaData::readPropertySetStream(librevenge::RVNGInputStream *i
{
data4[i] = readU8(input);
}
- char FMTID0[36];
+ // Pretty-printed GUID is 36 bytes + the terminating null-character.
+ char FMTID0[37];
sprintf(FMTID0, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", data1,
data2, data3,
data4[0], data4[1], data4[2], data4[3], data4[4], data4[5],
data4[6], data4[7]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 36466] Copying Visible Cells Only
https://bugs.documentfoundation.org/show_bug.cgi?id=36466 --- Comment #10 from Gerry --- >From my observations of LO Calc users, copying VISIBLE CELLS ONLY is a basic feature for a spreadsheet, which many people really miss. Therefore, I would like to ask the developer team, whether it is possible to include the extension "Copy only visible cells" in the core LibreOffice software. http://extensions.libreoffice.org/extension-center/copy-only-visible-cells I think this inclusion of this small feature is justified, because users perceive this as core functionality and even don't get the idea themselves that this small feature might be supplied by an extension. Thanks! -- 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: compilerplugins/clang writerfilter/inc writerfilter/source
compilerplugins/clang/unusedmethods.py | 35 +++ writerfilter/inc/dmapper/resourcemodel.hxx | 10 -- writerfilter/inc/ooxml/OOXMLDocument.hxx |8 - writerfilter/source/dmapper/CellMarginHandler.hxx|2 writerfilter/source/dmapper/DomainMapper.hxx |1 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |1 writerfilter/source/dmapper/DomainMapperTableManager.hxx |6 - writerfilter/source/dmapper/DomainMapper_Impl.hxx|5 - writerfilter/source/dmapper/FormControlHelper.hxx|2 writerfilter/source/dmapper/NumberingManager.hxx | 10 -- writerfilter/source/dmapper/OLEHandler.hxx |1 writerfilter/source/dmapper/PropertyMap.cxx | 31 --- writerfilter/source/dmapper/PropertyMap.hxx | 66 --- writerfilter/source/dmapper/TableData.hxx| 31 --- writerfilter/source/dmapper/TableManager.hxx | 21 writerfilter/source/dmapper/TablePropertiesHandler.hxx |8 - writerfilter/source/dmapper/WrapPolygonHandler.cxx | 10 -- writerfilter/source/dmapper/WrapPolygonHandler.hxx |2 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 15 --- writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |3 writerfilter/source/ooxml/OOXMLPropertySet.hxx |2 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 20 writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx |2 writerfilter/source/ooxml/OOXMLStreamImpl.cxx|6 - writerfilter/source/ooxml/OOXMLStreamImpl.hxx|1 writerfilter/source/rtftok/rtfsprm.cxx | 10 -- writerfilter/source/rtftok/rtfsprm.hxx |2 27 files changed, 34 insertions(+), 277 deletions(-) New commits: commit 6ea66657ebca5b3ec63f93b496b812888e0d53c9 Author: Noel Grandin Date: Mon Jul 20 16:03:50 2015 +0200 loplugin:unusedmethods writerfilter Change-Id: I52441115e14da6c1bcd7ba4926a0f3cc0620366e Reviewed-on: https://gerrit.libreoffice.org/17236 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index 4535a98..cf9ce79 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -60,8 +60,39 @@ exclusionSet = set([ "const class rtl::OUString writerperfect::DocumentHandlerFor::name()", # only used by OSX build "void StyleSettings::SetHideDisabledMenuItems(_Bool)", -# debugging method -"void oox::drawingml::TextParagraphProperties::dump() const" +# debugging methods +"void oox::drawingml::TextParagraphProperties::dump() const", +"class std::basic_string, class std::allocator > writerfilter::ooxml::OOXMLPropertySet::toString()", +# called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up +"void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultIntegerValue()", +"void writerfilter::ooxml::OOXMLFastContextHandler::positivePercentage(const class rtl::OUString &)", +"void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleOLE()", +"void writerfilter::ooxml::OOXMLFastContextHandler::positionOffset(const class rtl::OUString &)", +"void writerfilter::ooxml::OOXMLFastContextHandler::alignH(const class rtl::OUString &)", +"void writerfilter::ooxml::OOXMLFastContextHandler::alignV(const class rtl::OUString &)", +"void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultStringValue()", +"_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)", +"void writerfilter::ooxml::OOXMLFastContextHandler::clearProps()", +"void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(const unsigned int &)", +"void writerfilter::ooxml::OOXMLFastContextHandler::cr()", +"void writerfilter::ooxml::OOXMLFastContextHandler::softHyphen()", +"void writerfilter::ooxml::OOXMLFastContextHandler::noBreakHyphen()", +"void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultBooleanValue()", +"void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()", +"void writerfilter::ooxml::OOXMLFastContextHandler::endField()", +"void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const unsigned int &)", +"void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()", +"void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()", +"void writerfilter::ooxml::OOXMLFastContextHandler::tab()", +"void writerfilter::ooxml::OOXMLFastContextHandler::ftnednref()", +"void writerfilter::ooxml::OOXMLFastContextHandler::ftnednsep()", +"void writerfilte
[Libreoffice-commits] online.git: 4 commits - loleaflet/src loolwsd/LOOLSession.cpp loolwsd/LOOLWSD.cpp loolwsd/tsqueue.h
loleaflet/src/layer/tile/TileLayer.js | 34 --
loleaflet/src/map/Map.js | 10 --
loolwsd/LOOLSession.cpp |6 --
loolwsd/LOOLWSD.cpp |2 +-
loolwsd/tsqueue.h |9 +
5 files changed, 46 insertions(+), 15 deletions(-)
New commits:
commit 8f48dabf28076fc448ff76ec5da1cdd59990c5b1
Author: Mihai Varga
Date: Tue Jul 21 11:08:08 2015 +0300
loolwsd: discard requests that are in the queue already
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 0670876..4bccf72 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -243,7 +243,7 @@ public:
// Also forward the "canceltiles" to the child
process, if any
session->handleInput(buffer, n);
}
-else
+else if (!queue.alreadyInQueue(firstLine))
{
queue.put(firstLine);
}
diff --git a/loolwsd/tsqueue.h b/loolwsd/tsqueue.h
index 9511efb..25c2ac2 100644
--- a/loolwsd/tsqueue.h
+++ b/loolwsd/tsqueue.h
@@ -54,6 +54,15 @@ public:
_queue.end());
}
+bool alreadyInQueue(std::string cmd) {
+for (auto it = _queue.cbegin(); it != _queue.cend(); ++it) {
+if (cmd == *it) {
+return true;
+}
+}
+return false;
+}
+
private:
std::mutex _mutex;
std::condition_variable _cv;
commit 47790d9d5dc5b5131a0934080086f94845ef51a9
Author: Mihai Varga
Date: Mon Jul 20 20:10:13 2015 +0300
loolwsd: use the new invalidate x y widht height command
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 69dccc7..cddf845 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -682,7 +682,6 @@ extern "C"
{
int curPart =
srv->_loKitDocument->pClass->getPart(srv->_loKitDocument);
srv->sendTextFrame("curpart: part=" + std::to_string(curPart));
-srv->sendTextFrame("invalidatetiles: " +
std::string(pPayload));
StringTokenizer tokens(std::string(pPayload), " ",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
if (tokens.count() == 4)
{
@@ -690,13 +689,16 @@ extern "C"
int y(std::stoi(tokens[1]));
int width(std::stoi(tokens[2]));
int height(std::stoi(tokens[3]));
-srv->sendTextFrame("invalidate:"
+srv->sendTextFrame("invalidatetiles:"
" part=" + std::to_string(curPart) +
" x=" + std::to_string(x) +
" y=" + std::to_string(y) +
" width=" + std::to_string(width) +
" height=" + std::to_string(height));
}
+else {
+srv->sendTextFrame("invalidatetiles: " +
std::string(pPayload));
+}
}
break;
case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
commit 596ee77d5a267ebcc39da09d9f603713c5bdbefb
Author: Mihai Varga
Date: Mon Jul 20 20:09:37 2015 +0300
loleaflet: use the new invalidate x y widht height command
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index ba76534..b4d8024 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -249,18 +249,26 @@ L.TileLayer = L.GridLayer.extend({
this._onUpdateGraphicSelection();
}
else if (textMsg.startsWith('invalidatetiles:') &&
!textMsg.match('EMPTY')) {
- strTwips = textMsg.match(/\d+/g);
- topLeftTwips = new L.Point(parseInt(strTwips[0]),
parseInt(strTwips[1]));
- offset = new L.Point(parseInt(strTwips[2]),
parseInt(strTwips[3]));
+ command = this._parseServerCmd(textMsg);
+ if (command.x === undefined || command.y === undefined
|| command.part === undefined) {
+ strTwips = textMsg.match(/\d+/g);
+ command.x = parseInt(strTwips[0]);
+ command.y = parseInt(strTwips[1]);
+ command.width = parseInt(strTwips[2]);
+ command.height = parseInt(strTwips[3]);
+ command.part = this._currentPart;
+ }
+ topLeftTwips = new L.Point(command.x, command.y);
+ offset = new L.Point(command.width, command.height);
bott
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Buttons.js | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d89631a826c1247a6089ad84fe7f27645cee60c1
Author: Mihai Varga
Date: Tue Jul 21 11:21:10 2015 +0300
loleaflet: fixed uno commands for paragraph alignment
diff --git a/loleaflet/src/control/Control.Buttons.js
b/loleaflet/src/control/Control.Buttons.js
index 7297f86..70bb1e3 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -12,16 +12,16 @@ L.Control.Buttons = L.Control.extend({
container = L.DomUtil.create('div', buttonsName +
'-container' + ' leaflet-bar');
this._buttons = {
- 'bold': {title: 'Bold', uno:
'Bold',iconName: 'bold.png'},
- 'italic':{title: 'Italic', uno:
'Italic', iconName: 'italic.png'},
- 'underline': {title: 'Underline', uno:
'Underline', iconName: 'underline.png'},
- 'strikethrough': {title: 'Strike-through', uno:
'Strikeout', iconName: 'strikethrough.png'},
- 'alignleft': {title: 'Align left', uno:
'AlignLeft', iconName: 'alignleft.png'},
- 'aligncenter': {title: 'Center horizontaly', uno:
'AlignCenter', iconName: 'aligncenter.png'},
- 'alignright':{title: 'Align right',uno:
'AlignRight', iconName: 'alignright.png'},
- 'alignblock':{title: 'Justified', uno:
'AlignBlock', iconName: 'alignblock.png'},
- 'save': {title: 'Save', uno:
'Save',iconName: 'save.png'},
- 'saveas':{title: 'Save As',uno: '',
iconName: 'saveas.png'}
+ 'bold': {title: 'Bold', uno:
'Bold',iconName: 'bold.png'},
+ 'italic':{title: 'Italic', uno:
'Italic', iconName: 'italic.png'},
+ 'underline': {title: 'Underline', uno:
'Underline', iconName: 'underline.png'},
+ 'strikethrough': {title: 'Strike-through', uno:
'Strikeout', iconName: 'strikethrough.png'},
+ 'alignleft': {title: 'Align left', uno:
'CommonAlignLeft', iconName: 'alignleft.png'},
+ 'aligncenter': {title: 'Center horizontaly', uno:
'CommonAlignHorizontalCenter', iconName: 'aligncenter.png'},
+ 'alignright':{title: 'Align right',uno:
'CommonAlignRight',iconName: 'alignright.png'},
+ 'alignblock':{title: 'Justified', uno:
'CommonAlignJustified',iconName: 'alignblock.png'},
+ 'save': {title: 'Save', uno:
'Save',iconName: 'save.png'},
+ 'saveas':{title: 'Save As',uno: '',
iconName: 'saveas.png'}
};
for (var key in this._buttons) {
var button = this._buttons[key];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/app/gtkdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 190f91c71905ca18d6174393ad1b54be74259754 Author: Caolán McNamara Date: Tue Jul 21 09:35:39 2015 +0100 use 3,0,0 rather than 3,10,0 Change-Id: I810cdadedd5261caede474a4780ceea6d9b409c9 diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index c42c68d..1a406c3 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -46,7 +46,7 @@ #include -#if GTK_CHECK_VERSION(3,10,0) +#if GTK_CHECK_VERSION(3,0,0) # ifdef GDK_WINDOWING_X11 # include # endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Writer: draft layout and hide whitespace [long]
Hi, I think as long as the hide whitespace option is a new UI option and it's disabled by default, it's rather non-controversal. Please push to gerrit to get code review. :-) Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/editeng sd/inc sd/source
compilerplugins/clang/unusedmethods.py| 12 +- editeng/source/items/numitem.cxx | 13 -- include/editeng/brushitem.hxx |1 include/editeng/numitem.hxx |1 sd/inc/CustomAnimationEffect.hxx | 12 -- sd/inc/CustomAnimationPreset.hxx |2 sd/inc/EffectMigration.hxx|5 sd/inc/Outliner.hxx |5 sd/inc/drawdoc.hxx|1 sd/inc/sdabstdlg.hxx |7 - sd/inc/sdattr.hxx |5 sd/inc/sddll.hxx |4 sd/inc/sdfilter.hxx |2 sd/inc/sdiocmpt.hxx |1 sd/inc/sdobjfac.hxx |4 sd/inc/sdpage.hxx |5 sd/source/ui/animations/CustomAnimationDialog.hxx |1 sd/source/ui/animations/SlideTransitionPane.hxx |1 sd/source/ui/annotations/annotationwindow.hxx |6 - sd/source/ui/dlg/sddlgfact.cxx| 25 sd/source/ui/dlg/sddlgfact.hxx|5 sd/source/ui/docshell/sdclient.cxx|3 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 13 -- sd/source/ui/framework/configuration/ConfigurationClassifier.hxx | 13 -- sd/source/ui/inc/Client.hxx |6 - sd/source/ui/inc/DrawViewShell.hxx|1 sd/source/ui/inc/FrameView.hxx|1 sd/source/ui/inc/PaneShells.hxx |4 sd/source/ui/inc/TabControl.hxx |2 sd/source/ui/inc/View.hxx |4 sd/source/ui/inc/ViewShell.hxx|2 sd/source/ui/inc/ViewShellBase.hxx|1 sd/source/ui/inc/Window.hxx |1 sd/source/ui/inc/docprev.hxx |1 sd/source/ui/inc/framework/ResourceId.hxx |5 sd/source/ui/inc/fuhhconv.hxx |6 - sd/source/ui/inc/fupoor.hxx |5 sd/source/ui/inc/fusearch.hxx |5 sd/source/ui/inc/navigatr.hxx |1 sd/source/ui/inc/optsitem.hxx |4 sd/source/ui/inc/sdtreelb.hxx |1 sd/source/ui/inc/sdundogr.hxx |1 sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 52 -- sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 16 --- sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx |3 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 25 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx |5 sd/source/ui/slidesorter/view/SlideSorterView.cxx |1 sd/source/ui/view/Outliner.cxx| 18 --- sd/source/ui/view/ViewShellBase.cxx |2 50 files changed, 11 insertions(+), 309 deletions(-) New commits: commit 3d2f43438d4fe6947965a98262b0db42c8d5e680 Author: Noel Grandin Date: Tue Jul 21 09:05:31 2015 +0200 loplugin:unusedmethods sd Change-Id: I9b5399ace50db3259df2e619f28ae547a38e6c6d Reviewed-on: https://gerrit.libreoffice.org/17254 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index cf9ce79..600fcf8 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -64,35 +64,35 @@ exclusionSet = set([ "void oox::drawingml::TextParagraphProperties::dump() const", "class std::basic_string, class std::allocator > writerfilter::ooxml::OOXMLPropertySet::toString()", # called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up +"_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)", "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultIntegerValue()", "void writerfilter::ooxml::OOXMLFastContextHandler
[Libreoffice-commits] core.git: filter/qa filter/source
filter/qa/cppunit/data/tiff/fail/crash-7.tiff |binary
filter/source/graphicfilter/itiff/itiff.cxx |2 ++
2 files changed, 2 insertions(+)
New commits:
commit 34d062147c16090fa42c27ac7960e3f5e3b65d2b
Author: Caolán McNamara
Date: Tue Jul 21 10:10:50 2015 +0100
reject invalid tiff dimensions
Change-Id: I64e77f12cb016a7f4a9d21c732aaeaae7959da76
diff --git a/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
new file mode 100644
index 000..0056f9d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
differ
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 180b1c3..c730e81 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1330,6 +1330,8 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic &
rGraphic )
}
if ( !nBitsPerSample || ( nBitsPerSample > 32 ) )
bStatus = false;
+if (nImageWidth < 0 || nImageLength < 0)
+bStatus = false;
if ( bStatus )
{
if ( nMaxSampleValue == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 3 commits - src/lib src/test
src/lib/Makefile.am| 55 ++---
src/lib/VSDStyles.h|2 -
src/lib/VSDXParser.cpp |3 +-
src/test/data/bgcolor.vsdx |binary
src/test/importtest.cpp| 34 +++
5 files changed, 64 insertions(+), 30 deletions(-)
New commits:
commit f8392b3160f7b64263b324bf49b654007b98f80a
Author: David Tardon
Date: Tue Jul 21 11:39:48 2015 +0200
sort file list
Change-Id: Ie7e75271d0e02b5dd5cac01269365268c57269d4
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f5968fd..dc0f8fd 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -26,61 +26,60 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD
= $(LIBVISIO_LIBS) @
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES =
@LIBVISIO_WIN32_RESOURCE@
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info)
-export-dynamic -no-undefined
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES = \
- libvisio_utils.cpp \
- libvisio_xml.cpp \
- VisioDocument.cpp \
+ VDXParser.cpp \
+ VDXParser.h \
VSD5Parser.cpp \
- VSD6Parser.cpp \
- VSDInternalStream.cpp \
- VSDCharacterList.cpp \
- VSDContentCollector.cpp \
- VSDFieldList.cpp \
- VSDGeometryList.cpp \
- VSDOutputElementList.cpp \
- VSDPages.cpp \
- VSDParagraphList.cpp \
- VSDParser.cpp \
- VSDMetaData.cpp \
- VSDShapeList.cpp \
- VSDStencils.cpp \
- VSDStyles.cpp \
- VSDStylesCollector.cpp \
- VSDXMLHelper.cpp \
- libvisio_utils.h \
- libvisio_xml.h \
VSD5Parser.h \
+ VSD6Parser.cpp \
VSD6Parser.h \
- VSDInternalStream.h \
+ VSDCharacterList.cpp \
VSDCharacterList.h \
VSDCollector.h \
+ VSDContentCollector.cpp \
VSDContentCollector.h \
VSDDocumentStructure.h \
+ VSDFieldList.cpp \
VSDFieldList.h \
+ VSDGeometryList.cpp \
VSDGeometryList.h \
+ VSDInternalStream.cpp \
+ VSDInternalStream.h \
+ VSDMetaData.cpp \
+ VSDMetaData.h \
+ VSDOutputElementList.cpp \
VSDOutputElementList.h \
+ VSDPages.cpp \
VSDPages.h \
+ VSDParagraphList.cpp \
VSDParagraphList.h \
+ VSDParser.cpp \
VSDParser.h \
- VSDMetaData.h \
+ VSDShapeList.cpp \
VSDShapeList.h \
+ VSDStencils.cpp \
VSDStencils.h \
+ VSDStyles.cpp \
VSDStyles.h \
+ VSDStylesCollector.cpp \
VSDStylesCollector.h \
VSDTypes.h \
+ VSDXMLHelper.cpp \
VSDXMLHelper.h \
-\
- VDXParser.cpp \
- VDXParser.h \
VSDXMLParserBase.cpp \
VSDXMLParserBase.h \
VSDXMLTokenMap.cpp \
VSDXMLTokenMap.h \
+ VSDXMetaData.cpp \
+ VSDXMetaData.h \
VSDXParser.cpp \
VSDXParser.h \
VSDXTheme.cpp \
VSDXTheme.h \
- VSDXMetaData.cpp \
- VSDXMetaData.h \
+ VisioDocument.cpp \
+ libvisio_utils.cpp \
+ libvisio_utils.h \
+ libvisio_xml.cpp \
+ libvisio_xml.h \
$(generated_files)
commit c1a5828d135b89ffb80cb096bce5f0aa745a265d
Author: Andras Timar
Date: Mon Jun 29 22:55:48 2015 +0200
unit test of VSDX char background handling
Change-Id: I4a57aa9465827108630ec85f5986bdd59e1a8f5c
diff --git a/src/test/data/bgcolor.vsdx b/src/test/data/bgcolor.vsdx
new file mode 100644
index 000..5081dd5
Binary files /dev/null and b/src/test/data/bgcolor.vsdx differ
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index f7b8972..705a8c7 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -66,6 +66,30 @@ void assertXPath(xmlDocPtr doc, const librevenge::RVNGString
&xpath, const libre
CPPUNIT_ASSERT_EQUAL_MESSAGE(message.cstr(), expectedValue, actualValue);
}
+/// Assert that xpath exists, and does not contain the given attribute
+void assertXPathNoAttribute(xmlDocPtr doc, const librevenge::RVNGString
&xpath, const librevenge::RVNGString &attribute)
+{
+ xmlXPathObjectPtr xpathobject = getXPathNode(doc, xpath);
+ xmlNodeSetPtr nodeset = xpathobject->nodesetval;
+ librevenge::RVNGString message1("In <");
+ message1.append(doc->name);
+ message1.append(">, XPath '");
+ message1.append(xpath);
+ message1.append("' number of nodes is incorrect");
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(message1.cstr(), 1,
xmlXPathNodeSetGetLength(nodeset));
+ xmlNodePtr node = nodeset->nodeTab[0];
+ librevenge::RVNGString message2("In <");
+ message2.append(doc->name);
+ message2.append(">, XPath '");
+ message2.append(xpath);
+ message2.append("' unexpected '");
+ message2.append(attribute);
+ message2.append("' attribute");
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(message2.cstr(), static_cast(0),
xmlGetProp(node, BAD_CAST(attribute.cstr(;
+ xmlXPathFreeObje
[Libreoffice-commits] core.git: basic/source embeddedobj/test filter/source framework/inc odk/examples qadevOOo/tests unotools/source wizards/com xmlsecurity/source
basic/source/sbx/sbxcurr.cxx |
4 +-
embeddedobj/test/Container1/NativeView.java |
16 +-
filter/source/config/cache/typedetection.cxx |
6 +--
framework/inc/helper/ocomponentenumeration.hxx|
2 -
framework/inc/helper/persistentwindowstate.hxx|
2 -
framework/inc/interaction/quietinteraction.hxx|
4 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java |
8 ++---
qadevOOo/tests/java/ifc/drawing/_XShape.java |
2 -
qadevOOo/tests/java/ifc/inspection/_XObjectInspectorModel.java|
4 +-
unotools/source/config/configitem.cxx |
2 -
wizards/com/sun/star/wizards/agenda/AgendaDocument.py |
2 -
wizards/com/sun/star/wizards/agenda/TopicsControl.py |
10 +++---
xmlsecurity/source/framework/saxeventkeeperimpl.cxx |
2 -
13 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 3e926736c7a1ec0a622ff446466113d9ccd8cb11
Author: Adolfo Jayme Barrientos
Date: Tue Jul 21 04:52:14 2015 -0500
Miscellaneous typos
Change-Id: I5187364d420ab78c36a91632efab9c32951d867a
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 0c9b8d3..56defb0 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -158,7 +158,7 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr )
OUString sTmp( rStr.trim() );
const sal_Unicode* p = sTmp.getStr();
-// normalise string number by removeing thousands & decimal point
separators
+// normalise string number by removing thousand & decimal point separators
OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit );
if ( *p == '-' || *p == '+' )
@@ -195,7 +195,7 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr )
}
// can we raise error here ? ( previous behaviour was more forgiving )
-// so... not sure that could bread existing code, lets see if anyone
+// so... not sure that could break existing code, let's see if anyone
// complains.
if ( p != sTmp.getStr() + sTmp.getLength() )
diff --git a/embeddedobj/test/Container1/NativeView.java
b/embeddedobj/test/Container1/NativeView.java
index d53cc15..e757ed3 100644
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
@@ -61,10 +61,10 @@ public class NativeView extends java.awt.Canvas
* ( e.g. get the window handle and necessary system information )
*
* Why here?
- * Because the handle seems to be available for already visible windows
- * only. So it's the best place to get it. Special helper method
- * can be called more than ones - but call native code one times only
- * and safe the handle and the system type on our members
maHandle/maSystem!
+ * Because the handle seems to be available for already-visible windows
+ * only. So it's the best place to get it. The special helper method
+ * can be called more than once - but call native code one time only
+ * and save the handle and the system type on our members
maHandle/maSystem!
*/
public void setVisible( boolean bState )
{
@@ -123,11 +123,11 @@ public class NativeView extends java.awt.Canvas
* windows in a java UI container.
*
* Note:
- * Native code for windows register special function pointer to handle
- * window messages ... But if it doesn't check for an already registered
+ * Native code for Windows registers a special function pointer to handle
+ * window messages... But if it doesn't check for an already-registered
* instance of this handler it will do it twice and produce a stack
overflow
- * because such method call herself in a never ending loop ...
- * So we try to use the JNI code one times only and safe already getted
+ * because such method calls itself in a never-ending loop...
+ * So we try to use the JNI code one time only and save already-obtained
* information inside this class.
*/
public native int getNativeWindowSystemType();
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index bb7d22a..ffeab2a 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -763,8 +763,8 @@ bool TypeDetection::impl_getPreselectionForDocumentService(
// step over all filters, and check if its registered type
// match the given URL.
// But use temp. list of "preselected types" instead of incoming
rFlatTypes list!
-// The reason behind: we must filter the getted results. And copying of
stl entries
-// is an ea
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/tiff/fail/crash-7.tiff |binary
filter/source/graphicfilter/itiff/itiff.cxx |2 ++
2 files changed, 2 insertions(+)
New commits:
commit 64bb6065a3ae74550a513426308f00b05365086b
Author: Caolán McNamara
Date: Tue Jul 21 10:10:50 2015 +0100
reject invalid tiff dimensions
Change-Id: I64e77f12cb016a7f4a9d21c732aaeaae7959da76
(cherry picked from commit 34d062147c16090fa42c27ac7960e3f5e3b65d2b)
Reviewed-on: https://gerrit.libreoffice.org/17257
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
new file mode 100644
index 000..0056f9d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
differ
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 180b1c3..c730e81 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1330,6 +1330,8 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic &
rGraphic )
}
if ( !nBitsPerSample || ( nBitsPerSample > 32 ) )
bStatus = false;
+if (nImageWidth < 0 || nImageLength < 0)
+bStatus = false;
if ( bStatus )
{
if ( nMaxSampleValue == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
filter/qa/cppunit/data/tiff/fail/crash-7.tiff |binary
filter/source/graphicfilter/itiff/itiff.cxx |2 ++
2 files changed, 2 insertions(+)
New commits:
commit c7fb0ab137dbe385f54030c7420cbd1007e9f005
Author: Caolán McNamara
Date: Tue Jul 21 10:10:50 2015 +0100
reject invalid tiff dimensions
Change-Id: I64e77f12cb016a7f4a9d21c732aaeaae7959da76
(cherry picked from commit 34d062147c16090fa42c27ac7960e3f5e3b65d2b)
Reviewed-on: https://gerrit.libreoffice.org/17258
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
new file mode 100644
index 000..0056f9d
Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff
differ
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index c7dc759..2ac8ac8 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1337,6 +1337,8 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic &
rGraphic )
}
if ( !nBitsPerSample || ( nBitsPerSample > 32 ) )
bStatus = false;
+if (nImageWidth < 0 || nImageLength < 0)
+bStatus = false;
if ( bStatus )
{
if ( nMaxSampleValue == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cpp Unit- Query
On Mon, 2015-07-20 at 09:55 -0400, Clarence, Sheeladarcus wrote: > We are trying to use this software in our corporate environment. We > need few information about this software to proceed with the review. > Anticipating your quick response > > 1) Does it use log in credential. > > 2) Does the software require an Internet Browser if so which > browser(s) is required? > > 3) What protocol is used to transport data? > > 4) What ports are used to transmit data? > > 5) What ports are used for authentication? > > 6) Does the software require Java? > > 7) Does the software require .Net Framework? > > 8) Are there any other application dependencies (ex: Flash, > Shockwave, ODB) > > 9) Does the software leverage Active X? > > 10) Are any Add-ons or Plug-ins required > > 11) Is this software capable of Port scanning, software scanning or > other security related activities No to all of the above. But presumably you should do your own review of the code rather than trusting a random stranger on the internet :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has spam always been so intensive?
Hi Bernardo, On Saturday, 2015-07-18 22:20:47 -0300, Bernardo Sulzbach wrote: > It seems like this mailing list gets a good amount of spam mail. Is this > recent? Be glad that you don't see the hundreds that are already filtered out. There are always some that will slip through. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpzaltuFG_iu.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/97a0e7558b24792827d77217fb2d8b1106056963/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gerrit: Reliability and fidelity of verification results
On Tue, Jul 21, 2015 at 1:54 AM, David Ostrovsky wrote: > On Mon, 2015-07-13 at 16:51 -0500, Norbert Thiebaud wrote: >> On Mon, Jul 13, 2015 at 1:51 PM, David Ostrovsky wrote: >> >> And your patch 8 would have failed the same way on tb58/tb59/tb60 >> > > [...] > >> The release builder have the so-called 'stale' tool chain. >> Just like in real-life and like other platform there is a diversity of >> platform and we usually do not drop >> support for 'older' platform unless there is an imperative motivation. >> > > I have another discrepancy with verification: [1]. This time tinderbox > TB63 compiler version is ahead of mine: [2] > > TB63: GCC 4.8.3 > Mine: GCC 4.8.1 > > On patch set 8 of this change, it's issuing -Werror=return-type: [3] > even though the last statement is assert(false); The last statement is (void) (which is what assert resolve to in non debug build... hence the -Werror=return-type The run you pointed too was not a debug one: ... export ENABLE_DEBUG= ... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field2.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 0aff4109b5fd2f6c3893b14cc61c8962e2b47ea9
Author: Lionel Elie Mamane
Date: Tue Jul 21 14:02:59 2015 +0200
avoid 1-past-the-end string access
Change-Id: Ia475ce737c430fab8d019e1b8a762f81897e0847
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 7efb8e6..d35a4e7 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -432,15 +432,14 @@ static sal_Int32 ImplPatternRightPos( const OUString&
rStr, const OString& rEdit
{
// search non-literal successor
sal_Int32 nNewPos = nCursorPos;
-sal_Int32 nTempPos = nNewPos;
-while ( nTempPos < rEditMask.getLength() )
+;
+for(sal_Int32 nTempPos = nNewPos+1; nTempPos < rEditMask.getLength();
++nTempPos )
{
-if ( rEditMask[nTempPos+1] != EDITMASK_LITERAL )
+if ( rEditMask[nTempPos] != EDITMASK_LITERAL )
{
-nNewPos = nTempPos+1;
+nNewPos = nTempPos;
break;
}
-nTempPos++;
}
ImplPatternMaxPos( rStr, rEditMask, nFormatFlags, bSameMask, nCursorPos,
nNewPos );
return nNewPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/unusedmethods.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 07645b443a276da2ee8853c84fbf61a59d59b4bd Author: Noel Grandin Date: Tue Jul 21 14:39:05 2015 +0200 workaround clang-3.5 issue in unusedmethods loplugin Change-Id: Ie67518536932e24e9cff7a8b75b42e90e9f67673 diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 848f0bf..ad5582e 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -268,9 +268,11 @@ bool UnusedMethods::VisitVarDecl( const VarDecl* varDecl ) const CXXRecordDecl* recordDecl = varDecl->getType()->getAsCXXRecordDecl(); if (!recordDecl) return true; +// workaround clang-3.5 issue +#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 6 if (!recordDecl->getTemplateInstantiationPattern()) return true; - +#endif for( CXXRecordDecl::ctor_iterator it = recordDecl->ctor_begin(); it != recordDecl->ctor_end(); ++it) TraverseCXXConstructorDecl(*it); for( CXXRecordDecl::method_iterator it = recordDecl->method_begin(); it != recordDecl->method_end(); ++it) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/unusedmethods.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f3872352b3e576530f9a5d27a6ab8b805d8ea911 Author: Noel Grandin Date: Tue Jul 21 14:43:01 2015 +0200 fix my previous commit Change-Id: I287d99a46eda90718a3c4ec2c92f7b063babeb24 diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index ad5582e..692e91e 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -269,7 +269,7 @@ bool UnusedMethods::VisitVarDecl( const VarDecl* varDecl ) if (!recordDecl) return true; // workaround clang-3.5 issue -#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 6 +#if __clang_major__ > 3 || ( __clang_major__ == 3 && __clang_minor__ >= 6 ) if (!recordDecl->getTemplateInstantiationPattern()) return true; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-sidebar' - 4 commits - chart2/source svx/source
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 89
chart2/source/controller/sidebar/ChartAreaPanel.hxx | 16 +++
chart2/source/tools/FillProperties.cxx | 24 +
svx/source/sidebar/area/AreaPropertyPanelBase.cxx |6 -
4 files changed, 116 insertions(+), 19 deletions(-)
New commits:
commit 379d26cff4bb6e8519786506e812a417e9b627fc
Author: Markus Mohrhard
Date: Tue Jul 21 15:03:48 2015 +0200
handle some of the property changes correctly in area panel
Change-Id: I107245f52504c6dc059554346e00402534cf6243
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index a4241c9..3319bf5 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -13,6 +13,32 @@
namespace chart { namespace sidebar {
+namespace {
+
+OUString getCID(css::uno::Reference xModel)
+{
+css::uno::Reference
xController(xModel->getCurrentController());
+css::uno::Reference
xSelectionSupplier(xController, css::uno::UNO_QUERY);
+if (!xSelectionSupplier.is())
+return OUString();
+
+css::uno::Any aAny = xSelectionSupplier->getSelection();
+assert(aAny.hasValue());
+OUString aCID;
+aAny >>= aCID;
+
+return aCID;
+}
+
+css::uno::Reference getPropSet(
+css::uno::Reference xModel)
+{
+OUString aCID = getCID(xModel);
+return ObjectIdentifier::getObjectPropertySet(aCID, xModel);
+}
+
+}
+
VclPtr ChartAreaPanel::Create(
vcl::Window* pParent,
const css::uno::Reference& rxFrame,
@@ -29,8 +55,10 @@ VclPtr ChartAreaPanel::Create(
ChartAreaPanel::ChartAreaPanel(vcl::Window* pParent,
const css::uno::Reference& rxFrame,
-ChartController* /*pController*/):
-svx::sidebar::AreaPropertyPanelBase(pParent, rxFrame)
+ChartController* pController):
+svx::sidebar::AreaPropertyPanelBase(pParent, rxFrame),
+mxModel(pController->getModel()),
+mxListener(new ChartSidebarModifyListener(this))
{
}
@@ -39,43 +67,76 @@ ChartAreaPanel::~ChartAreaPanel()
disposeOnce();
}
-void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem&
/*rItem*/)
+void ChartAreaPanel::dispose()
{
+css::uno::Reference xBroadcaster(mxModel,
css::uno::UNO_QUERY_THROW);
+xBroadcaster->removeModifyListener(mxListener);
+}
+void ChartAreaPanel::Initialize()
+{
+css::uno::Reference xBroadcaster(mxModel,
css::uno::UNO_QUERY_THROW);
+xBroadcaster->addModifyListener(mxListener);
}
-void ChartAreaPanel::setFillFloatTransparence(const
XFillFloatTransparenceItem& /*rItem*/)
+void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem&
/*rItem*/)
{
}
-void ChartAreaPanel::setFillStyle(const XFillStyleItem& /*rItem*/)
+void ChartAreaPanel::setFillFloatTransparence(const
XFillFloatTransparenceItem& /*rItem*/)
{
}
-void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* /*pStyleItem*/,
-const XFillColorItem& /*rColorItem*/)
+void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem)
{
-
+css::uno::Reference xPropSet =
getPropSet(mxModel);
+xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(rItem.GetValue()));
}
-void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem*
/*pStyleItem*/,
-const XFillGradientItem& /*rGradientItem*/)
+void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem,
+const XFillColorItem& rColorItem)
{
+css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (pStyleItem)
+xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
+xPropSet->setPropertyValue("Color",
css::uno::makeAny(rColorItem.GetValue()));
+}
+void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem,
+const XFillGradientItem& rGradientItem)
+{
+css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (pStyleItem)
+xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
+xPropSet->setPropertyValue("GradientName",
css::uno::makeAny(rGradientItem.GetValue()));
}
-void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* /*pStyleItem*/,
-const XFillHatchItem& /*rHatchItem*/)
+void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
+const XFillHatchItem& rHatchItem)
{
+css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (pStyleItem)
+xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
+xPropSet->setPropertyValue("HatchName",
css::uno::makeAny(rHatchItem.GetValue()));
+}
+void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
+const XFillBitmapItem& rBitmapItem)
+{
+css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (pStyleItem)
+xPropSet->setPropertyValue("FillStyle",
css
[Libreoffice-commits] core.git: svx/workben
svx/workben/msview/makefile.mk | 62 --
svx/workben/msview/msview.cxx| 1154 ---
svx/workben/msview/msview.xml| 311 --
svx/workben/msview/xmlconfig.cxx | 557 --
svx/workben/msview/xmlconfig.hxx | 125
svx/workben/pixelctl.cxx | 168 -
6 files changed, 2377 deletions(-)
New commits:
commit 392809bb6c87260761adbfa15dc475657bccbaf3
Author: David Tardon
Date: Tue Jul 21 08:59:20 2015 +0200
drop obsolete code
Change-Id: I741c5f5ed895b06a445f42e20ef004a8c7c1a100
diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
deleted file mode 100644
index 95fb964..000
--- a/svx/workben/msview/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=msview
-LIBTARGET=NO
-TARGETTYPE=GUI
-
-# --- Settings -
-
-.INCLUDE : settings.mk
-
-
-# --- Files
-
-OBJFILES= $(OBJ)$/msview.obj \
-$(OBJ)$/xmlconfig.obj
-EXCEPTIONSFILES=$(OBJ)$/msview.obj \
-$(OBJ)$/xmlconfig.obj
-
-APP1NOSAL= TRUE
-APP1TARGET=$(TARGET)
-APP1OBJS= $(OBJFILES)
-
-APP1STDLIBS= $(CPPULIB) \
-$(CPPUHELPERLIB) \
-$(COMPHELPERLIB) \
-$(UCBHELPERLIB)\
-$(UNOTOOLSLIB) \
-$(TKLIB) \
-$(VCLLIB) \
-$(TOOLSLIB)\
-$(SVTOOLLIB) \
-$(SALLIB) \
-$(SOTLIB) \
-$(VCLLIB) \
-$(SVXLIB) \
-$(SFXLIB)
-
-
-
-# --- Targets --
-
-.INCLUDE : target.mk
-
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
deleted file mode 100644
index aff2e4e..000
--- a/svx/workben/msview/msview.cxx
+++ /dev/null
@@ -1,1154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "xmlconfig.hxx"
-
-
-using namespace ::com::sun::star;
-
-
-
-enum CompareStatus { CMP_NOTYET = 0, CMP_EQUAL = 1, CMP_NOTEQUAL =
2, CMP_NOTAVAILABLE = 3 };
-static ColorData gColors[] = { COL_BLACK, COL_GREEN, COL_RED,
COL_CYAN };
-
-class Atom
-{
-public:
-~Atom();
-
-/** imports this atom and its child atoms */
-static Atom* import( const DffRecordHeader& rRootRecordHeader, SvStream&
rStCtrl );
-static Atom* import( UINT16 nRecType, SvStream& rStCtrl );
-
-inline const DffRecordHeader& getHeader() const;
-
-/** returns true if at least one atom with the given nRecType is found */
-inl
[Libreoffice-commits] core.git: svx/workben
svx/workben/pixelctl.cxx | 168 +++
1 file changed, 168 insertions(+)
New commits:
commit 2b75376a149803865c7cc0dbc72a870c1d86f428
Author: David Tardon
Date: Tue Jul 21 15:17:01 2015 +0200
bah, removed too much
Change-Id: I388f191fecd5f1d632f1540d280a04c163ce6fc9
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
new file mode 100644
index 000..127b1be
--- /dev/null
+++ b/svx/workben/pixelctl.cxx
@@ -0,0 +1,168 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+#include
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace cppu;
+
+// Forward declaration
+void Main();
+
+SAL_IMPLEMENT_MAIN()
+{
+try
+{
+tools::extendApplicationEnvironment();
+
+// create the global service-manager
+Reference< XComponentContext > xContext =
defaultBootstrap_InitialComponentContext();
+Reference< XMultiServiceFactory > xServiceManager(
xContext->getServiceManager(), UNO_QUERY );
+
+if( !xServiceManager.is() )
+Application::Abort( "Failed to bootstrap" );
+
+comphelper::setProcessServiceFactory( xServiceManager );
+
+InitVCL();
+::Main();
+DeInitVCL();
+}
+catch (const Exception& e)
+{
+SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+return 1;
+}
+catch (const std::exception& e)
+{
+SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+return 1;
+}
+
+return 0;
+}
+
+class MyWin : public WorkWindow
+{
+VclPtr maPixelCtl;
+
+public:
+MyWin(vcl::Window* pParent, WinBits nWinStyle);
+virtual ~MyWin()
+{
+disposeOnce();
+}
+virtual void dispose() SAL_OVERRIDE;
+void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
SAL_OVERRIDE;
+void Resize() SAL_OVERRIDE;
+bool Close() SAL_OVERRIDE;
+};
+
+void Main()
+{
+ScopedVclPtrInstance< MyWin > aMainWin( nullptr, WB_STDWORK );
+aMainWin->SetText( OUString( "SvxPixelCtl" ) );
+aMainWin->Show();
+
+Application::Execute();
+}
+
+MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
+WorkWindow( pParent, nWinStyle ),
+maPixelCtl( VclPtr::Create(this) )
+{
+maPixelCtl->SetPosSizePixel( Point( 10, 10 ), Size( 200, 200 ) );
+maPixelCtl->Show();
+
+}
+
+void MyWin::dispose()
+{
+maPixelCtl.disposeAndClear();
+WorkWindow::dispose();
+}
+
+bool MyWin::Close()
+{
+bool bRet = WorkWindow::Close();
+if( bRet )
+Application::Quit();
+return bRet;
+}
+
+void MyWin::MouseMove( const MouseEvent& rMEvt )
+{
+WorkWindow::MouseMove( rMEvt );
+}
+
+void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
+{
+WorkWindow::MouseButtonDown( rMEvt );
+}
+
+void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
+{
+WorkWindow::MouseButtonUp( rMEvt );
+}
+
+void MyWin::KeyInput( const KeyEvent& rKEvt )
+{
+WorkWindow::KeyInput( rKEvt );
+}
+
+void MyWin::KeyUp( const KeyEvent& rKEvt )
+{
+WorkWindow::KeyUp( rKEvt );
+}
+
+void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+{
+WorkWindow::Paint(rRenderContext, rRect);
+}
+
+void MyWin::Resize()
+{
+WorkWindow::Resize();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sw/inc sw/source
compilerplugins/clang/unusedmethods.py | 10 ++ sw/inc/IDocumentDrawModelAccess.hxx | 15 sw/inc/IDocumentListItems.hxx |4 - sw/inc/IDocumentState.hxx |9 -- sw/inc/IMark.hxx|2 sw/inc/PostItMgr.hxx|3 sw/inc/SwNumberTree.hxx | 25 -- sw/inc/calbck.hxx | 15 sw/inc/calc.hxx |2 sw/inc/charatr.hxx | 52 -- sw/inc/crsrsh.hxx |6 - sw/inc/dbfld.hxx|2 sw/inc/dbmgr.hxx|6 - sw/inc/doc.hxx | 18 - sw/inc/docsh.hxx|8 -- sw/inc/docufld.hxx |2 sw/inc/editsh.hxx |2 sw/inc/expfld.hxx |1 sw/inc/fesh.hxx |7 - sw/inc/fmtclds.hxx |2 sw/inc/fmtflcnt.hxx |2 sw/inc/fmtftn.hxx |1 sw/inc/fmthdft.hxx |2 sw/inc/fmtpdsc.hxx |1 sw/inc/format.hxx | 71 --- sw/inc/frmfmt.hxx |5 - sw/inc/grfatr.hxx | 27 --- sw/inc/index.hxx|2 sw/inc/modcfg.hxx | 14 --- sw/inc/ndarr.hxx|5 - sw/inc/node.hxx |1 sw/inc/pagedesc.hxx |7 - sw/inc/pagepreviewlayout.hxx|6 - sw/inc/paratr.hxx | 24 -- sw/inc/redline.hxx | 24 -- sw/inc/section.hxx |2 sw/inc/swatrset.hxx |2 sw/inc/swcrsr.hxx |4 - sw/inc/swmodule.hxx |9 -- sw/inc/swrect.hxx |6 - sw/inc/swtable.hxx |2 sw/inc/tblafmt.hxx |2 sw/inc/tgrditem.hxx |2 sw/inc/tox.hxx | 16 sw/inc/txatbase.hxx |8 -- sw/inc/txtatr.hxx |1 sw/inc/unobaseclass.hxx | 10 +- sw/inc/unocoll.hxx |3 sw/inc/viewopt.hxx | 11 --- sw/inc/viewsh.hxx |2 sw/source/core/access/accfrmobjmap.hxx |2 sw/source/core/access/accpage.hxx |3 sw/source/core/access/accpara.hxx |3 sw/source/core/doc/DocumentDrawModelManager.cxx | 32 sw/source/core/doc/DocumentListItemsManager.cxx | 13 --- sw/source/core/doc/DocumentStateManager.cxx | 16 sw/source/core/doc/doclay.cxx | 16 sw/source/core/frmedt/feflyole.cxx | 16 sw/source/core/inc/DocumentDrawModelManager.hxx |2 sw/source/core/inc/DocumentListItemsManager.hxx |2 sw/source/core/inc/DocumentStateManager.hxx |4 - sw/source/core/inc/cntfrm.hxx |7 - sw/source/core/inc/docfld.hxx |4 - sw/source/core/inc/doctxm.hxx |7 - sw/source/core/inc/drawfont.hxx | 16 sw/source/core/inc/flyfrm.hxx |8 -- sw/source/core/inc/fntcache.hxx |4 - sw/source/core/inc/frame.hxx| 10 -- sw/source/core/inc/frmtool.hxx | 10 -- sw/source/core/inc/layfrm.hxx |2 sw/source/core/inc/pagefrm.hxx |5 - sw/source/core/inc/rootfrm.hxx |1 sw/source/core/inc/sectfrm.hxx |3 sw/source/core/inc/swcache.hxx |8 -- sw/source/core/inc/swfont.hxx | 86 sw/source/core/inc/tabfrm.hxx |1 sw/source/core/inc/txtfrm.hxx | 44 sw/source/core/inc/unoport.hxx |7 - sw/source/core/inc/viewimp.hxx |2 sw/source/core/inc/wrong.hxx|2 sw/source/core/undo/undobj.cxx |2 sw/source/uibase/app/docshini.cxx | 12 ++- sw/source/uibase/dbui/dbmgr.cxx |1 sw/source/uibase/inc/fldmgr.hxx |7 - sw/source/uibase/inc/wrts
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 289e5dbbab58410dac59534c79ebe831a7712129
Author: Caolán McNamara
Date: Tue Jul 21 14:51:48 2015 +0100
coverity#1312088 Uninitialized scalar field
Change-Id: Id04343aa5de0caa5b066d7fbd2fa97b670f5cf54
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 47bc859..f7316d4 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -25,6 +25,7 @@ class FileViewContainer : public vcl::Window
, m_pFileView( NULL )
, m_pTreeView( NULL )
, m_pSplitter( NULL )
+, m_nCurrentFocus( 0 )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b7cbb9bc1dba17046a384e6497b4dead50ee5c72 Author: Caolán McNamara Date: Tue Jul 21 14:50:02 2015 +0100 coverity#1312089 Uninitialized pointer field Change-Id: I78856512069afa653b374f3d4b79db7307743294 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 716c229..47bc859 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -130,6 +130,7 @@ class FileViewContainer : public vcl::Window RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits ) : SvtFileDialog_Base( pParent, "RemoteFilesDialog", "fps/ui/remotefilesdialog.ui" ) , m_context( comphelper::getProcessComponentContext() ) +, m_pFileNotifier( NULL ) , m_pSplitter( NULL ) , m_pFileView( NULL ) , m_pContainer( NULL ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/fileview.cxx | 46 +--
svtools/source/contnr/foldertree.cxx |7 +++--
2 files changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 0d312afe2d31c19dbd2388d17ddbb372d1197c1f
Author: Caolán McNamara
Date: Tue Jul 21 14:53:27 2015 +0100
coverity#1312087 Resource leak
Change-Id: I6d526440bd652dcd1745b8d84ff69855691d7e48
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 10fa19fa..c85b1dd 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -421,10 +421,10 @@ protected:
Link<> m_aSelectHandler;
::rtl::Reference< ::svt::FileViewContentEnumerator >
-m_pContentEnumerator;
+m_xContentEnumerator;
Link<> m_aCurrentAsyncActionHandler;
::osl::Conditionm_aAsyncActionFinished;
-::rtl::Reference< ::salhelper::Timer > m_pCancelAsyncTimer;
+::rtl::Reference< ::salhelper::Timer > m_xCancelAsyncTimer;
::svt::EnumerationResultm_eAsyncActionResult;
boolm_bRunningAsyncAction;
boolm_bAsyncActionCancelled;
@@ -1639,21 +1639,21 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
DBG_TESTSOLARMUTEX();
::osl::ClearableMutexGuard aGuard( maMutex );
-OSL_ENSURE( !m_pContentEnumerator.is(),
"SvtFileView_Impl::GetFolderContent_Impl: still running another enumeration!" );
-m_pContentEnumerator = new ::svt::FileViewContentEnumerator(
-mpView->GetCommandEnvironment(), maContent, maMutex, mbReplaceNames ?
mpNameTrans : NULL );
+OSL_ENSURE( !m_xContentEnumerator.is(),
"SvtFileView_Impl::GetFolderContent_Impl: still running another enumeration!" );
+m_xContentEnumerator.set(new ::svt::FileViewContentEnumerator(
+mpView->GetCommandEnvironment(), maContent, maMutex, mbReplaceNames ?
mpNameTrans : NULL));
// TODO: should we cache and re-use this thread?
if ( !pAsyncDescriptor )
{
-::svt::EnumerationResult eResult =
m_pContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList );
+::svt::EnumerationResult eResult =
m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList );
if ( ::svt::SUCCESS == eResult )
{
implEnumerationSuccess();
-m_pContentEnumerator.clear();
+m_xContentEnumerator.clear();
return eSuccess;
}
-m_pContentEnumerator.clear();
+m_xContentEnumerator.clear();
return eFailure;
}
@@ -1676,7 +1676,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
pTimeout->Seconds = nMinTimeout / 1000L;
pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 100L;
-m_pContentEnumerator->enumerateFolderContent( _rFolder, this );
+m_xContentEnumerator->enumerateFolderContent( _rFolder, this );
// wait until the enumeration is finished
// for this, release our own mutex (which is used by the enumerator thread)
@@ -1697,16 +1697,16 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
if ( ::osl::Condition::result_timeout == eResult )
{
// maximum time to wait
-OSL_ENSURE( !m_pCancelAsyncTimer.get(),
"SvtFileView_Impl::GetFolderContent_Impl: there's still a previous timer!" );
-m_pCancelAsyncTimer = new CallbackTimer( this );
+OSL_ENSURE( !m_xCancelAsyncTimer.get(),
"SvtFileView_Impl::GetFolderContent_Impl: there's still a previous timer!" );
+m_xCancelAsyncTimer.set(new CallbackTimer(this));
sal_Int32 nMaxTimeout = pAsyncDescriptor->nMaxTimeout;
OSL_ENSURE( nMaxTimeout > nMinTimeout,
"SvtFileView_Impl::GetFolderContent_Impl: invalid maximum
timeout!" );
if ( nMaxTimeout <= nMinTimeout )
nMaxTimeout = nMinTimeout + 5000;
-m_pCancelAsyncTimer->setRemainingTime( salhelper::TTimeValue(
nMaxTimeout - nMinTimeout ) );
+m_xCancelAsyncTimer->setRemainingTime( salhelper::TTimeValue(
nMaxTimeout - nMinTimeout ) );
// we already waited for nMinTimeout milliseconds, so take this
into account
-m_pCancelAsyncTimer->start();
+m_xCancelAsyncTimer->start();
m_aCurrentAsyncActionHandler = pAsyncDescriptor->aFinishHandler;
DBG_ASSERT( m_aCurrentAsyncActionHandler.IsSet(),
"SvtFileView_Impl::GetFolderContent_Impl: nobody interested when it's
finished?" );
@@ -1897,17 +1897,17 @@ void SvtFileView_Impl::CancelRunningAsyncAction()
{
DBG_TESTSOLARMUTEX();
::osl::MutexGuard aGuard( maMutex );
-if ( !m_pContentEnumerator.is() )
+if ( !m_xContentEnumerator.is() )
return;
m_bAsyncActionCancelled = true;
-m_pContentEnumerator->cancel();
+m_xContentEnumerator->cancel();
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7b00ec7bb7bbf5206e7db4c566d1e681fb9f9607
Author: Caolán McNamara
Date: Tue Jul 21 15:00:53 2015 +0100
coverity#1312085 Dereference null return value
Change-Id: Ia770e7a6a7ebcc875f3cf94471dcc032aeadc2d7
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index f7316d4..fb24a25 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -631,6 +631,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl )
IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl )
{
SvTreeListEntry* pEntry = m_pFileView->FirstSelected();
+if (!pEntry)
+return 1;
SvtContentEntry* pData = static_cast< SvtContentEntry* >(
pEntry->GetUserData() );
if( ( pData->mbIsFolder && ( m_eType == REMOTEDLG_TYPE_PATHDLG ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/file/FResultSet.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5c938857c4bf69eb65b77ff3a862f50ab4a04af7
Author: Caolán McNamara
Date: Tue Jul 21 15:03:03 2015 +0100
coverity#1312084 Unchecked return value
Change-Id: I4b4b263f4448c4d3b83cea57635624b31f757576
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index 9433b1e..9f61747 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -539,7 +539,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException,
RuntimeException, st
// we know that we append new rows at the end
// so we have to know where the end is
-m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,false);
+(void)m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,false);
m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, true, m_xColsIdx);
if(m_bRowInserted && m_pFileSet.is())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dda78fb69cda3901b1da40de206c491a871b1854
Author: Caolán McNamara
Date: Tue Jul 21 15:07:13 2015 +0100
coverity#1312086 Out-of-bounds read
Change-Id: I7885f8ba5ec4c6e60d88f6caab0c25cb760529ef
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index fb24a25..2fabadc 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -89,7 +89,7 @@ class FileViewContainer : public vcl::Window
if( !m_pFileView || !m_pTreeView )
return;
-if( !bReverse && m_nCurrentFocus < 4 )
+if( !bReverse && m_nCurrentFocus < 3 )
{
m_pFocusWidgets[++m_nCurrentFocus]->SetFakeFocus( true );
m_pFocusWidgets[m_nCurrentFocus]->GrabFocus();
___
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/core/tool/parclass.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 01eea7fe40c939311bf1920b6e8b4391a93c2e82
Author: Eike Rathke
Date: Tue Jul 21 16:09:34 2015 +0200
MATCH, HLOOKUP and VLOOKUP have a ReferenceOrForceArray parameter
tdf#91278 related
Change-Id: Iab4728b07649bcbb1beb372e68369f3762b13a5c
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 40e1d3f..bb19244 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -113,7 +113,7 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocGreaterEqual,{{ Array, Array
}, 0 }},
{ ocGrowth, {{ Reference, Reference, Reference, Value
}, 0 }},
{ ocHarMean, {{ Reference
}, 1 }},
-{ ocHLookup, {{ Value, Reference, Value, Value
}, 0 }},
+{ ocHLookup, {{ Value, ReferenceOrForceArray, Value, Value
}, 0 }},
{ ocIRR, {{ Reference, Value
}, 0 }},
{ ocIndex, {{ Reference, Value, Value, Value
}, 0 }},
{ ocIntercept, {{ ForceArray, ForceArray
}, 0 }},
@@ -125,7 +125,7 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocLess,{{ Array, Array
}, 0 }},
{ ocLessEqual, {{ Array, Array
}, 0 }},
{ ocLookup, {{ Value, ReferenceOrForceArray,
ReferenceOrForceArray }, 0 }},
-{ ocMatch, {{ Value, Reference, Reference
}, 0 }},
+{ ocMatch, {{ Value, ReferenceOrForceArray, Value
}, 0 }},
{ ocMatDet, {{ ForceArray
}, 0 }},
{ ocMatInv, {{ ForceArray
}, 0 }},
{ ocMatMult, {{ ForceArray, ForceArray
}, 0 }},
@@ -203,7 +203,7 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocVarPA, {{ Reference
}, 1 }},
{ ocVarP_MS, {{ Reference
}, 1 }},
{ ocVarS,{{ Reference
}, 1 }},
-{ ocVLookup, {{ Value, Reference, Value, Value
}, 0 }},
+{ ocVLookup, {{ Value, ReferenceOrForceArray, Value, Value
}, 0 }},
{ ocXor, {{ Reference
}, 1 }},
{ ocZTest, {{ Reference, Value, Value
}, 0 }},
{ ocZTest_MS,{{ Reference, Value, Value
}, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - framework/source sc/source sd/sdi sd/source sfx2/sdi svx/sdi sw/inc sw/source
framework/source/uielement/subtoolbarcontroller.cxx | 53 --
sc/source/ui/inc/tabvwsh.hxx|3
sc/source/ui/view/tabvwsh2.cxx |6
sd/sdi/sdraw.sdi| 22 +-
sd/source/ui/func/fuconcs.cxx |5
sd/source/ui/inc/DrawViewShell.hxx |1
sd/source/ui/inc/fuconcs.hxx|1
sd/source/ui/table/tablefunction.cxx|1
sd/source/ui/view/drviews2.cxx | 17 --
sd/source/ui/view/drviews7.cxx | 47 ++
sd/source/ui/view/drviewsc.cxx | 155
sd/source/ui/view/drviewse.cxx |9 -
sfx2/sdi/sfx.sdi|2
svx/sdi/svx.sdi | 12 -
sw/inc/view.hxx |5
sw/source/uibase/uiview/viewdraw.cxx|1
sw/source/uibase/uiview/viewstat.cxx|5
17 files changed, 76 insertions(+), 269 deletions(-)
New commits:
commit 74cc3fbc17235f5c0010c363342a9a9adaf85c4e
Author: Maxim Monastirsky
Date: Tue Jul 21 10:58:39 2015 +0300
tdf#36796 Status updates for custom shapes buttons
We're dealing here with 2 bugs:
1. Single shape buttons (like rectangle, ellipse etc.) don't get
the pressed state when active. The cause is that all commands of
the same kind (Basic Shapes, Symbol Shapes etc.) are handled as
one internally, allowing only one type of status updates. It used
to transport the current active shape, but it was changed to a
boolean value in the fix for i#41753, and since then used for
the pressed state of the group buttons.
2. The pressed state of a group button shows always, even when a
user activates a shape from a place other than the drop-down
of that button. But in this case the image of the group button
doesn't update with the current shape, thus confusing the user on
what is currently active. The cause here is that we use (since
i#41753) the XSubToolbarController interface to update the last
selected function (instead of the old-style status based update),
and ToolBarManager notifies a controller about a new selection
only if it was made from a particular toolbar that the controller
claimed to use in the getSubToolbarName method.
Since 7352a7c17875e5adcc4226c45f4a03e11c44ff49 there is a similar
regression for other group buttons in sd (like lines, 3D Objects
and other), with the same cause. This is also fixed now.
Change-Id: Ida074a001ff78bf5bd5bcb8151516daa6e27cbce
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx
b/framework/source/uielement/subtoolbarcontroller.cxx
index 63a0984..3a06a10 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -102,6 +102,8 @@ SubToolBarController::SubToolBarController( const
css::uno::Sequence< css::uno::
break;
}
}
+if ( !m_aLastCommand.isEmpty() )
+addStatusListener( m_aLastCommand );
}
SubToolBarController::~SubToolBarController()
@@ -131,32 +133,41 @@ void SubToolBarController::statusChanged( const
css::frame::FeatureStateEvent& E
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
{
-pToolBox->EnableItem( nId, Event.IsEnabled );
ToolBoxItemBits nItemBits = pToolBox->GetItemBits( nId );
nItemBits &= ~ToolBoxItemBits::CHECKABLE;
TriState eTri = TRISTATE_FALSE;
-bool bValue;
-css::frame::status::ItemStatus aItemState;
-css::frame::status::Visibility aItemVisibility;
-
-if ( Event.State >>= bValue )
-{
-// Boolean, treat it as checked/unchecked
-pToolBox->SetItemBits( nId, nItemBits );
-pToolBox->CheckItem( nId, bValue );
-if ( bValue )
-eTri = TRISTATE_TRUE;
-nItemBits |= ToolBoxItemBits::CHECKABLE;
-}
-else if ( Event.State >>= aItemState )
+if ( Event.FeatureURL.Complete == m_aCommandURL )
{
-eTri = TRISTATE_INDET;
-nItemBits |= ToolBoxItemBits::CHECKABLE;
+pToolBox->EnableItem( nId, Event.IsEnabled );
+
+OUString aStrValue;
+css::frame::status::Visibility aItemVisibility;
+if ( Event.State >>= aStrValue )
+{
+// Enum command, such as the current custom shape,
+// toggle checked state.
+if ( m_aLastCommand == OUString( m_aCommandURL + "." +
aStrValue ) )
+{
+eTri = TRISTATE_TRUE;
+nItemBits |= ToolBoxItemBits::CHECKABLE;
+}
+}
+
Re: Cpp Unit- Query
> We are trying to use this software in our corporate environment. We need few > information about this software to proceed with the review. Anticipating your > quick response This e-mail is not serious, right? It has terrible grammar, fucked up HTML and is simply stupid. You didn't even get the fonts (that shouldn't be specified here) right. > But presumably you should do your own review of the code rather than trusting > a random stranger on the internet :-) Exactly. Do your job instead of delegating it to us. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_formula.cxx | 19 +++
1 file changed, 19 insertions(+)
New commits:
commit bb7c3821208feef6cf713591a9805e4118dd7554
Author: Eike Rathke
Date: Tue Jul 21 16:36:26 2015 +0200
unit test for MATCH ReferenceOrForceArray parameter
Change-Id: I534480411d6c164f9f0955933b612c1a219402fd
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 0e562d7..8610c54 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4263,6 +4263,25 @@ void Test::testFuncMATCH()
CPPUNIT_ASSERT_EQUAL(OUString("6"),
m_pDoc->GetString(ScAddress(1,0,0)));
}
+{
+// Test the ReferenceOrForceArray parameter.
+
+clearRange(m_pDoc, ScRange(0,0,0,1,7,0));
+
+// B1:B5 contain numeric values.
+m_pDoc->SetValue(ScAddress(1,0,0), 1.0);
+m_pDoc->SetValue(ScAddress(1,1,0), 2.0);
+m_pDoc->SetValue(ScAddress(1,2,0), 3.0);
+m_pDoc->SetValue(ScAddress(1,3,0), 4.0);
+m_pDoc->SetValue(ScAddress(1,4,0), 5.0);
+
+// Find string value "33" in concatenated array, no implicit
+// intersection is involved, array is forced.
+m_pDoc->SetString(ScAddress(0,5,0), "=MATCH(\"33\";B1:B5&B1:B5)");
+m_pDoc->CalcAll();
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(ScAddress(0,5,0)));
+}
+
m_pDoc->DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 7 commits - fpicker/source icon-themes/breeze icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes
fpicker/source/office/RemoteFilesDialog.cxx | 80
icon-themes/breeze/links.txt|3 +
icon-themes/galaxy/links.txt|3 +
icon-themes/hicontrast/links.txt|4 +
icon-themes/human/links.txt |3 +
icon-themes/tango/links.txt |1
include/svtools/foldertree.hxx |1
include/svtools/svtools.hrc |1
svtools/source/contnr/fileview.src |6 ++
svtools/source/contnr/foldertree.cxx|3 -
svtools/source/dialogs/PlaceEditDialog.cxx |8 ++
11 files changed, 79 insertions(+), 34 deletions(-)
New commits:
commit 0235f0ca7a06a30108de691b26c60ad2040dac48
Author: Szymon KÅos
Date: Tue Jul 21 16:45:00 2015 +0200
set pointer to Wait while reading url
Change-Id: I3c0786f8fb20df368cc7c03e35deba51d7ebbecd
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index c67e320..bc19740 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -468,6 +468,10 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const
& sURL )
}
m_pFileView->EndInplaceEditing( false );
+
+EnableChildPointerOverwrite( true );
+SetPointer( PointerStyle::Wait );
+
eResult = m_pFileView->Initialize( sURL, sFilter, NULL, GetBlackList()
);
if( eResult == eSuccess )
@@ -481,6 +485,9 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const &
sURL )
m_bIsConnected = true;
EnableControls();
}
+
+SetPointer( PointerStyle::Arrow );
+EnableChildPointerOverwrite( false );
}
return eResult;
commit 6eb95abd9adeb5ce42a361b4ad8195d1cf8f3159
Author: Szymon KÅos
Date: Tue Jul 21 15:50:09 2015 +0200
select recently added service
Change-Id: I55a32eef4a5eb3b9f57cf6d1b8f3cba5a9a14c55
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 4843854..c67e320 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -549,6 +549,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl )
m_pServices_lb->InsertEntry( sPrefix + newService->GetName() );
m_pServices_lb->SelectEntryPos( m_pServices_lb->GetEntryCount() -
1 );
+SelectServiceHdl( NULL );
m_bIsUpdated = true;
commit 0450e02bcf6de270cd2412cbaa6e8268aa4263de
Author: Szymon KÅos
Date: Tue Jul 21 15:39:08 2015 +0200
automatically select last used service
Change-Id: Ic66517cd65c28bd7e62e38796cf8580ed31305f7
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 6dbbc62..4843854 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -323,6 +323,11 @@ short RemoteFilesDialog::Execute()
Show();
AddServiceHdl( NULL );
}
+if( m_pServices_lb->GetEntryCount() > 0 )
+{
+Show();
+SelectServiceHdl( NULL );
+}
short nRet = SvtFileDialog_Base::Execute();
commit 469c20de440151707b288a150ff9be62f3922186
Author: Szymon KÅos
Date: Tue Jul 21 13:28:46 2015 +0200
avoid multiple recursive opening the same url, cleaning
Change-Id: I8a3ae75a64ffcc4879af3e3591b3b433cee1678d
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index d9f0e35..6dbbc62 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -468,7 +468,10 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const
& sURL )
if( eResult == eSuccess )
{
m_pPath->SetURL( sURL );
+
+m_pTreeView->SetSelectHdl( Link<>() );
m_pTreeView->SetTreePath( sURL );
+m_pTreeView->SetSelectHdl( LINK( this, RemoteFilesDialog,
TreeSelectHdl ) );
m_bIsConnected = true;
EnableControls();
@@ -660,24 +663,17 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl,
MenuButton *, pButton,
IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl )
{
-SvTreeListEntry* pEntry = m_pFileView->FirstSelected();
-
-if( pEntry )
+if( m_pFileView->GetSelectionCount() )
{
-SvtContentEntry* pData = static_cast< SvtContentEntry* >(
pEntry->GetUserData() );
+OUString sURL = m_pFileView->GetCurrentURL();
-if( pData )
+if( ContentIsFolder( sURL ) )
{
-if( pData->mbIsFolder )
-{
-OUString sURL = m_pFileView->GetCurrentURL();
-
-OpenURL( sURL );
-}
-else
-{
-EndDialog( RET_OK );
-}
+OpenURL( sURL );
+}
+else
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source
vcl/source/control/field2.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit f838b4f5495f1e70d005bbb1e991b63409ada5a8
Author: Lionel Elie Mamane
Date: Tue Jul 21 14:02:59 2015 +0200
avoid 1-past-the-end string access
Change-Id: Ia475ce737c430fab8d019e1b8a762f81897e0847
Reviewed-on: https://gerrit.libreoffice.org/17260
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 3f343b2..c9253f8 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -432,15 +432,14 @@ static sal_Int32 ImplPatternRightPos( const OUString&
rStr, const OString& rEdit
{
// search non-literal successor
sal_Int32 nNewPos = nCursorPos;
-sal_Int32 nTempPos = nNewPos;
-while ( nTempPos < rEditMask.getLength() )
+;
+for(sal_Int32 nTempPos = nNewPos+1; nTempPos < rEditMask.getLength();
++nTempPos )
{
-if ( rEditMask[nTempPos+1] != EDITMASK_LITERAL )
+if ( rEditMask[nTempPos] != EDITMASK_LITERAL )
{
-nNewPos = nTempPos+1;
+nNewPos = nTempPos;
break;
}
-nTempPos++;
}
ImplPatternMaxPos( rStr, rEditMask, nFormatFlags, bSameMask, nCursorPos,
nNewPos );
return nNewPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/core/doc/docnum.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ffc3876a95f896388fcb65ff7b37b5214d24eb52
Author: Caolán McNamara
Date: Mon Jul 20 13:45:52 2015 +0100
test should check that all levels are equal
regression from
commit bf586debd4d8274cff2737f02beac465525328e8
Author: Matteo Casalin
Date: Sat Feb 21 12:38:54 2015 +0100
Simplify
Change-Id: I09f83b2bab053fcd48fe1a1a4184cc11a4f9d663
(cherry picked from commit 8a01693c79a24006cbe7d8642b97408eb23a1bd9)
Reviewed-on: https://gerrit.libreoffice.org/17233
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index f23053b..5340b6e 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -654,13 +654,17 @@ static SwTextNode* lcl_FindOutlineNum( const
SwOutlineNodes& rOutlNds, OUString&
const SwNodeNum & rNdNum = *(pNd->GetNum());
SwNumberTree::tNumberVector aLevelVal =
rNdNum.GetNumberVector();
// now compare with the one searched for
+bool bEqual = true;
for( int n = 0; n < nLevel; ++n )
{
-if ( aLevelVal[n] == nLevelVal[n] )
+if ( aLevelVal[n] != nLevelVal[n] )
{
-return pNd;
+bEqual = false;
+break;
}
}
+if (bEqual)
+return pNd;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - sd/source sd/uiconfig
sd/source/ui/app/sddll.cxx |2 ++ sd/uiconfig/sdraw/menubar/menubar.xml|2 ++ sd/uiconfig/sdraw/toolbar/standardbar.xml|3 ++- sd/uiconfig/simpress/menubar/menubar.xml |2 ++ sd/uiconfig/simpress/toolbar/standardbar.xml |3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 14c32cd60ef745d181add0445f5f2f8a3bb779a0 Author: Szymon KÅos Date: Tue Jul 21 17:21:57 2015 +0200 Open/Save Remote File in Impress/Draw toolbars and menu Change-Id: I9503f5beaa8b5a6afc213747a691265acd5903f7 diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 8fb1907..8e15960 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -257,6 +257,8 @@ void SdDLL::RegisterControllers() SvxFrameLineStyleToolBoxControl::RegisterControl(SID_FRAME_LINESTYLE, pMod ); SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); + +SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEASDOC, pMod ); } void SdDLL::Init() diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index bc8cfee..c1a9be9 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -21,6 +21,7 @@ + @@ -36,6 +37,7 @@ + diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 06c7d5d..6e2d1fa 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -22,8 +22,9 @@ + - + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 3eb5156..71146c2 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -21,6 +21,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index c82ad6a..a83b414 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -22,8 +22,9 @@ + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svx/source
svx/source/form/fmvwimp.cxx | 98 +---
svx/source/form/formcontrolling.cxx | 12 ++--
2 files changed, 87 insertions(+), 23 deletions(-)
New commits:
commit ba30fabf3ca88fedc05d521c9ec06a0b77007661
Author: Lionel Elie Mamane
Date: Tue Jul 21 17:31:56 2015 +0200
Listen to error only while operating on controller.
Else, on any action done directly (not through the
FormControllerHelper) on the controller and raising an SQL error, this
would silently swallow the error message, and the operation would fail
without any message to the user.
E.g. when validating an insertion or modification in a grid control by
moving the cursor to a different line (as opposed to clicking the
"Save Record" button).
Change-Id: Ie569d9c826609f803f7b312c046990718ef2
diff --git a/svx/source/form/formcontrolling.cxx
b/svx/source/form/formcontrolling.cxx
index db5d2be..6fcf0a7 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -240,11 +240,6 @@ namespace svx
m_xFormOperations = FormOperations::createWithFormController(
comphelper::getProcessComponentContext(), _rxController );
if ( m_xFormOperations.is() )
m_xFormOperations->setFeatureInvalidation( this );
-
-// to prevent the controller from displaying any error messages
which happen while we operate on it,
-// we add ourself as XSQLErrorListener. By contract, a
FormController displays errors if and only if
-// no SQLErrorListeners are registered.
-_rxController->addSQLErrorListener( this );
}
catch( const Exception& )
{
@@ -333,6 +328,11 @@ namespace svx
const_cast< FormControllerHelper* >( this )->m_aOperationError.clear();
try
{
+// to prevent the controller from displaying any error messages
which happen while we operate on it,
+// we add ourself as XSQLErrorListener. By contract, a
FormController displays errors if and only if
+// no SQLErrorListeners are registered.
+m_xFormOperations->getController()->addSQLErrorListener(
const_cast< FormControllerHelper* >(this) );
+
switch ( _eWhat )
{
case COMMIT_CONTROL:
@@ -359,10 +359,12 @@ namespace svx
}
catch ( const SQLException& )
{
+m_xFormOperations->getController()->removeSQLErrorListener(
const_cast< FormControllerHelper* >(this) );
aError = ::cppu::getCaughtException();
}
catch( const Exception& )
{
+m_xFormOperations->getController()->removeSQLErrorListener(
const_cast< FormControllerHelper* >(this) );
SQLException aFallbackError;
aFallbackError.Message = ::comphelper::anyToString(
::cppu::getCaughtException() );
aError <<= aFallbackError;
commit b28ec7f462fcbb612b1c8a89af84c7c2601a5c65
Author: Lionel Elie Mamane
Date: Tue Jul 21 17:01:37 2015 +0200
janitorial
Change-Id: I727c5af7659e9591563c0784fee5d0d9317ebc24
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 6d6c9a6..b153f3fb6 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
pAdapter =*i;
}
-if ( pAdapter.get() )
+if ( pAdapter.is() )
{
Reference< XFormController > xControllerToActivate;
for ( ::std::vector< Reference< XFormController >
>::const_iterator i = pAdapter->GetList().begin();
commit 42f0a84764add89c6b22943d55c821acbcf3f37d
Author: Lionel Elie Mamane
Date: Tue Jul 21 16:58:38 2015 +0200
form document view activation: prioritise activation of already active form
This avoids arbitrarily switching to the first form in the document,
which would do a (premature!) save to the database of the
modifications pending in the active form. This may lead to a database
error, when the data is not in a shape to be written to the database,
e.g. when on an insertion row and not all mandatory fields have been
filled in. This then pops up an error message to the user.
Change-Id: I30bb533598ca707b892bb7155e54ce05d4ddf275
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 51db499..6d6c9a6 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -654,6 +654,66 @@ void FmXFormView::resumeTabOrderUpdate()
m_aNeedTabOrderUpdate.clear();
}
+namespace
+{
+bool isActivableDatabaseForm(const Reference< XFormController >
&xController)
+{
+// only database forms are to be activated
+Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY);
+if ( !xForm.is() || !getConnection( xForm ).is() )
+return false;
+
+Reference
[Libreoffice-commits] libvisio.git: 2 commits - src/lib src/test
src/lib/VSD5Parser.cpp | 16
src/test/importtest.cpp |2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 77a88f128700e434c093eb53590be63022edbdea
Author: David Tardon
Date: Tue Jul 21 17:35:13 2015 +0200
avoid overflows when reading chunk records
Change-Id: Iea13e63e977348a449b68eca329146ae6f097197
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 00cbf06..79b638b 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -102,7 +102,12 @@ void
libvisio::VSD5Parser::handleChunkRecords(librevenge::RVNGInputStream *input
long endPosition = input->tell() + m_header.dataLength;
input->seek(endPosition - 4, librevenge::RVNG_SEEK_SET);
unsigned numRecords = readU16(input);
+ const long headerPosition = endPosition - 4 * (numRecords + 1);
+ if (headerPosition <= startPosition) // no records to read
+return;
unsigned endOffset = readU16(input);
+ if (long(endOffset) > (headerPosition - startPosition))
+endOffset = unsigned(headerPosition - startPosition); // try to read
something anyway
std::map records;
input->seek(endPosition-4*(numRecords+1), librevenge::RVNG_SEEK_SET);
unsigned i = 0;
@@ -114,10 +119,13 @@ void
libvisio::VSD5Parser::handleChunkRecords(librevenge::RVNGInputStream *input
unsigned tmpStart = offset;
while (tmpStart % 4)
tmpStart++;
-header.dataLength = endOffset - tmpStart;
-header.level = m_header.level + 1;
-records[tmpStart] = header;
-endOffset = offset;
+if (tmpStart < endOffset)
+{
+ header.dataLength = endOffset - tmpStart;
+ header.level = m_header.level + 1;
+ records[tmpStart] = header;
+ endOffset = offset;
+}
}
i = 0;
for (std::map::iterator iter = records.begin(); iter
!= records.end(); ++iter)
commit 2bdd7a9bfd1ed1606b7348602196f0a2baf0c099
Author: David Tardon
Date: Tue Jul 21 17:35:19 2015 +0200
astyle
Change-Id: I51eebdceb176ae9ded9860010a6b691d0af4cf95
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 705a8c7..c09bfd8 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -85,7 +85,7 @@ void assertXPathNoAttribute(xmlDocPtr doc, const
librevenge::RVNGString &xpath,
message2.append("' unexpected '");
message2.append(attribute);
message2.append("' attribute");
- CPPUNIT_ASSERT_EQUAL_MESSAGE(message2.cstr(), static_cast(0),
xmlGetProp(node, BAD_CAST(attribute.cstr(;
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(message2.cstr(), static_cast(0),
xmlGetProp(node, BAD_CAST(attribute.cstr(;
xmlXPathFreeObject(xpathobject);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loleaflet/src loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/TileCache.cpp loolwsd/TileCache.hpp
loleaflet/src/control/Parts.js|1 +
loleaflet/src/layer/tile/TileLayer.js |1 +
loolwsd/LOOLSession.cpp | 24 ++--
loolwsd/LOOLSession.hpp |4
loolwsd/TileCache.cpp | 22 ++
loolwsd/TileCache.hpp |2 +-
6 files changed, 43 insertions(+), 11 deletions(-)
New commits:
commit 0492094b4eb3d21d8ff9b5e874ee806640a4b0f1
Author: Mihai Varga
Date: Tue Jul 21 16:57:50 2015 +0300
loleaflet: notify the server about the current part
We need this because we want to prefetch tiles from other parts too.
In order to render a tile we need to call 'setPart' and then 'paintTile'
so this might change the current part in the document.
But when the user is editing/selecting we want to work on the part that
he/she is viewing
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 30eddd9..1041604 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -25,6 +25,7 @@ L.Map.include({
parts: docLayer._parts,
docType: docLayer._docType
});
+ docLayer.sendMessage('setclientpart part=' +
docLayer._currentPart);
docLayer._update();
docLayer._pruneTiles();
docLayer._clearSelections();
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index b4d8024..99b4df1 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -323,6 +323,7 @@ L.TileLayer = L.GridLayer.extend({
this._documentInfo = textMsg;
this._parts = command.parts;
this._currentPart = command.currentPart;
+ this.sendMessage('setclientpart part=' +
this._currentPart);
var partNamesStr = bytes === undefined ?
textMsg : String.fromCharCode.apply(null, bytes.subarray(index));
var partNames = partNamesStr.match(/[^\r\n]+/g);
this._map.fire('updateparts', {
commit b9884a470a89fbbcba5b500da62d3e2601299090
Author: Mihai Varga
Date: Tue Jul 21 16:56:02 2015 +0300
loolwsd: be aware of the client's current part
And set lok's part to match the client's when they start editing or
selecting
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 58e699e..3294806 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -277,6 +277,7 @@ bool MasterProcessSession::handleInput(const char *buffer,
int length)
tokens[0] != "saveas" &&
tokens[0] != "selectgraphic" &&
tokens[0] != "selecttext" &&
+ tokens[0] != "setclientpart" &&
tokens[0] != "status" &&
tokens[0] != "tile" &&
tokens[0] != "uno")
@@ -574,7 +575,8 @@ void MasterProcessSession::forwardToPeer(const char
*buffer, int length)
ChildProcessSession::ChildProcessSession(std::shared_ptr ws,
LibreOfficeKit *loKit) :
LOOLSession(ws, Kind::ToMaster),
_loKitDocument(NULL),
-_loKit(loKit)
+_loKit(loKit),
+_clientPart(0)
{
std::cout << Util::logPrefix() << "ChildProcessSession ctor this=" << this
<< " ws=" << _ws.get() << std::endl;
}
@@ -608,6 +610,10 @@ bool ChildProcessSession::handleInput(const char *buffer,
int length)
sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded");
return false;
}
+else if (tokens[0] == "setclientpart")
+{
+return setClientPart(buffer, length, tokens);
+}
else if (tokens[0] == "status")
{
return getStatus(buffer, length);
@@ -630,6 +636,10 @@ bool ChildProcessSession::handleInput(const char *buffer,
int length)
tokens[0] == "resetselection" ||
tokens[0] == "saveas");
+if (_loKitDocument->pClass->getPart(_loKitDocument) != _clientPart)
+{
+_loKitDocument->pClass->setPart(_loKitDocument, _clientPart);
+}
if (tokens[0] == "gettextselection")
{
return getTextSelection(buffer, length, tokens);
@@ -1024,4 +1034,14 @@ bool ChildProcessSession::saveAs(const char *buffer, int
length, StringTokenizer
return true;
}
+bool ChildProcessSession::setClientPart(const char *buffer, int length,
StringTokenizer& tokens)
+{
+if (tokens.count() < 2 ||
+!getTokenInteger(tokens[1], "part", _clientPart))
+{
+return false;
+}
+return true;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index aa3ac25..361f6fb 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -175,10 +175,14 @@ public:
bool selectGraphic(const char *buff
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/data/ww8/pass/CVE-2015-0097-1.doc |binary 1 file changed New commits: commit 6e7f44a50d8b0b4f14771b55ec00f608331cd8aa Author: Caolán McNamara Date: Tue Jul 21 17:15:43 2015 +0100 add testcase for CVE-2015-0097 Change-Id: I794cc4de0fb35dc5471c15873649712f03178817 diff --git a/sw/qa/core/data/ww8/pass/CVE-2015-0097-1.doc b/sw/qa/core/data/ww8/pass/CVE-2015-0097-1.doc new file mode 100644 index 000..7c893da Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2015-0097-1.doc differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 2 commits - libreofficekit/source
Rebased ref, commits from common ancestor:
commit 2501f24e42353ae86c3ebcf4b39d493d9a1ca77c
Author: Pranav Kant
Date: Sun Jul 19 23:05:43 2015 +0530
lokdocview: [WIP] Async. request for tile on tile invalidation
Change-Id: I57db9e3adf26996e6e1e105b8b95f53e88e7760f
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 3662f0d..e2568fa 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -520,7 +520,7 @@ setTilesInvalid (LOKDocView* pDocView, const GdkRectangle&
rRectangle)
for (int i = aStart.x; i < aEnd.x; i++)
for (int j = aStart.y; j < aEnd.y; j++)
-priv->m_aTileBuffer.setInvalid(i, j);
+priv->m_aTileBuffer.setInvalid(i, j, priv->m_fZoom);
}
static gboolean
@@ -742,7 +742,7 @@ renderGraphicHandle(LOKDocView* pDocView,
}
static void
-rdcb(GObject* source_object, GAsyncResult* res, gpointer)
+rdcb(GObject* source_object, GAsyncResult*, gpointer)
{
LOKDocView* pDocView = LOK_DOC_VIEW(source_object);
gtk_widget_queue_draw(GTK_WIDGET(pDocView));
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx
b/libreofficekit/source/gtk/tilebuffer.cxx
index 43050c0..d488f8b 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -27,7 +27,7 @@ float twipToPixel(float fInput, float zoom)
return fInput / 1440.0f * DPI * zoom;
}
-static void getTileFunc(GTask* task, gpointer source_object, gpointer
task_data, GCancellable*)
+static void getTileFunc(GTask*, gpointer, gpointer task_data, GCancellable*)
{
GdkPixbuf* pPixBuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
nTileSizePixels, nTileSizePixels);
GetTileCallbackData* pCallback =
static_cast(task_data);
@@ -96,13 +96,17 @@ void TileBuffer::resetAllTiles()
}
}
-void TileBuffer::setInvalid(int x, int y)
+void TileBuffer::setInvalid(int x, int y, float fZoom)
{
int index = x * m_nWidth + y;
g_info("Setting tile invalid (%d, %d)", x, y);
if (m_mTiles.find(index) != m_mTiles.end())
{
m_mTiles[index].valid = false;
+GTask* task = g_task_new(this, NULL, NULL, NULL);
+GetTileCallbackData* pCallback = new GetTileCallbackData(x, y, fZoom,
this);
+g_task_set_task_data(task, pCallback, g_free);
+g_task_run_in_thread(task, getTileFunc);
}
}
@@ -119,33 +123,11 @@ Tile& TileBuffer::getTile(int x, int y, float aZoom,
GTask* task)
}
else if(m_mTiles.find(index) == m_mTiles.end())
{
-
-GdkPixbuf* pPixBuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
nTileSizePixels, nTileSizePixels);
-if (!pPixBuf)
-{
-g_info ("Error allocating memory to pixbuf");
-return m_mTiles[index];
-}
-
-unsigned char* pBuffer = gdk_pixbuf_get_pixels(pPixBuf);
-GdkRectangle aTileRectangle;
-aTileRectangle.x = pixelToTwip(nTileSizePixels, aZoom) * y;
-aTileRectangle.y = pixelToTwip(nTileSizePixels, aZoom) * x;
-
-g_test_timer_start();
-m_pLOKDocument->pClass->paintTile(m_pLOKDocument,
- pBuffer,
- nTileSizePixels, nTileSizePixels,
- aTileRectangle.x, aTileRectangle.y,
- pixelToTwip(nTileSizePixels, aZoom),
- pixelToTwip(nTileSizePixels, aZoom));
-
-double elapsedTime = g_test_timer_elapsed();
-g_info ("Rendered (%d, %d) in %f seconds", x, y, elapsedTime);
-
-//create a mapping for it
-m_mTiles[index].setPixbuf(pPixBuf);
-m_mTiles[index].valid = true;
+GetTileCallbackData* pCallback = new GetTileCallbackData(x, y, aZoom,
this);
+g_task_set_task_data(task, pCallback, g_free);
+g_info ("running in thread new tile");
+g_task_run_in_thread(task, getTileFunc);
+return m_DummyTile;
}
return m_mTiles[index];
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx
b/libreofficekit/source/gtk/tilebuffer.hxx
index 5204d40..50de72d 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -118,7 +118,7 @@ class TileBuffer
@param x the position of tile along x-axis
@param y the position of tile along y-axis
*/
-void setInvalid(int x, int y);
+void setInvalid(int x, int y, float zoom);
/// Contains the reference to the LOK Document that this tile buffer is
for.
commit a6918763ca5603ca2c7371295a07f4701fc40214
Author: Pranav Kant
Date: Sun Jul 19 01:03:56 2015 +0530
WIP: Trying to make paintTile async
Change-Id: I6a1a261709e503a2f286f126f686e23fcdbcf85c
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 08c8485..3662f0d 100644
--- a/libreofficek
[Libreoffice-commits] core.git: Branch 'feature/chart-sidebar' - 4 commits - chart2/source include/svx svx/source
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 21 -
include/svx/sidebar/AreaPropertyPanelBase.hxx |8
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 406 ++--
3 files changed, 242 insertions(+), 193 deletions(-)
New commits:
commit 1e81c2c80d552e388ff600cef40c5ca6652e2015
Author: Markus Mohrhard
Date: Tue Jul 21 19:01:26 2015 +0200
avoid crash with color listbox for now
Change-Id: I36ac6513546961ec8d8d1e9437a8ef88574acbf4
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index bf48573..3b94efc 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -207,7 +207,7 @@ IMPL_LINK(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox
*, pToolBox)
mpLbFillAttr->Hide();
mpToolBoxColor->Show();
const OUString aTmpStr;
-const Color aColor = mpColorItem->GetColorValue();
+const Color aColor = mpColorItem ?
mpColorItem->GetColorValue() : COL_AUTO;
const XFillColorItem aXFillColorItem( aTmpStr, aColor );
// #i122676# change FillStyle and Color in one call
commit 352e5f6a6c797eb0677a24b9cdc7a73306e8e6f6
Author: Markus Mohrhard
Date: Tue Jul 21 19:01:06 2015 +0200
avoid a crash that occures sometimes
Change-Id: Iccbdfdb8a46b45b76756ff8080757db3770d691c
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 89eb74b..13c4a7c 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -23,7 +23,9 @@ OUString getCID(css::uno::Reference
xModel)
return OUString();
css::uno::Any aAny = xSelectionSupplier->getSelection();
-assert(aAny.hasValue());
+if (!aAny.hasValue())
+return OUString();
+
OUString aCID;
aAny >>= aCID;
@@ -94,6 +96,9 @@ void ChartAreaPanel::setFillFloatTransparence(const
XFillFloatTransparenceItem&
void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem)
{
css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(rItem.GetValue()));
}
@@ -101,6 +106,9 @@ void ChartAreaPanel::setFillStyleAndColor(const
XFillStyleItem* pStyleItem,
const XFillColorItem& rColorItem)
{
css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
xPropSet->setPropertyValue("Color",
css::uno::makeAny(rColorItem.GetValue()));
@@ -110,6 +118,9 @@ void ChartAreaPanel::setFillStyleAndGradient(const
XFillStyleItem* pStyleItem,
const XFillGradientItem& rGradientItem)
{
css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
xPropSet->setPropertyValue("GradientName",
css::uno::makeAny(rGradientItem.GetValue()));
@@ -119,6 +130,9 @@ void ChartAreaPanel::setFillStyleAndHatch(const
XFillStyleItem* pStyleItem,
const XFillHatchItem& rHatchItem)
{
css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
xPropSet->setPropertyValue("HatchName",
css::uno::makeAny(rHatchItem.GetValue()));
@@ -128,6 +142,9 @@ void ChartAreaPanel::setFillStyleAndBitmap(const
XFillStyleItem* pStyleItem,
const XFillBitmapItem& rBitmapItem)
{
css::uno::Reference xPropSet =
getPropSet(mxModel);
+if (!xPropSet.is())
+return;
+
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
xPropSet->setPropertyValue("FillBitmapName",
css::uno::makeAny(rBitmapItem.GetValue()));
commit 9b679334504dabaeecc60d64f6507cd781b744cf
Author: Markus Mohrhard
Date: Tue Jul 21 19:00:37 2015 +0200
dispose all children
Change-Id: I96501640bc15836476eaa6ff7784ab299277ced9
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 3319bf5..89eb74b 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -71,6 +71,8 @@ void ChartAreaPanel::dispose()
{
css::uno::Reference xBroadcaster(mxModel,
css::uno::UNO_QUERY_THROW);
xBroadcaster->removeModifyListener(mxListener);
+
+AreaPropertyPanelBase::dispose();
}
void ChartAreaPanel::Initialize()
commit 3c0868fcfc80355e916ad06c9cca912a7e8143bb
Author: Mar
Re: Cpp Unit- Query
Hi Bernardo, On Tuesday, 2015-07-21 11:44:04 -0300, Bernardo Sulzbach wrote: > This e-mail is not serious, right? > It has terrible grammar, fucked up HTML and is simply stupid. Would you please not insult people from this list? Thank you. It looked like a legitimate mail, maybe resulting from a company's formal legal approval process, no matter how silly the content read and may have looked to you. Eike (who's mail agent is configured to not display text/html content-type anyway) -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpK9RVjJhgz0.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDXMLParserBase.cpp | 42 +-
src/lib/VSDXParser.cpp | 12 ++--
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 392d2d609d4f9aa1738e30da18385e832da2f379
Author: Fridrich Å trba
Date: Tue Jul 21 19:57:36 2015 +0200
Fix dereferencing of uninitialized memory
Change-Id: Ic4d3c56257dec467325edd934c70074b656b31f4
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 03fa396..7953d3c 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -31,7 +31,7 @@ libvisio::VSDXMLParserBase::VSDXMLParserBase()
m_currentShapeLevel(0), m_colours(), m_fieldList(), m_shapeList(),
m_currentBinaryData(), m_shapeStack(), m_shapeLevelStack(),
m_isShapeStarted(false), m_isPageStarted(false), m_currentGeometryList(0),
-m_currentGeometryListIndex(MINUS_ONE), m_fonts()
+m_currentGeometryListIndex(MINUS_ONE), m_fonts(), m_watcher(0)
{
initColours();
}
@@ -162,7 +162,7 @@ void
libvisio::VSDXMLParserBase::readGeometry(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_GEOM != tokenId && XML_SECTION != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_GEOM != tokenId && XML_SECTION != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addGeometry(0, level+1, noFill, noLine, noShow);
}
@@ -212,7 +212,7 @@ void
libvisio::VSDXMLParserBase::readMoveTo(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_MOVETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_MOVETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addMoveTo(ix, level, x, y);
}
@@ -262,7 +262,7 @@ void
libvisio::VSDXMLParserBase::readLineTo(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_LINETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_LINETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addLineTo(ix, level, x, y);
}
@@ -316,7 +316,7 @@ void libvisio::VSDXMLParserBase::readArcTo(xmlTextReaderPtr
reader)
break;
}
}
- while (((XML_ARCTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_ARCTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addArcTo(ix, level, x, y, a);
}
@@ -382,7 +382,7 @@ void
libvisio::VSDXMLParserBase::readEllipticalArcTo(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_ELLIPTICALARCTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_ELLIPTICALARCTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addEllipticalArcTo(ix, level, x, y, a, b, c, d);
}
@@ -448,7 +448,7 @@ void
libvisio::VSDXMLParserBase::readEllipse(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_ELLIPSE != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_ELLIPSE != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addEllipse(ix, level, x, y, a, b, c, d);
}
@@ -518,7 +518,7 @@ void
libvisio::VSDXMLParserBase::readNURBSTo(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_NURBSTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_NURBSTO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && (!m_watcher ||
!m_watcher->isError()));
if (ret == 1)
m_currentGeometryList->addNURBSTo(ix, level, x, y, knot, knotPrev, weight,
weightPrev, nurbsData);
@@ -573,7 +573,7 @@ void
libvisio::VSDXMLParserBase::readPolylineTo(xmlTextReaderPtr reader)
break;
}
}
- while (((XML_POLYLINETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret && !m_watcher->isError());
+ while (((XML_POLYLINETO != tokenId && XML_ROW != tokenId) ||
XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret &&
[Libreoffice-commits] core.git: include/formula sc/source sc/uiconfig
include/formula/grammar.hxx |6 +-
sc/source/core/tool/interpr1.cxx | 14 +++---
sc/source/ui/optdlg/calcoptionsdlg.cxx|4
sc/source/ui/unoobj/confuno.cxx |2 ++
sc/uiconfig/scalc/ui/formulacalculationoptions.ui |1 +
5 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit abe178814489286aa45dc0799df50e650a78bc9d
Author: Katarina Behrens
Date: Mon Jul 20 22:07:53 2015 +0200
tdf#92256: Introducing CONV_A1_XL_A1 address pseudoconvention
a special case for INDIRECT function interpretation. Does what
OOo used to do, interprets formula using CONV_OOO first, failing
that, tries CONV_XL_A1
Change-Id: I4281ab2bb7164607206c0b8e51f7e63a1fc2db9a
Reviewed-on: https://gerrit.libreoffice.org/17255
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 4f6a2bc..618db98 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -43,7 +43,11 @@ public:
CONV_LOTUS_A1, /* external? 3d? A1.B2 */
-CONV_LAST /* for loops, must always be last */
+CONV_LAST, /* for loops, must always be last */
+
+// not a real address convention, a special case for INDIRECT function
interpretation
+// only -> try using CONV_OOO, failing that CONV_XL_A1
+CONV_A1_XL_A1
};
//! CONV_UNSPECIFIED is a negative value!
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index b464da4..31e98b1 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7036,12 +7036,18 @@ void ScInterpreter::ScIndirect()
// Overwrite the config and try Excel R1C1.
eConv = FormulaGrammar::CONV_XL_R1C1;
}
-const ScAddress::Details aDetails( eConv, aPos );
+
+bool bTryXlA1 = (eConv == FormulaGrammar::CONV_A1_XL_A1);
+
+const ScAddress::Details aDetails( bTryXlA1 ? FormulaGrammar::CONV_OOO
: eConv, aPos );
+const ScAddress::Details aDetailsXlA1( FormulaGrammar::CONV_XL_A1,
aPos );
SCTAB nTab = aPos.Tab();
OUString sRefStr = GetString().getString();
ScRefAddress aRefAd, aRefAd2;
ScAddress::ExternalInfo aExtInfo;
-if (ConvertDoubleRef(pDok, sRefStr, nTab, aRefAd, aRefAd2, aDetails,
&aExtInfo))
+if ( ConvertDoubleRef(pDok, sRefStr, nTab, aRefAd, aRefAd2, aDetails,
&aExtInfo) ||
+ ( bTryXlA1 && ConvertDoubleRef(pDok, sRefStr, nTab, aRefAd,
+aRefAd2, aDetailsXlA1, &aExtInfo)
) )
{
if (aExtInfo.mbExternal)
{
@@ -7053,7 +7059,9 @@ void ScInterpreter::ScIndirect()
else
PushDoubleRef( aRefAd, aRefAd2);
}
-else if (ConvertSingleRef(pDok, sRefStr, nTab, aRefAd, aDetails,
&aExtInfo))
+else if ( ConvertSingleRef(pDok, sRefStr, nTab, aRefAd, aDetails,
&aExtInfo) ||
+ ( bTryXlA1 && ConvertSingleRef (pDok, sRefStr, nTab, aRefAd,
+ aDetailsXlA1, &aExtInfo) ) )
{
if (aExtInfo.mbExternal)
{
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index d49fb65..6f2de0b 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -46,6 +46,8 @@ formula::FormulaGrammar::AddressConvention
toAddressConvention(sal_Int32 nPos)
return formula::FormulaGrammar::CONV_XL_A1;
case 3:
return formula::FormulaGrammar::CONV_XL_R1C1;
+case 4:
+return formula::FormulaGrammar::CONV_A1_XL_A1;
case 0:
default:
;
@@ -64,6 +66,8 @@ sal_Int32 toSelectedItem(
formula::FormulaGrammar::AddressConvention eConv )
return 2;
case formula::FormulaGrammar::CONV_XL_R1C1:
return 3;
+case formula::FormulaGrammar::CONV_A1_XL_A1:
+return 4;
default:
;
}
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 82f2502..5d0385e 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -311,6 +311,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
case 0: // CONV_OOO
case 2: // CONV_XL_A1
case 3: // CONV_XL_R1C1
+case 7: // CONV_A1_XL_A1
aCalcConfig.meStringRefAddressSyntax =
static_cast( nUno );
break;
default:
@@ -467,6 +468,7 @@ uno::Any SAL_CALL
ScDocumentConfiguration::getPropertyValue( const OUString& aPr
case formula::FormulaGrammar::CONV_OOO:
case formula::FormulaGrammar::CONV_XL_A1
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VDXParser.cpp | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit a85ef598bb5bd8cb656482354bff0bd857fcc8f9
Author: Fridrich Å trba
Date: Tue Jul 21 20:20:25 2015 +0200
Make the conditions the same for VDXParser too
Change-Id: I325e1653250cf8e583a52aea9f2bf6275df9bff1
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index a64c5fc..a409b11 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -205,7 +205,7 @@ void libvisio::VDXParser::processXmlNode(xmlTextReaderPtr
reader)
tokenId = getElementToken(reader);
tokenType = xmlTextReaderNodeType(reader);
}
- while ((XML_SOLUTIONXML != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
+ while ((XML_SOLUTIONXML != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError()));
}
break;
case XML_STYLESHEET:
@@ -352,7 +352,7 @@ void libvisio::VDXParser::readLine(xmlTextReaderPtr reader)
break;
}
}
- while ((XML_LINE != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret);
+ while ((XML_LINE != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret && (!m_watcher || !m_watcher->isError()));
if (m_isInStyles)
m_collector->collectLineStyle(level, strokeWidth, colour, linePattern,
startMarker, endMarker, lineCap);
@@ -432,7 +432,7 @@ void
libvisio::VDXParser::readFillAndShadow(xmlTextReaderPtr reader)
break;
}
}
- while ((XML_FILL != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret);
+ while ((XML_FILL != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret && (!m_watcher || !m_watcher->isError()));
if (m_isInStyles)
m_collector->collectFillStyle(level, fillColourFG, fillColourBG,
fillPattern, fillFGTransparency,
@@ -472,7 +472,7 @@ void libvisio::VDXParser::readMisc(xmlTextReaderPtr reader)
break;
}
}
- while ((XML_MISC != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret);
+ while ((XML_MISC != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret && (!m_watcher || !m_watcher->isError()));
}
void libvisio::VDXParser::readXFormData(xmlTextReaderPtr reader)
@@ -531,7 +531,7 @@ void libvisio::VDXParser::readXFormData(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_XFORM != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret);
+ while ((XML_XFORM != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) &&
1 == ret && (!m_watcher || !m_watcher->isError()));
}
void libvisio::VDXParser::readTxtXForm(xmlTextReaderPtr reader)
@@ -610,7 +610,7 @@ void libvisio::VDXParser::readTxtXForm(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_TEXTXFORM != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
+ while ((XML_TEXTXFORM != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError()));
}
void libvisio::VDXParser::readXForm1D(xmlTextReaderPtr reader)
@@ -665,7 +665,7 @@ void libvisio::VDXParser::readXForm1D(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_XFORM1D != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType)
&& 1 == ret);
+ while ((XML_XFORM1D != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType)
&& 1 == ret && (!m_watcher || !m_watcher->isError()));
}
void libvisio::VDXParser::readPageProps(xmlTextReaderPtr reader)
@@ -720,7 +720,7 @@ void libvisio::VDXParser::readPageProps(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_PAGEPROPS != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
+ while ((XML_PAGEPROPS != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError()));
if (m_isStencilStarted)
{
@@ -763,7 +763,7 @@ void libvisio::VDXParser::readFonts(xmlTextReaderPtr reader)
xmlFree(id);
}
}
- while ((XML_FACENAMES != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
+ while ((XML_FACENAMES != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError()));
}
void libvisio::VDXParser::readTextBlock(xmlTextReaderPtr reader)
@@ -838,7 +838,7 @@ void libvisio::VDXParser::readTextBlock(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_TEXTBLOCK != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret);
+ while ((XML_TEXTBLOCK != tokenId || XML_READER_TYPE_END_ELEMENT !=
tokenType) && 1 == ret && (!m_watcher || !m_watcher->isError()));
if (m_isInStyles)
m_collector->collectTextBlockStyle(level, leftMargin, rightMargin,
topMargin, bottomMargin,
@@ -942,7 +942,7 @@ void libvisio::VDXParser::readForeignInfo(xmlTextReaderPtr
reader)
break;
}
}
- while ((XML_FOREIGN != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType)
&& 1 == ret);
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/dbui/mmconfigitem.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4494547e1e17cf3230b8c1a389ed1e82aa6fe32f
Author: Michael Stahl
Date: Tue Jul 21 20:43:12 2015 +0200
sw: speak slowly and clearly so MSVC2012 gets the message
Change-Id: I16ac1ec2e59940fadb53bed71a0306cebb2e8ab7
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 2a36db3..b2e4aeb 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -1039,7 +1039,7 @@ uno::Sequence
SwMailMergeConfigItem::GetSelection() const
if(!m_pImpl->xResultSet.is())
GetResultSet();
if(!m_pImpl->xResultSet.is())
-return {};
+return uno::Sequence();
m_pImpl->xResultSet->last();
sal_Int32 nResultSetSize = m_pImpl->xResultSet->getRow()+1;
std::vector vResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Gerrit: Reliability and fidelity of verification results
On Tue, 2015-07-21 at 07:18 -0500, Norbert Thiebaud wrote:
> On Tue, Jul 21, 2015 at 1:54 AM, David Ostrovsky wrote:
> > On Mon, 2015-07-13 at 16:51 -0500, Norbert Thiebaud wrote:
> >> On Mon, Jul 13, 2015 at 1:51 PM, David Ostrovsky
> >> wrote:
> >> >> And your patch 8 would have failed the same way on tb58/tb59/tb60
> >> >
> > [...]
> >
> >> The release builder have the so-called 'stale' tool chain.
> >> Just like in real-life and like other platform there is a diversity of
> >> platform and we usually do not drop
> >> support for 'older' platform unless there is an imperative motivation.
> >>
> >
> > I have another discrepancy with verification: [1].
[...]
> >
> > On patch set 8 of this change, it's issuing -Werror=return-type: [3]
> > even though the last statement is assert(false);
>
> The last statement is (void) (which is what assert resolve to in non
> debug build...
> hence the -Werror=return-type
> The run you pointed too was not a debug one:
Thanks. It was too early in the morning and I was still sleeping,
obviously.
$ gcc -Wall -c -E foo.cxx
expands to:
int bar() {
((false) ? static_cast (0) : __assert_fail ("false", "foo.cxx",
3, __PRETTY_FUNCTION__));
}
and in release mode (this time correctly) it expands to
$ gcc -Wall -DNDEBUG -c -E foo.cxx
int bar() {
(static_cast (0));
}
thus the warning is correct here and Boost 1.59 beta is broken in this
regard.
I hope we don't have other tinderboxes, that are verifying Gerrit
changes in debug mode, so that the breakage above wouldn't be catched,
do we? To catch such subtleties we should multiply verification platform
with 2:
* linux_rel
* linux_dbg
* mac_rel
* mac_dbg
* win_rel
* win_dbg
Oh, wait, in this thread we learned subtle differences between Mac clang
3.5 (Mavericks) and 3.6 (Yosemite), so that it wouldn't hurt to have:
mac_3.5
mac_3.6
and of course we (still?) support old 32 bit architecture on windows, so
we should have these too:
win_32bit
win_64bit
and all these with release|debug permutations. Quite a lot resources,
but we don't care, we should have enough resources for now, right?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDParser.cpp |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 23c914ca9e0e913ac4fde07522074f4e1f47b7ee
Author: David Tardon
Date: Tue Jul 21 21:49:14 2015 +0200
plug a leak
Change-Id: Iece1e905a696df09b75a3a90483f76c52d6396d5
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 6ce32eb..9bdb7c6 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -163,12 +163,9 @@ void libvisio::VSDParser::parseMetaData() try
delete sumaryInfo;
}
- librevenge::RVNGInputStream *docSumaryInfo =
m_container->getSubStreamByName("\005DocumentSummaryInformation");
- if (docSumaryInfo)
- {
-metaData.parse(docSumaryInfo);
-delete docSumaryInfo;
- }
+ RVNGInputStreamPtr_t
docSumaryInfo(m_container->getSubStreamByName("\005DocumentSummaryInformation"));
+ if (bool(docSumaryInfo))
+metaData.parse(docSumaryInfo.get());
m_container->seek(0, librevenge::RVNG_SEEK_SET);
metaData.parseTimes(m_container);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/ww8/pass/hang-1.doc |binary
sw/source/filter/ww8/ww8par3.cxx|5 ++---
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e2e6fa5ad5aaa20a9fa8a6d060d9edd241aefd52
Author: Caolán McNamara
Date: Tue Jul 21 17:06:05 2015 +0100
need to check for after reading and before seeking
seeking resets eof, so the IsEof is always false
after the first loop
Change-Id: I2e533f3f9c494566aabb947c05258a770e883b1f
diff --git a/sw/qa/core/data/ww8/pass/hang-1.doc
b/sw/qa/core/data/ww8/pass/hang-1.doc
new file mode 100644
index 000..8d68bbb
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 2079de6..3db3492 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1297,15 +1297,14 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
{
bOk = false;
-if (rSt.IsEof())
-break;
-
WW8LFO aLFO;
memset(&aLFO, 0, sizeof( aLFO ));
rSt.ReadUInt32( aLFO.nIdLst );
rSt.SeekRel( 8 );
rSt.ReadUChar( aLFO.nLfoLvl );
+if (!rSt.good())
+break;
rSt.SeekRel( 3 );
// soviele Overrides existieren
if ((nMaxLevel < aLFO.nLfoLvl) || rSt.GetError())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 2 commits - src/lib
src/lib/VSDParser.cpp | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 379749ebfba4dfee2b73696a62d1c87121fbfc3b
Author: David Tardon
Date: Tue Jul 21 21:59:53 2015 +0200
use shared_ptr here too
Change-Id: I82dbb50a4e75326720f30a2dab8f732e8802b7e4
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 9a9db15..827ed48 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -156,12 +156,9 @@ void libvisio::VSDParser::parseMetaData() try
return;
VSDMetaData metaData;
- librevenge::RVNGInputStream *sumaryInfo =
m_container->getSubStreamByName("\x05SummaryInformation");
- if (sumaryInfo)
- {
-metaData.parse(sumaryInfo);
-delete sumaryInfo;
- }
+ const RVNGInputStreamPtr_t
sumaryInfo(m_container->getSubStreamByName("\x05SummaryInformation"));
+ if (bool(sumaryInfo))
+metaData.parse(sumaryInfo.get());
const RVNGInputStreamPtr_t
docSumaryInfo(m_container->getSubStreamByName("\005DocumentSummaryInformation"));
if (bool(docSumaryInfo))
commit 889311ab33a0c57d5f1801044f8cd8de7d93af53
Author: David Tardon
Date: Tue Jul 21 22:00:08 2015 +0200
add const
Change-Id: Ieeef8936cce71f41bc2fbf114bc17739829152e9
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 9bdb7c6..9a9db15 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -163,7 +163,7 @@ void libvisio::VSDParser::parseMetaData() try
delete sumaryInfo;
}
- RVNGInputStreamPtr_t
docSumaryInfo(m_container->getSubStreamByName("\005DocumentSummaryInformation"));
+ const RVNGInputStreamPtr_t
docSumaryInfo(m_container->getSubStreamByName("\005DocumentSummaryInformation"));
if (bool(docSumaryInfo))
metaData.parse(docSumaryInfo.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cpp Unit- Query
2015-07-21 9:44 GMT-05:00 Bernardo Sulzbach : > This e-mail is not serious, right? > It has terrible grammar, fucked up HTML and is simply stupid. You > didn't even get the fonts (that shouldn't be specified here) right. Dude, don’t be more of an idiot. > Exactly. Do your job instead of delegating it to us. No, it’s not our job. In fact, we are not even obligated to respond to your questions (which, by the way, can be solved with a little Googling) here. This is a development list. Adolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gerrit: Reliability and fidelity of verification results
On Tue, Jul 21, 2015 at 2:40 PM, David Ostrovsky wrote: > > and all these with release|debug permutations. Quite a lot resources, > but we don't care, we should have enough resources for now, right? No, not even close. fyi: last 7 days we did 271 gerrit build, so 813 build we also did 717 tinderbox build. or about 218 build a day... (that is counting only the build under jenkins) There are tinderbox for dgb/rel of linux/mac and windows + one debug on win64 the gerrit build only do mac+linux+win on release mode and no I do not have enough resource to do more yet. As resource come online, I will try to get gerrit to switch to make check dbgutil mode instead of release If I have enough I'll add gerrit-release for platform for witch I have excess bandwidth... that is if and only if make check is reliable for each platforms. Right now the limiting factor is windows.. but I should he 2 more beefy builder soon for windows. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cpp Unit- Query
On Tue, Jul 21, 2015 at 3:15 PM, Adolfo Jayme Barrientos wrote: > 2015-07-21 9:44 GMT-05:00 Bernardo Sulzbach : >> This e-mail is not serious, right? >> It has terrible grammar, fucked up HTML and is simply stupid. You >> didn't even get the fonts (that shouldn't be specified here) right. > > Dude, don’t be more of an idiot. > >> Exactly. Do your job instead of delegating it to us. > > No, it’s not our job. In fact, we are not even obligated to respond to > your questions (which, by the way, can be solved with a little > Googling) here. This is a development list. > > Adolfo Please, both of you, stop this. for one you are talking over each other, not even responding to the right person. second, no matter how ludicrous the inquiry may sound: either it is troll in which case 'do not feed the troll' or it is just misguided/clumsy in which case feel free to ignore it. In any case it is never appropriate, here, to mock someone attempts in expressing themselves in a foreign language. We use English as a working language, as this is a pragmatic choice... but before denigrating one's fluency in English, think for a second what would be your situation if the working language was German, Chinese or Greek. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Need help with temporary files
Hi there,
I am working on a bug around saving big file in Writer:
https://bugs.documentfoundation.org/show_bug.cgi?id=88314
The problem seems to be we deflate streams in parallel and run out of memory.
I thought there are temporary files used for deflating since
f92183833fa569006602ac7e93c906d2094e0d4d but I see this:
#2 0xb73c9e13 in __GI_abort () at abort.c:90
#3 0xb73c12c7 in __assert_fail_base (fmt=0xb7509564 "%s%s%s:%u:
%s%sAssertion `%s' failed.\n%n",
assertion=assertion@entry=0xb462e257 <.L.str31> "pBuf &&
\"Possibly Reallocate failed\"",
file=file@entry=0xb462df3b <.L.str13>
"/home/matus/git/dbgutil/tools/source/stream/stream.cxx",
line=line@entry=1828,
function=function@entry=0xb462e27c
<.L__PRETTY_FUNCTION__._ZN14SvMemoryStream7PutDataEPKvm> "virtual
sal_Size SvMemoryStream::PutData(const void *, sal_Size)") at
assert.c:92
#4 0xb73c1377 in __GI___assert_fail (assertion=0xb462e257 <.L.str31>
"pBuf && \"Possibly Reallocate failed\"",
file=0xb462df3b <.L.str13>
"/home/matus/git/dbgutil/tools/source/stream/stream.cxx", line=1828,
function=0xb462e27c
<.L__PRETTY_FUNCTION__._ZN14SvMemoryStream7PutDataEPKvm> "virtual
sal_Size SvMemoryStream::PutData(const void *, sal_Size)")
at assert.c:101
#5 0xb4614d46 in SvMemoryStream::PutData (this=0x6168b908,
pData=0x61b7f5e8, nCount=0)
at /home/matus/git/dbgutil/tools/source/stream/stream.cxx:1828
#6 0xb460da7a in SvStream::Write (this=0x6168b908, pData=0x61b7f5e8,
nCount=644) at /home/matus/git/dbgutil/tools/source/stream/stream.cxx:1359
#7 0xb437b197 in OTempFileService::writeBytes (this=0x6168b8a8,
aData=uno::Sequence of length 644 = {...})
at /home/matus/git/dbgutil/unotools/source/ucbhelper/xtempfile.cxx:268
#8 0xb437b369 in non-virtual thunk to
OTempFileService::writeBytes(com::sun::star::uno::Sequence const&) ()
at /home/matus/git/dbgutil/unotools/source/ucbhelper/xtempfile.cxx:272
#9 0xab02a77e in ZipOutputEntry::doDeflate (this=0x61a7e148) at
/home/matus/git/dbgutil/package/source/zipapi/ZipOutputEntry.cxx:180
#10 0xab02a0d6 in ZipOutputEntry::closeEntry (this=0x61a7e148) at
/home/matus/git/dbgutil/package/source/zipapi/ZipOutputEntry.cxx:90
#11 0xab0833eb in deflateZipEntry (pZipEntry=0x61a7e148,
xInStream=uno::Reference to (OInputCompStream *) 0xd56a3b4)
at
/home/matus/git/dbgutil/package/source/zippackage/ZipPackageStream.cxx:456
#12 0xab08b07c in DeflateThread::doWork (this=0x61983c00) at
/home/matus/git/dbgutil/package/source/zippackage/ZipPackageStream.cxx:474
Does that mean css::io::TempFile UNO service I use in
package/source/zipapi/ZipOutputEntry.cxx provides in fact memory
stream?
OTempFileService::OTempFileService has
mpTempFile = new ::utl::TempFile;
and TempFile::GetStream has
if (!aName.isEmpty())
pStream = new SvFileStream(aName, eMode);
else
pStream = new SvMemoryStream(NULL, 0, eMode);
Should we fix that?
And/Or is there another way to get file stream?
package/ does not have many dependencies, so I would not like to
introduce some new.
Thanks,
All the best,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cpp Unit- Query
2015-07-21 15:39 GMT-05:00 Norbert Thiebaud : > for one you are talking over each other, not even responding to the > right person. How embarrassing. I apologize. > In any case it is never appropriate, here, to mock someone attempts in > expressing themselves in a foreign language. > We use English as a working language, as this is a pragmatic choice... > but before denigrating one's fluency in English, think for a second > what would be your situation if the working language was German, > Chinese or Greek. I agree with this sentiment. The only stupid situation here is trying to diminish other people’s arguments by nitpicking on language quirks; that’s someting that irritates me. Adolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_9rm.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 591238e8a4f1164adb51d3bada0cd90c3e7c655e Author: Michael Meeks Date: Tue Jul 21 22:18:09 2015 +0100 tdf#91574 - ensure we get paint events to render directx presenter console. This is an odd-one; lots of details in the bug. Change-Id: I287945eba965cc637642e9226c7fe7f2a0754130 diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 63e12b7..42c37ac 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -680,7 +680,6 @@ namespace dxcanvas mpWindow->SetControlForeground(); mpWindow->SetControlBackground(); -mpWindow->EnablePaint(sal_False); const SystemEnvData *pData = mpWindow->GetSystemData(); const HWND hwnd(reinterpret_cast(pData->hWnd)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 2 commits - include/LibreOfficeKit libreofficekit/source
Rebased ref, commits from common ancestor:
commit 61aac257c6e40a05edfe635bb0bee6ffb0c2ed61
Author: Pranav Kant
Date: Sun Jul 19 01:03:56 2015 +0530
lokdocview: Make paintTile() async
Change-Id: I57db9e3adf26996e6e1e105b8b95f53e88e7760f
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 08c8485..3f178b0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -520,7 +520,7 @@ setTilesInvalid (LOKDocView* pDocView, const GdkRectangle&
rRectangle)
for (int i = aStart.x; i < aEnd.x; i++)
for (int j = aStart.y; j < aEnd.y; j++)
-priv->m_aTileBuffer.setInvalid(i, j);
+priv->m_aTileBuffer.setInvalid(i, j, priv->m_fZoom);
}
static gboolean
@@ -741,6 +741,12 @@ renderGraphicHandle(LOKDocView* pDocView,
}
}
+static void
+renderDocumentCallback(GObject* source_object, GAsyncResult*, gpointer)
+{
+LOKDocView* pDocView = LOK_DOC_VIEW(source_object);
+gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+}
static gboolean
renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
@@ -790,7 +796,9 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
if (bPaint)
{
-Tile& currentTile = priv->m_aTileBuffer.getTile(nRow, nColumn,
priv->m_fZoom);
+GTask* task = g_task_new(pDocView, NULL,
renderDocumentCallback, NULL);
+Tile& currentTile = priv->m_aTileBuffer.getTile(nRow, nColumn,
priv->m_fZoom, task);
+
GdkPixbuf* pPixBuf = currentTile.getBuffer();
gdk_cairo_set_source_pixbuf (pCairo, pPixBuf,
twipToPixel(aTileRectangleTwips.x, priv->m_fZoom),
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx
b/libreofficekit/source/gtk/tilebuffer.cxx
index 60aa16f..d488f8b 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -27,6 +27,42 @@ float twipToPixel(float fInput, float zoom)
return fInput / 1440.0f * DPI * zoom;
}
+static void getTileFunc(GTask*, gpointer, gpointer task_data, GCancellable*)
+{
+GdkPixbuf* pPixBuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
nTileSizePixels, nTileSizePixels);
+GetTileCallbackData* pCallback =
static_cast(task_data);
+TileBuffer* buffer = pCallback->m_pBuffer;
+int index = pCallback->m_nX * buffer->m_nWidth + pCallback->m_nY;
+if (!pPixBuf)
+{
+g_info ("Error allocating memory to pixbuf");
+return;
+}
+
+unsigned char* pBuffer = gdk_pixbuf_get_pixels(pPixBuf);
+GdkRectangle aTileRectangle;
+aTileRectangle.x = pixelToTwip(nTileSizePixels, pCallback->m_fZoom) *
pCallback->m_nY;
+aTileRectangle.y = pixelToTwip(nTileSizePixels, pCallback->m_fZoom) *
pCallback->m_nX;
+
+g_test_timer_start();
+buffer->m_pLOKDocument->pClass->paintTile(buffer->m_pLOKDocument,
+ pBuffer,
+ nTileSizePixels, nTileSizePixels,
+ aTileRectangle.x, aTileRectangle.y,
+ pixelToTwip(nTileSizePixels,
pCallback->m_fZoom),
+ pixelToTwip(nTileSizePixels,
pCallback->m_fZoom));
+
+double elapsedTime = g_test_timer_elapsed();
+g_info ("Rendered (%d, %d) in %f seconds",
+pCallback->m_nX,
+pCallback->m_nY,
+elapsedTime);
+
+//create a mapping for it
+buffer->m_mTiles[index].setPixbuf(pPixBuf);
+buffer->m_mTiles[index].valid = true;
+}
+
/*
Tile class member functions
@@ -56,55 +92,42 @@ void TileBuffer::resetAllTiles()
std::map::iterator it = m_mTiles.begin();
for (; it != m_mTiles.end(); ++it)
{
-it->second.release();
+it->second.valid = false;
}
-m_mTiles.clear();
}
-void TileBuffer::setInvalid(int x, int y)
+void TileBuffer::setInvalid(int x, int y, float fZoom)
{
int index = x * m_nWidth + y;
g_info("Setting tile invalid (%d, %d)", x, y);
if (m_mTiles.find(index) != m_mTiles.end())
{
m_mTiles[index].valid = false;
-m_mTiles[index].release();
-m_mTiles.erase(index);
+GTask* task = g_task_new(this, NULL, NULL, NULL);
+GetTileCallbackData* pCallback = new GetTileCallbackData(x, y, fZoom,
this);
+g_task_set_task_data(task, pCallback, g_free);
+g_task_run_in_thread(task, getTileFunc);
}
}
-Tile& TileBuffer::getTile(int x, int y, float aZoom)
+Tile& TileBuffer::getTile(int x, int y, float aZoom, GTask* task)
{
int index = x * m_nWidth + y;
-if(m_mTiles.find(index) == m_mTiles.end() || !m_mTiles[index].valid)
-{
-GdkPixbuf* pPixBuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
nTileSizePixels, nTileSizePixels);
-if (!pP
Re: Writer: draft layout and hide whitespace [long]
On Tue, Jul 21, 2015 at 4:38 AM, Miklos Vajna wrote: > Hi, > > I think as long as the hide whitespace option is a new UI option and > it's disabled by default, it's rather non-controversal. Please push to > gerrit to get code review. :-) > Thanks Miklos. Done: https://gerrit.libreoffice.org/#/c/17278 4 commits to make review easier, although the changeset isn't huge. Thanks for reviewers in advance! > > Thanks, > > Miklos > > ___ > 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: 2 commits - external/bzip2 onlineupdate/Executable_mar.mk onlineupdate/Executable_updater.mk onlineupdate/source RepositoryExternal.mk
RepositoryExternal.mk |8
external/bzip2/ExternalProject_bzip2.mk | 30
external/bzip2/Makefile | 14
external/bzip2/Module_bzip2.mk| 17
external/bzip2/README |1
external/bzip2/UnpackedTarball_bzip2.mk | 24
onlineupdate/Executable_mar.mk|7
onlineupdate/Executable_updater.mk| 41
onlineupdate/source/libmar/inc/mozilla/Attributes.h |2
onlineupdate/source/libmar/sign/mar_sign.c|4
onlineupdate/source/libmar/sign/nss_secutil.c |6
onlineupdate/source/libmar/src/mar.h |2
onlineupdate/source/libmar/src/mar_create.c |2
onlineupdate/source/libmar/src/mar_extract.c |8
onlineupdate/source/libmar/src/mar_private.h |2
onlineupdate/source/libmar/src/mar_read.c |4
onlineupdate/source/libmar/tool/mar.c | 30
onlineupdate/source/libmar/verify/cryptox.c |4
onlineupdate/source/libmar/verify/cryptox.h |4
onlineupdate/source/libmar/verify/mar_verify.c|5
onlineupdate/source/update/common/readstrings.h |1
onlineupdate/source/update/common/updatehelper.cxx|1
onlineupdate/source/update/common/updatelogging.cxx |8
onlineupdate/source/update/inc/mozilla/Attributes.h |2
onlineupdate/source/update/inc/mozilla/Char16.h | 239
+++
onlineupdate/source/update/inc/mozilla/Move.h | 238
+++
onlineupdate/source/update/inc/mozilla/Pair.h | 219
+++
onlineupdate/source/update/inc/mozilla/UniquePtr.h| 659
+
onlineupdate/source/update/inc/nsAutoRef.h| 670
++
onlineupdate/source/update/inc/nsWindowsHelpers.h | 159 ++
onlineupdate/source/update/src/mar.h |2
onlineupdate/source/update/src/mar_create.c |2
onlineupdate/source/update/src/mar_extract.c |8
onlineupdate/source/update/src/mar_private.h |2
onlineupdate/source/update/src/mar_read.c |4
onlineupdate/source/update/updater/archivereader.cxx |1
onlineupdate/source/update/updater/loaddlls.cxx |3
onlineupdate/source/update/updater/nsWindowsRestart.cxx | 584
onlineupdate/source/update/updater/progressui_gtk.cxx |4
onlineupdate/source/update/updater/progressui_win.cxx |3
onlineupdate/source/update/updater/updater.cxx| 24
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx | 19
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h | 14
43 files changed, 2997 insertions(+), 84 deletions(-)
New commits:
commit 8be5ec39051cc0eb70ec9882a45a95c661f7398f
Author: Jan Holesovsky
Date: Wed Jul 22 07:17:23 2015 +0200
online update: Fix many warnings.
Not all yet, though.
Change-Id: Ic4f0fe3ded31d585faefd8bda8ab87f54b88dc6c
diff --git a/onlineupdate/source/libmar/inc/mozilla/Attributes.h
b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
index b34e7d5..4d38632 100644
--- a/onlineupdate/source/libmar/inc/mozilla/Attributes.h
+++ b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
@@ -83,7 +83,7 @@
#define MOZ_HAVE_NORETURN__attribute__((noreturn))
# endif
#elif defined(__GNUC__)
-# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
+# if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) &&
__cplusplus >= 201103L)
#define MOZ_HAVE_CXX11_CONSTEXPR
#if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
# define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c
b/onlineupdate/source/libmar/sign/nss_secutil.c
index caa124e..ac8954c 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -66,6 +66,8 @@ GetPasswordString(void *arg, char *prompt)
char phrase[200] = {'\0'};
int isInputTerminal = isatty(fileno(stdin));
+ (void) arg; (void) prompt; // avoid warnings
+
#ifndef _WINDOWS
if (isInputTerminal) {
input = fopen(consoleName, "r");
diff --git a/onlineupdate/source/libmar/src/m
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - extras/source
extras/source/autocorr/lang/sl/DocumentList.xml | 1149 1 file changed, 1149 insertions(+) New commits: commit 10f7980f27cde9d912744ab4ddabc51f7a273eb1 Author: László Németh Date: Tue Jul 21 02:19:13 2015 +0200 add Slovenian Emoji shortcodes As a po file, Slovenian translation was in git in time, but not in the requested AutoCorrect XML. Change-Id: I6387ff6388963c1f020c7a82e721fd103153bbea Reviewed-on: https://gerrit.libreoffice.org/17247 Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Martin Srebotnjak Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/extras/source/autocorr/lang/sl/DocumentList.xml b/extras/source/autocorr/lang/sl/DocumentList.xml index 9762f37..1466fdf 100644 --- a/extras/source/autocorr/lang/sl/DocumentList.xml +++ b/extras/source/autocorr/lang/sl/DocumentList.xml @@ -449,4 +449,1153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-online-update' - 1823 commits - accessibility/inc accessibility/source android/Bootstrap animations/source avmedia/Library_avmediavlc.mk avmedia/
Rebased ref, commits from common ancestor:
commit 8be5ec39051cc0eb70ec9882a45a95c661f7398f
Author: Jan Holesovsky
Date: Wed Jul 22 07:17:23 2015 +0200
online update: Fix many warnings.
Not all yet, though.
Change-Id: Ic4f0fe3ded31d585faefd8bda8ab87f54b88dc6c
diff --git a/onlineupdate/source/libmar/inc/mozilla/Attributes.h
b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
index b34e7d5..4d38632 100644
--- a/onlineupdate/source/libmar/inc/mozilla/Attributes.h
+++ b/onlineupdate/source/libmar/inc/mozilla/Attributes.h
@@ -83,7 +83,7 @@
#define MOZ_HAVE_NORETURN__attribute__((noreturn))
# endif
#elif defined(__GNUC__)
-# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
+# if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) &&
__cplusplus >= 201103L)
#define MOZ_HAVE_CXX11_CONSTEXPR
#if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
# define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c
b/onlineupdate/source/libmar/sign/nss_secutil.c
index caa124e..ac8954c 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -66,6 +66,8 @@ GetPasswordString(void *arg, char *prompt)
char phrase[200] = {'\0'};
int isInputTerminal = isatty(fileno(stdin));
+ (void) arg; (void) prompt; // avoid warnings
+
#ifndef _WINDOWS
if (isInputTerminal) {
input = fopen(consoleName, "r");
diff --git a/onlineupdate/source/libmar/src/mar_extract.c
b/onlineupdate/source/libmar/src/mar_extract.c
index f3512e9..af22766 100644
--- a/onlineupdate/source/libmar/src/mar_extract.c
+++ b/onlineupdate/source/libmar/src/mar_extract.c
@@ -40,6 +40,8 @@ static int mar_test_callback(MarFile *mar, const MarItem
*item, void *unused) {
char buf[BLOCKSIZE];
int fd, len, offset = 0;
+ (void) unused; // avoid warnings
+
if (mar_ensure_parent_dir(item->name))
return -1;
diff --git a/onlineupdate/source/libmar/tool/mar.c
b/onlineupdate/source/libmar/tool/mar.c
index 9a961ae..d14690f 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -35,12 +35,12 @@ int mar_repackage_and_sign(const char *NSSConfigDir,
const char *src,
const char * dest);
-static void print_version() {
+static void print_version(void) {
printf("Version: %s\n", MOZ_APP_VERSION);
printf("Default Channel ID: %s\n", MAR_CHANNEL_ID);
}
-static void print_usage() {
+static void print_usage(void) {
printf("usage:\n");
printf("Create a MAR file:\n");
printf(" mar [-H MARChannelID] [-V ProductVersion] [-C workingDir] "
@@ -99,6 +99,8 @@ static void print_usage() {
static int mar_test_callback(MarFile *mar,
const MarItem *item,
void *unused) {
+ (void) mar; (void) unused; // avoid warnings
+
printf("%u\t0%o\t%s\n", item->length, item->flags, item->name);
return 0;
}
diff --git a/onlineupdate/source/libmar/verify/cryptox.h
b/onlineupdate/source/libmar/verify/cryptox.h
index 8b92681..acecae6 100644
--- a/onlineupdate/source/libmar/verify/cryptox.h
+++ b/onlineupdate/source/libmar/verify/cryptox.h
@@ -57,7 +57,7 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx ,
#define CryptoX_FreeCertificate(cert) \
CERT_DestroyCertificate(*cert)
-#elif MACOSX
+#elif defined(MACOSX)
#define CryptoX_InvalidHandleValue NULL
#define CryptoX_ProviderHandle void*
diff --git a/onlineupdate/source/libmar/verify/mar_verify.c
b/onlineupdate/source/libmar/verify/mar_verify.c
index 954fbbb..c9f715a 100644
--- a/onlineupdate/source/libmar/verify/mar_verify.c
+++ b/onlineupdate/source/libmar/verify/mar_verify.c
@@ -194,7 +194,6 @@ mar_extract_and_verify_signatures_fp(FILE *fp,
CryptoX_ProviderHandle provider,
CryptoX_PublicKey *keys,
uint32_t keyCount) {
- char buf[5] = {0};
uint32_t signatureCount, signatureLen, numVerified = 0;
uint32_t signatureAlgorithmIDs[MAX_SIGNATURES];
int rv = -1;
@@ -346,6 +345,8 @@ mar_verify_signatures_for_fp(FILE *fp,
uint32_t i;
int rv = CryptoX_Error;
+ (void) provider; (void) keys; // avoid warnings
+
memset(signatureHandles, 0, sizeof(signatureHandles));
memset(signatureLengths, 0, sizeof(signatureLengths));
diff --git a/onlineupdate/source/update/common/updatelogging.cxx
b/onlineupdate/source/update/common/updatelogging.cxx
index 9ed8f3e..4044e26 100644
--- a/onlineupdate/source/update/common/updatelogging.cxx
+++ b/onlineupdate/source/update/common/updatelogging.cxx
@@ -18,7 +18,7 @@ UpdateLog::UpdateLog() : logFP(nullptr)
{
}
-void UpdateLog::Init(NS_tchar* sourcePath,
+void UpdateLog::Init(NS_tchar* sourcePathParam,
const NS_tchar* fileName,
const NS_tchar* alternateFileN
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 13 ++-
sfx2/source/dialog/templdlg.cxx| 23 +
2 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit 5e42fa59ff1e4f46c05b1c438dd3757dbb7a14d6
Author: Tomaž Vajngerl
Date: Tue Jul 14 14:19:23 2015 +0900
tdf#91495 add property to turn off stlye previews
Newly added property Office::Common::StylesAndFormatting::Preview
can now be used to turn off "Style And Formatting" style preview.
Change-Id: I2e01de2a74e2d295557c87022a7b745ce23b4800
(cherry picked from commit 210f42a318cbac62de835ccacbc1fc0e36f713f6)
Reviewed-on: https://gerrit.libreoffice.org/17179
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-by: Eike Rathke
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6f0dcb7..730c712 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2162,7 +2162,7 @@
Specifies whether to generate a thumbnail image and place it
inside the
- the odf archive file, which makes it possible to see a preview of
the document.
+the odf archive file, which makes it possible to see a preview of
the document.
Store a preview of this document
true
@@ -6626,5 +6626,16 @@
+
+
+Contains settings for Styles and Formatting.
+
+
+
+ Specifies if the styles and formatting preview is
enabled.
+
+true
+
+
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 722b6c8..d99a5e4 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
@@ -526,8 +527,11 @@
StyleTreeListBox_Impl::StyleTreeListBox_Impl(SfxCommonTemplateDialog_Impl* pPare
void StyleTreeListBox_Impl::Recalc()
{
-SetEntryHeight(32 * GetDPIScaleFactor());
-RecalcViewData();
+if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
+{
+SetEntryHeight(32 * GetDPIScaleFactor());
+RecalcViewData();
+}
}
/** Internal structure for the establishment of the hierarchical view */
@@ -638,9 +642,11 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
{
SvTreeListEntry* pTreeListEntry = pBox->InsertEntry(pEntry->getName(),
pParent);
-StyleLBoxString* pStyleLBoxString = new StyleLBoxString(pTreeListEntry, 0,
pEntry->getName(), eStyleFamily);
-
-pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
+if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
+{
+StyleLBoxString* pStyleLBoxString = new
StyleLBoxString(pTreeListEntry, 0, pEntry->getName(), eStyleFamily);
+pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
+}
pBox->GetModel()->InvalidateEntry(pTreeListEntry);
@@ -1242,8 +1248,11 @@ void
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
for(nPos = 0; nPos < nCount; ++nPos)
{
SvTreeListEntry* pTreeListEntry =
aFmtLb->InsertEntry(aStrings[nPos], 0, false, nPos);
-StyleLBoxString* pStyleLBoxString = new
StyleLBoxString(pTreeListEntry, 0, aStrings[nPos], eFam);
-pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
+if
(officecfg::Office::Common::StylesAndFormatting::Preview::get())
+{
+StyleLBoxString* pStyleLBoxString = new
StyleLBoxString(pTreeListEntry, 0, aStrings[nPos], eFam);
+pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
+}
aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry);
}
aFmtLb->Recalc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - sfx2/source
sfx2/source/dialog/templdlg.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8e957ae85f3cd9a6805296702bae41d30e6f0cef
Author: Tomaž Vajngerl
Date: Sat Jul 18 17:18:25 2015 +0900
tdf#91495 don't change tree entry height when preview is disabled
Change-Id: Ic707f4407bb3aef5f2a7b9d13a0340c6d9afb3fe
(cherry picked from commit 9f75bad228ca1f410b7a450084b02ad13745110e)
Reviewed-on: https://gerrit.libreoffice.org/17180
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-by: Eike Rathke
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d99a5e4..ad73163 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -330,8 +330,11 @@
SfxActionListBox::SfxActionListBox(SfxCommonTemplateDialog_Impl* pParent, WinBit
void SfxActionListBox::Recalc()
{
-SetEntryHeight(32 * GetDPIScaleFactor());
-RecalcViewData();
+if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
+{
+SetEntryHeight(32 * GetDPIScaleFactor());
+RecalcViewData();
+}
}
PopupMenu* SfxActionListBox::CreateContextMenu()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/makefile.mk | 147 1 file changed, 147 deletions(-) New commits: commit 74d4168f8830f7bbec6b784c3fb774296d9adafa Author: David Tardon Date: Tue Jul 21 15:25:17 2015 +0200 drop old makefile Change-Id: Ifdc1b8e561e69947b1458aca691cb974071715b5 diff --git a/vcl/workben/makefile.mk b/vcl/workben/makefile.mk deleted file mode 100644 index 2a562c2..000 --- a/vcl/workben/makefile.mk +++ /dev/null @@ -1,147 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=vcl -TARGET=svdem -LIBTARGET=NO -TARGETTYPE=GUI - -ENABLE_EXCEPTIONS=TRUE - -my_components = i18npool i18nsearch - -# --- Settings - - -.INCLUDE : settings.mk - -# --- Files - -OBJFILES= \ -$(OBJ)$/svdem.obj \ -$(OBJ)$/vcldemo.obj \ -$(OBJ)$/outdevgrind.obj - -# --- Targets -- - -.IF "$(OS)" == "IOS" -CFLAGS += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -.ENDIF - -# svdem - -APP1NOSAL= TRUE -APP1TARGET=$(TARGET) -APP1OBJS= \ -$(OBJ)$/svdem.obj - -APP1STDLIBS= $(CPPULIB) \ -$(UNOTOOLSLIB) \ -$(CPPUHELPERLIB) \ -$(COMPHELPERLIB) \ -$(TOOLSLIB)\ -$(SALLIB) \ -$(SOTLIB) \ -$(VCLLIB) - -# outdevgrind - -APP2TARGET= outdevgrind -APP2OBJS= \ -$(OBJ)$/outdevgrind.obj - -APP2NOSAL= TRUE -APP2STDLIBS=$(TOOLSLIB)\ -vclmain.lib \ -$(COMPHELPERLIB) \ -$(CPPULIB) \ -$(CPPUHELPERLIB) \ -$(UCBHELPERLIB)\ -$(SALLIB) \ -$(VCLLIB) - -# vcldemo - -APP3NOSAL=TRUE -APP3TARGET=vcldemo -APP3OBJS= \ -$(OBJ)$/vcldemo.obj - -APP3STDLIBS= $(CPPULIB) \ -$(UNOTOOLSLIB) \ -$(CPPUHELPERLIB) \ -$(COMPHELPERLIB) \ -$(TOOLSLIB)\ -$(SALLIB) \ -$(SOTLIB) \ -$(VCLLIB) - - -# --- Targets -- -.IF "$(GUIBASE)" == "unx" - -APP4NOSAL= TRUE -APP4TARGET= svptest -APP4OBJS= $(OBJ)$/svptest.obj - -APP4STDLIBS=$(CPPULIB) \ -$(CPPUHELPERLIB)\ -$(COMPHELPERLIB)\ -$(VCLLIB) \ -$(TOOLSLIB) \ -$(SALLIB) \ -$(SOTLIB) \ -$(VCLLIB) - -APP5NOSAL= TRUE -APP5TARGET= svpclient -APP5OBJS= $(OBJ)$/svpclient.obj - -APP5STDLIBS=$(CPPULIB) \ -$(CPPUHELPERLIB)\ -$(COMPHELPERLIB)\ -$(UCBHELPERLIB)\ -$(VCLLIB) \ -$(TOOLSLIB) \ -$(SALLIB) \ -$(SOTLIB) \ -$(VCLLIB) - -.IF "$(OS)" == "SOLARIS" -APP5STDLIBS+=-lsocket -.ENDIF - -.ENDIF - -.INCLUDE : target.mk - -ALLTAR : $(BIN)/applicat.rdb $(BIN)/types.rdb - -$(BIN)/applicat.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ -$(MISC)/applicat.input $(my_components:^"$(SOLARXMLDIR)/":+".component") -$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ -$(SOLARENV)/bin/packcomponents.xslt $(MISC)/applicat.input - -$(MISC)/applicat.input : -
