LibreOffice Gerrit News 2013-06-25
Moin! * Open changes on master for project core changed in the last 25 hours: + coverity #982634 and 5 other : Intentional fallthrough in cases in https://gerrit.libreoffice.org/4498 from Norbert Thiebaud + coverity : #984128 and 21 others : Uninitialized scalar field in https://gerrit.libreoffice.org/4497 from Norbert Thiebaud + Finishing touch on Drop Caps widget UI conversion. in https://gerrit.libreoffice.org/4415 from Olivier Hallot + Always embed 14 standard Postscript fonts in PDF in https://gerrit.libreoffice.org/4495 from Khaled Hosny + fdo#55853 - improve parsing of concatenated numbers and identifiers. in https://gerrit.libreoffice.org/4494 from Frédéric Wang + ParaPropertyPanel: Sidebar conversion to .ui in https://gerrit.libreoffice.org/4364 from Prashant Pandey + fdo65400: fix for Character Shading being lost in https://gerrit.libreoffice.org/4452 from Adam CloudOn + AreaPropertyPanel: sidebar conversion to .ui in https://gerrit.libreoffice.org/4402 from Prashant Pandey + credits: add back developers not committing code since 2010-09-28 in https://gerrit.libreoffice.org/4474 from Christian Lohmaier + replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann * Merged changes on master for project core changed in the last 25 hours: + Replace more characters functions with rtl/character.hxx in https://gerrit.libreoffice.org/4447 from Arnaud Versini + fdo#43460 framework,i18npool,accessibility: use isEmpty() in https://gerrit.libreoffice.org/4443 from Jelle van der Waa + fdo#43460 sd,rsc,ucb,sdext: use isEmpty() in https://gerrit.libreoffice.org/4442 from Jelle van der Waa + coverity#706154 : Destination buffer too small in https://gerrit.libreoffice.org/4410 from Norbert Thiebaud + fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer in https://gerrit.libreoffice.org/4051 from Akash Shetye + fdo#43460 svl: use isEmpty() in https://gerrit.libreoffice.org/4441 from Jelle van der Waa + fdo#65541: Proper EPM %requires dependencies, at least for Linux in https://gerrit.libreoffice.org/4344 from Stephan Bergmann + coverity#705766 Resource leak in https://gerrit.libreoffice.org/4409 from Norbert Thiebaud + coverity#705765: Resource leak in https://gerrit.libreoffice.org/4408 from Norbert Thiebaud + Robustify GraphicDescriptor::ImpDetect* reading SvStream. in https://gerrit.libreoffice.org/4469 from Mark Wielaard + Fix memory leak in SwTOXBaseSection::GenerateText. in https://gerrit.libreoffice.org/4470 from Mark Wielaard + fdo#56679, fdo#65710 : fix for import and export of underline color in https://gerrit.libreoffice.org/4459 from Adam CloudOn + fdo#43460 shell,vcl,xmlreader: use isEmpty() in https://gerrit.libreoffice.org/ from Jelle van der Waa + Add another fallback-path for wilangid.vbs in https://gerrit.libreoffice.org/4468 from Christian Lohmaier * Abandoned changes on master for project core changed in the last 25 hours: + fdo#39468 - translate German comments in https://gerrit.libreoffice.org/4079 from Thomas Arnhold + fix compilation error when compiling static libs with release optimizatio in https://gerrit.libreoffice.org/4453 from Tsahi Glik @ CloudOn + Resolved bug fdo#63766 in https://gerrit.libreoffice.org/3524 from gokul s * Open changes needing tweaks, but being untouched for more than a week: + fdo#43460 sc: use isEmpty() in https://gerrit.libreoffice.org/4316 from Jelle van der Waa + solve fdo#54819 in https://gerrit.libreoffice.org/3583 from Maxime de Roucy Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: LibreOffice Gerrit News 2013-06-25
Title: 인증페이지시안1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/window/salframeview.mm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 67d28a26bc43fcf7e7455c006684d4282be5d560 Author: Tor Lillqvist t...@iki.fi Date: Tue Jun 18 18:12:09 2013 +0300 fdo#63547: Fix wheel/trackpad scrolling on OS X: Single char copy/paste error Change-Id: I06faa28c25e976d0c9e072858cbe37093a61d38d (cherry picked from commit 72703332ff42a70d19050d78a63286b9a9b6f930) Reviewed-on: https://gerrit.libreoffice.org/4499 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 5567260..6a53201 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -840,7 +840,7 @@ private: if( aEvent.mnDelta == 0 ) aEvent.mnDelta = aEvent.mnNotchDelta; aEvent.mbHorz = TRUE; -aEvent.mnScrollLines = dY 0 ? dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR; +aEvent.mnScrollLines = dX 0 ? dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR; if( aEvent.mnScrollLines == 0 ) aEvent.mnScrollLines = 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fernanda Lima fala sobre o novo KIT
Novo KIT sexual é a sensação do momento! Fernanda Lima fala sobre o KIT que está revolucionando o meio sexual, conhecido por resolver os mais variados problemas sexuais. Este KIT está provando que veio para ficar, destaque nos programas Papo Calcinha (MultiShow) e Sem Vergonha (MTV), e está fazendo a cabeça de homens e mulheres, tanto que o jogador Marcos prometeu testar o produto e voltar ao programa Amor e Sexo para relatar suas experiências. Veja a matéria especial sobre este novo KIT no blog oficial do programa: www.amoresexonarede.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: configure.ac src/lib
configure.ac |7 +
src/lib/libvisio_utils.cpp | 54 -
2 files changed, 16 insertions(+), 45 deletions(-)
New commits:
commit b7b4e9cad38aaeb1fb5f27d1bdb6875f9c2661bc
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jun 25 09:37:35 2013 +0200
Use boost for base64 decoding
diff --git a/configure.ac b/configure.ac
index 4cf1ac2..50de8ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,12 @@ AC_SUBST(ZLIB_LIBS)
# ===
AC_CHECK_HEADERS(
- boost/algorithm/string.hpp boost/optional.hpp
boost/spirit/include/classic.hpp,
+ boost/algorithm/string.hpp \
+ boost/optional.hpp \
+ boost/spirit/include/classic.hpp \
+ boost/archive/iterators/binary_from_base64.hpp \
+ boost/archive/iterators/remove_whitespace.hpp \
+ boost/archive/iterators/transform_width.hpp,
[],
[AC_MSG_ERROR(Required boost headers not found. install boost = 1.36)],
[]
diff --git a/src/lib/libvisio_utils.cpp b/src/lib/libvisio_utils.cpp
index 48ae1e7..42e2adc 100644
--- a/src/lib/libvisio_utils.cpp
+++ b/src/lib/libvisio_utils.cpp
@@ -32,7 +32,9 @@
#include VSDInternalStream.h
#include libvisio_utils.h
-#define VSD_NUM_ELEMENTS(array) sizeof(array)/sizeof(array[0])
+#include boost/archive/iterators/binary_from_base64.hpp
+#include boost/archive/iterators/remove_whitespace.hpp
+#include boost/archive/iterators/transform_width.hpp
uint8_t libvisio::readU8(WPXInputStream *input)
{
@@ -123,51 +125,15 @@ double libvisio::readDouble(WPXInputStream *input)
void libvisio::appendFromBase64(WPXBinaryData data, const unsigned char
*base64String, size_t base64StringLength)
{
- static const std::string base64Chars =
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
-abcdefghijklmnopqrstuvwxyz
-0123456789+/;
+ typedef boost::archive::iterators::transform_width
+ boost::archive::iterators::binary_from_base64
+ boost::archive::iterators::remove_whitespace const char * , 8, 6
base64_decoder;
+ std::vectorunsigned char buffer;
+ std::copy(base64_decoder(base64String), base64_decoder(base64String +
base64StringLength), std::back_inserter(buffer));
- VSDInternalStream tmpStream(base64String, base64StringLength);
-
- unsigned i = 0;
- char tmpCharsToDecode[4];
- while (!tmpStream.atEOS())
- {
-const char tmpChar = (char)readU8(tmpStream);
-if (std::string::npos == base64Chars.find(tmpChar) (tmpChar != '='))
- continue;
-if (tmpChar == '=')
- break;
-tmpCharsToDecode[i++] = tmpChar;
-i %= 4;
-if (!i)
-{
- for (unsigned k = 0; k 4; k++)
-tmpCharsToDecode[k] = base64Chars.find(tmpCharsToDecode[k]);
-
- data.append((unsigned char)((tmpCharsToDecode[0] 2) |
((tmpCharsToDecode[1] 0x30) 4)));
- data.append((unsigned char)(((tmpCharsToDecode[1] 0xf) 4) |
((tmpCharsToDecode[2] 0x3c) 2)));
- data.append((unsigned char)(((tmpCharsToDecode[2] 0x3) 6) |
tmpCharsToDecode[3]));
-}
- }
-
- if (i)
- {
-for (unsigned j = i; j 4; j++)
- tmpCharsToDecode[j] = 0;
-for (unsigned k = 0; k 4; k++)
- tmpCharsToDecode[k] = base64Chars.find(tmpCharsToDecode[k]);
-
-data.append((unsigned char)((tmpCharsToDecode[0] 2) |
((tmpCharsToDecode[1] 0x30) 4)));
-if (i 1)
-{
- data.append((unsigned char)(((tmpCharsToDecode[1] 0xf) 4) |
((tmpCharsToDecode[2] 0x3c) 2)));
- if (i 2)
-data.append((unsigned char)(((tmpCharsToDecode[2] 0x3) 6) |
tmpCharsToDecode[3]));
-}
- }
+ if (!buffer.empty())
+data.append(buffer[0], buffer.size());
}
const ::WPXString libvisio::getColourString(const Colour c)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC]Use Widget Layout for the Start Center Weekly Update 01
Hi all! Last week I have: - Created a basic .ui file for the Start Center, and added it to the build system. - Started to mess with the code for the Start Center. Since the class behind it, BackingWindow is inheriting from Window, and VclBuilder doesn't support this, I had to make BackingWindow also inherit from VclBuilderContainer (as suggested by Caolan) and this seems to be working, but I'm still trying to figure out why the actual buttons aren't drawing. - Noticed that for some reason the dtor of Window seems to get called twice when BackingWindow gets destroyed, I'm still trying to figure out why. All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source include/editeng offapi/com offapi/UnoApi_offapi.mk sw/inc sw/qa sw/source writerfilter/source
editeng/source/items/frmitems.cxx | 133
include/editeng/brushitem.hxx |3
include/editeng/memberids.hrc |1
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/drawing/ShadingPattern.idl| 225 +
offapi/com/sun/star/style/CharacterProperties.idl |5
sw/inc/unoprnms.hxx |4
sw/qa/extras/ooxmlexport/data/fdo65400.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/core/unocore/unomap.cxx |3
sw/source/core/unocore/unoprnms.cxx |3
sw/source/filter/ww8/docxattributeoutput.cxx | 21 +-
sw/source/filter/ww8/ww8par6.cxx | 135 ++--
writerfilter/source/dmapper/CellColorHandler.cxx | 230 ++
writerfilter/source/dmapper/CellColorHandler.hxx |2
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
writerfilter/source/ooxml/model.xml | 32 +--
18 files changed, 601 insertions(+), 212 deletions(-)
New commits:
commit 26d40686128e70916a636e20f5ccc5763bbb6cc8
Author: Adam Co rattles2...@gmail.com
Date: Sun Jun 23 10:49:28 2013 +0300
fdo65400: fix for Character Shading being lost
This bug fixes the DOCX import and export filters, adds a new property
to the document model and updates the UNO API.
There is no need to add layout \ UI updates, because in Word
the only way to turn this on\off is using a simple button,
and there is no way to control the shading color itself.
However, ODF import \ export filters should be updated in a future
commit.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I1d34cec79289e38c08e42a4c6265d998e1edfdef
Reviewed-on: https://gerrit.libreoffice.org/4452
Reviewed-by: Miklos Vajna vmik...@suse.cz
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 566a375..8dedafd 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -41,6 +41,7 @@
#include com/sun/star/awt/Size.hpp
#include com/sun/star/text/WritingMode2.hpp
#include com/sun/star/frame/status/UpperLowerMarginScale.hpp
+#include com/sun/star/drawing/ShadingPattern.hpp
#include unotools/ucbstreamhelper.hxx
#include limits.h
@@ -79,6 +80,7 @@
using namespace ::editeng;
using namespace ::rtl;
using namespace ::com::sun::star;
+using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::table::BorderLineStyle;
@@ -3322,12 +3324,13 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich ),
-aColor ( COL_TRANSPARENT ),
-pImpl ( new SvxBrushItem_Impl( 0 ) ),
-pStrLink( NULL ),
-pStrFilter ( NULL ),
-eGraphicPos ( GPOS_NONE ),
-bLoadAgain ( sal_True )
+aColor ( COL_TRANSPARENT ),
+nShadingValue( ShadingPattern::CLEAR ),
+pImpl( new SvxBrushItem_Impl( 0 ) ),
+pStrLink ( NULL ),
+pStrFilter ( NULL ),
+eGraphicPos ( GPOS_NONE ),
+bLoadAgain ( sal_True )
{
}
@@ -3338,12 +3341,13 @@ SvxBrushItem::SvxBrushItem( const Color rColor,
sal_uInt16 _nWhich) :
SfxPoolItem( _nWhich ),
-aColor ( rColor ),
-pImpl ( new SvxBrushItem_Impl( 0 ) ),
-pStrLink( NULL ),
-pStrFilter ( NULL ),
-eGraphicPos ( GPOS_NONE ),
-bLoadAgain ( sal_True )
+aColor( rColor ),
+nShadingValue ( ShadingPattern::CLEAR ),
+pImpl ( new SvxBrushItem_Impl( 0 ) ),
+pStrLink ( NULL ),
+pStrFilter( NULL ),
+eGraphicPos ( GPOS_NONE ),
+bLoadAgain( sal_True )
{
}
@@ -3355,12 +3359,13 @@ SvxBrushItem::SvxBrushItem( const Graphic rGraphic,
SvxGraphicPosition ePos,
SfxPoolItem( _nWhich ),
-aColor ( COL_TRANSPARENT ),
-pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphic ) ) ),
-pStrLink( NULL ),
-pStrFilter ( NULL ),
-eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ),
-bLoadAgain ( sal_True )
+aColor( COL_TRANSPARENT ),
+nShadingValue ( ShadingPattern::CLEAR ),
+pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphic ) )
),
+pStrLink ( NULL ),
+pStrFilter( NULL ),
+eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ),
+bLoadAgain( sal_True )
{
DBG_ASSERT( GPOS_NONE != ePos, SvxBrushItem-Ctor with GPOS_NONE == ePos
);
@@ -3373,12 +3378,13 @@ SvxBrushItem::SvxBrushItem( const GraphicObject
rGraphicObj,
SfxPoolItem( _nWhich ),
-aColor ( COL_TRANSPARENT ),
-pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphicObj ) ) ),
-pStrLink( NULL ),
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/filter/ww8/ww8scan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 87ed59d2b1261bd2e42c58c9a4663e19b8ec13a9
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jun 25 07:16:46 2013 +
WW8 import: adjust validation check for PLCF position arrays
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 010a36d..6db4cf6 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -943,7 +943,7 @@ namespace {
WW8_CP nValue = 0;
for ( sal_Int32 i = 0; i = nMaxIndex; ++i )
{
-if ( pPLCFPosArray[i] nValue )
+if ( pPLCFPosArray[i] != 0 pPLCFPosArray[i] nValue )
{
bIsValid = false;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - boost/boost_1_44_0-gcc4.8.patch sdext/source sd/source
boost/boost_1_44_0-gcc4.8.patch | 117 +++
sd/source/ui/framework/tools/FrameworkHelper.cxx |1
sdext/source/pdfimport/pdfparse/pdfentries.cxx |4
3 files changed, 119 insertions(+), 3 deletions(-)
New commits:
commit 59eee3c0a492e05c47e85cb53eeb25ad6bf0322a
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 25 09:21:47 2013 +0100
coverity#1019312 check inflateInit return value
Change-Id: I5ec18176291e128c79d3e51e39b8a42b17a27b30
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 99243b4..90b4de6 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -737,14 +737,14 @@ static void unzipToBuffer( const char* pBegin, unsigned
int nLen,
aZStr.zalloc= ( alloc_func )0;
aZStr.zfree = ( free_func )0;
aZStr.opaque= ( voidpf )0;
-inflateInit(aZStr);
+
+int err = inflateInit(aZStr);
const unsigned int buf_increment_size = 16384;
*pOutBuf = (sal_uInt8*)rtl_reallocateMemory( *pOutBuf, buf_increment_size
);
aZStr.next_out = (Bytef*)*pOutBuf;
aZStr.avail_out = buf_increment_size;
-int err = Z_OK;
*pOutLen = buf_increment_size;
while( err != Z_STREAM_END err = Z_OK aZStr.avail_in )
{
commit e5b3a644437a4e74f85a197eb6a8c4a2d0f71e24
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 25 09:07:28 2013 +0100
WaE: at higher debug levels
Change-Id: I3a4c16995ac46bbb53923b9c47101826673cdded
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
index 891f70c..fe23c0c 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -433,3 +433,120 @@
typedef typename ScannerT::iterator_t iterator_t;
iterator_t const s(scan.first);
+--- misc/boost_1_44_0/boost/date_time/time_facet.hpp
misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
+@@ -439,31 +439,31 @@
+ time_dur_arg.get_rep().as_special());
+ }
+
+- string_type format(m_time_duration_format);
++ string_type lcl_format(m_time_duration_format);
+ if (time_dur_arg.is_negative()) {
+ // replace %- with minus sign. Should we use the numpunct facet?
+-boost::algorithm::replace_all(format,
++boost::algorithm::replace_all(lcl_format,
+ duration_sign_negative_only,
+ negative_sign);
+ // remove all the %+ in the string with '-'
+-boost::algorithm::replace_all(format,
++boost::algorithm::replace_all(lcl_format,
+ duration_sign_always,
+ negative_sign);
+ }
+ else { //duration is positive
+ // remove all the %- combos from the string
+-boost::algorithm::erase_all(format, duration_sign_negative_only);
++boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
+ // remove all the %+ in the string with '+'
+-boost::algorithm::replace_all(format,
++boost::algorithm::replace_all(lcl_format,
+ duration_sign_always,
+ positive_sign);
+ }
+
+ // %T and %R have to be replaced here since they are not standard
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ boost::as_literal(formats_type::full_24_hour_time_format),
+ boost::as_literal(formats_type::full_24_hour_time_expanded_format));
+- boost::algorithm::replace_all(format,
++ boost::algorithm::replace_all(lcl_format,
+ boost::as_literal(formats_type::short_24_hour_time_format),
+ boost::as_literal(formats_type::short_24_hour_time_expanded_format));
+
+@@ -476,22 +476,22 @@
+* here ourself.
+*/
+ string_type hours_str;
+- if (format.find(unrestricted_hours_format) != string_type::npos) {
++ if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
+ hours_str = hours_as_string(time_dur_arg);
+-boost::algorithm::replace_all(format, unrestricted_hours_format,
hours_str);
++boost::algorithm::replace_all(lcl_format, unrestricted_hours_format,
hours_str);
+ }
+ // We still have to process restricted hours format specifier. In order
to
+ // support parseability of durations in ISO format (%H%M%S), we'll have
to
+ // restrict the stringified hours length to 2 characters.
+- if (format.find(hours_format) != string_type::npos) {
++ if (lcl_format.find(hours_format) != string_type::npos) {
+ if (hours_str.empty())
+ hours_str = hours_as_string(time_dur_arg);
+ BOOST_ASSERT(hours_str.length() = 2);
+-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/9e2900d024c38866b5c6f020e547a5d720d291
93/9e2900d024c38866b5c6f020e547a5d720d291 |1 + 1 file changed, 1 insertion(+) New commits: commit 6504bf1d2cb2b010051180500a9c5243092b4e40 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 09:27:55 2013 +0100 Notes added by 'git notes add' diff --git a/93/9e2900d024c38866b5c6f020e547a5d720d291 b/93/9e2900d024c38866b5c6f020e547a5d720d291 new file mode 100644 index 000..d91621d --- /dev/null +++ b/93/9e2900d024c38866b5c6f020e547a5d720d291 @@ -0,0 +1 @@ +merged as: 2a51960c6ba81c2c0d9c17794c249f4b22441a07 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/ed59d2b1261bd2e42c58c9a4663e19b8ec13a9
87/ed59d2b1261bd2e42c58c9a4663e19b8ec13a9 |1 + 1 file changed, 1 insertion(+) New commits: commit f82294d96ad8d90037eb745a6ba8181026b8b04d Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 09:29:14 2013 +0100 Notes added by 'git notes add' diff --git a/87/ed59d2b1261bd2e42c58c9a4663e19b8ec13a9 b/87/ed59d2b1261bd2e42c58c9a4663e19b8ec13a9 new file mode 100644 index 000..547b31e --- /dev/null +++ b/87/ed59d2b1261bd2e42c58c9a4663e19b8ec13a9 @@ -0,0 +1 @@ +prefer: 9042604f1ba0e1e6e0dc8b8f45f9b67169fd462e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 96456205067220cc73bffae6ae860dd120641660 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Tue Jun 25 10:30:58 2013 +0200 Add Ignore-Diacritics to find toolbar for CTL fdo#52204 Change-Id: I79cb4db1ec87258c45ddc786914b32f47e96acf5 diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index dcb3206..a32c77b 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -26,11 +26,13 @@ #include com/sun/star/beans/XPropertySet.hpp #include com/sun/star/frame/XLayoutManager.hpp #include com/sun/star/i18n/TransliterationModules.hpp +#include com/sun/star/i18n/TransliterationModulesExtra.hpp #include com/sun/star/text/XTextRange.hpp #include com/sun/star/ui/XUIElement.hpp #include com/sun/star/util/URL.hpp #include com/sun/star/util/URLTransformer.hpp +#include svl/ctloptions.hxx #include svl/srchitem.hxx #include toolkit/helper/vclunohelper.hxx #include vcl/toolbox.hxx @@ -98,8 +100,11 @@ void impl_executeSearch( const css::uno::Reference css::uno::XComponentContext lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value = (sal_Int32)0; lArgs[3].Name = OUString(SEARCHITEM_TRANSLITERATEFLAGS); -lArgs[3].Value = (sal_Int32)(!aMatchCase ? -com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); +SvtCTLOptions aCTLOptions; +sal_Int32 nFlags = 0; +nFlags |= (!aMatchCase ? com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); +nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 ); +lArgs[3].Value = nFlags; lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Value = (sal_Int16)(aFindAll ? SVX_SEARCHCMD_FIND_ALL : SVX_SEARCHCMD_FIND ); ___ 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/VSDContentCollector.cpp |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0921f77b64ba08ebfc484362d13bf6f5962fa41e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jun 25 10:38:13 2013 +0200
Avoid NANs
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index b1f83d7..4c53118 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -1352,7 +1352,7 @@ void
libvisio::VSDContentCollector::collectNURBSTo(unsigned /* id */, unsigned l
NURBS.insert(libwpg:path-action, L);
double nextX = 0;
double nextY = 0;
-double denominator = 1E-10;
+double denominator = LIBVISIO_EPSILON;
for (unsigned p = 0; p controlPoints.size() p weights.size(); p++)
{
@@ -1399,10 +1399,10 @@ double
libvisio::VSDContentCollector::_NURBSBasis(unsigned knot, unsigned degree
else
return 0;
}
- if (knotVector.size() knot+degree
knotVector[knot+degree]-knotVector[knot] 0)
+ if (knotVector.size() knot+degree
fabs(knotVector[knot+degree]-knotVector[knot]) LIBVISIO_EPSILON)
basis =
(point-knotVector[knot])/(knotVector[knot+degree]-knotVector[knot]) *
_NURBSBasis(knot, degree-1, point, knotVector);
- if (knotVector.size() knot+degree+1 knotVector[knot+degree+1] -
knotVector[knot+1] 0)
+ if (knotVector.size() knot+degree+1 fabs(knotVector[knot+degree+1] -
knotVector[knot+1]) LIBVISIO_EPSILON)
basis +=
(knotVector[knot+degree+1]-point)/(knotVector[knot+degree+1]-knotVector[knot+1])
* _NURBSBasis(knot+1, degree-1, point, knotVector);
return basis;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 30/07f2652fd2304514ecdffa440066502a222f59
30/07f2652fd2304514ecdffa440066502a222f59 |1 + 1 file changed, 1 insertion(+) New commits: commit feecb15167885ce04c4e1e257151b9e575c7526f Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 09:41:30 2013 +0100 Notes added by 'git notes add' diff --git a/30/07f2652fd2304514ecdffa440066502a222f59 b/30/07f2652fd2304514ecdffa440066502a222f59 new file mode 100644 index 000..99b0d3e --- /dev/null +++ b/30/07f2652fd2304514ecdffa440066502a222f59 @@ -0,0 +1 @@ +prefer: 73d3ad1375c2bfc60bda66bbf4bffd14c9842da2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] Extend support for Document Management Systems, progress update
Hi all, This is a short summary of what I have done until now: - Finished Google Drive implementation, actually it was finished in May. - Properties dialog: + Created the dialog UI. + Created the UNO interface for CMIS property type. + Fetched the CMIS properties to the dialog. + Editing of the properties ( not yet finished ). Things I'm doing now include: - Convert the properties dialog to .ui format. - Fix UI problems. - Fix multiple values display of the properties. - Enable update properties. Regards, Cuong. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/9e97b9f2e4260001a19042737508c2da9a1e43
70/9e97b9f2e4260001a19042737508c2da9a1e43 |1 + 1 file changed, 1 insertion(+) New commits: commit c43c8f8b947e64b8e65dd13306eb82ed43e34951 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 10:11:47 2013 +0100 Notes added by 'git notes add' diff --git a/70/9e97b9f2e4260001a19042737508c2da9a1e43 b/70/9e97b9f2e4260001a19042737508c2da9a1e43 new file mode 100644 index 000..264d0e5 --- /dev/null +++ b/70/9e97b9f2e4260001a19042737508c2da9a1e43 @@ -0,0 +1 @@ +prefer: 732f3546c4051d92e544df6462022e7d07765e83 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/3d9d8e099774da2bf9db818ec78bbe45df0c99
bc/3d9d8e099774da2bf9db818ec78bbe45df0c99 |1 + 1 file changed, 1 insertion(+) New commits: commit 3ae310d2597f0108ab510c0c489c041aba334915 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 10:15:32 2013 +0100 Notes added by 'git notes add' diff --git a/bc/3d9d8e099774da2bf9db818ec78bbe45df0c99 b/bc/3d9d8e099774da2bf9db818ec78bbe45df0c99 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/bc/3d9d8e099774da2bf9db818ec78bbe45df0c99 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 75/894372c679592b9f177a9fa8ce7888962a4da8
75/894372c679592b9f177a9fa8ce7888962a4da8 |1 + 1 file changed, 1 insertion(+) New commits: commit 23a81846ecdcaeee4c637039206b560650c4f3e4 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 10:16:15 2013 +0100 Notes added by 'git notes add' diff --git a/75/894372c679592b9f177a9fa8ce7888962a4da8 b/75/894372c679592b9f177a9fa8ce7888962a4da8 new file mode 100644 index 000..ff99457 --- /dev/null +++ b/75/894372c679592b9f177a9fa8ce7888962a4da8 @@ -0,0 +1 @@ +prefer: 0c9a6bf5f791778c8ce59d60a84b62f32c1a2f79 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/8d9d0573500521b639fc49fa3bbbc5a23a0a5a
53/8d9d0573500521b639fc49fa3bbbc5a23a0a5a |1 + 1 file changed, 1 insertion(+) New commits: commit b5d74a20a28eea2bdd2509134d0daf657aced94c Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 10:17:16 2013 +0100 Notes added by 'git notes add' diff --git a/53/8d9d0573500521b639fc49fa3bbbc5a23a0a5a b/53/8d9d0573500521b639fc49fa3bbbc5a23a0a5a new file mode 100644 index 000..3478dd0 --- /dev/null +++ b/53/8d9d0573500521b639fc49fa3bbbc5a23a0a5a @@ -0,0 +1 @@ +prefer: 1a2ebf61e733f33f6a6bcba734a2f2e3f6ad887b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: need code pointer on basic IDE code
Hi I experience some nasty latencies in basic IDE switching from a module to another [update] i opened an issue with a demo extension https://bugs.freedesktop.org/show_bug.cgi?id=66148 Laurent ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source
cui/source/tabpages/transfrm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6bb02e0113419a21b46f46885df271ea6baf4eb8 Author: David Tardon dtar...@redhat.com Date: Wed Jun 19 14:26:41 2013 +0200 fix copypasta Change-Id: I7744acc8cf1e8b6cad05d22df43f3d5a5beaa2f6 (cherry picked from commit 938644c93ee6eb4c5b3f4ade0ba59b82751d1448) Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index a20ea83..9cd709f 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -886,7 +886,7 @@ sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet rOutAttrs ) nHeight = MetricField::ConvertDoubleValue( nHeight, maMtrHeight.GetBaseValue(), maMtrHeight.GetDecimalDigits(), meDlgUnit, FUNIT_100TH_MM ); long lHeight = long(nHeight * (double)aUIScale); lHeight = OutputDevice::LogicToLogic( lHeight, MAP_100TH_MM, (MapUnit)mePoolUnit ); -lHeight = static_castlong(maMtrWidth.Denormalize( lHeight )); +lHeight = static_castlong(maMtrHeight.Denormalize( lHeight )); // put Width Height to itemset rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xls/border.xls |binary
sc/qa/unit/data/xlsx/border.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 25 ++---
3 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 69dcacedaccd1d698a54eed615ee8739747bc975
Author: Noel Power noel.po...@suse.com
Date: Tue Jun 25 10:28:27 2013 +0100
unit test for commit:1680a8cd4f4393ec15c4f85cb63b6654117d56d1 (fdo#56960)
expand the existing borders import check to cater for xlsx ( and
testing for fine/hair border styles )
Change-Id: Ic5c3cd46e0049dbce9997f0881c4d98e0d64e00c
diff --git a/sc/qa/unit/data/xls/border.xls b/sc/qa/unit/data/xls/border.xls
index b314f7d..876839b 100644
Binary files a/sc/qa/unit/data/xls/border.xls and
b/sc/qa/unit/data/xls/border.xls differ
diff --git a/sc/qa/unit/data/xlsx/border.xlsx b/sc/qa/unit/data/xlsx/border.xlsx
new file mode 100755
index 000..e33c083
Binary files /dev/null and b/sc/qa/unit/data/xlsx/border.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index f55cb9b..8861a9d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -96,6 +96,7 @@ public:
void testMatrixXLS();
void testBorderODS();
void testBorderXLS();
+void testBorderXLSX();
void testBordersOoo33();
void testBugFixesODS();
void testBugFixesXLS();
@@ -158,6 +159,7 @@ public:
CPPUNIT_TEST(testMatrixXLS);
CPPUNIT_TEST(testBorderODS);
CPPUNIT_TEST(testBorderXLS);
+CPPUNIT_TEST(testBorderXLSX);
CPPUNIT_TEST(testBordersOoo33);
CPPUNIT_TEST(testBugFixesODS);
CPPUNIT_TEST(testBugFixesXLS);
@@ -208,7 +210,7 @@ public:
private:
void testPassword_Impl(const OUString rFileNameBase);
-
+void testBorderImpl( sal_uLong nFormatType );
uno::Referenceuno::XInterface m_xCalcComponent;
};
@@ -750,9 +752,9 @@ void ScFiltersTest::testBorderODS()
xDocSh-DoClose();
}
-void ScFiltersTest::testBorderXLS()
+void ScFiltersTest::testBorderImpl( sal_uLong nFormatType )
{
-ScDocShellRef xDocSh = loadDoc(border., XLS);
+ScDocShellRef xDocSh = loadDoc(border., nFormatType );
CPPUNIT_ASSERT_MESSAGE(Failed to load border.xls, xDocSh.Is());
ScDocument* pDoc = xDocSh-GetDocument();
@@ -779,7 +781,24 @@ void ScFiltersTest::testBorderXLS()
CPPUNIT_ASSERT_EQUAL(pRight-GetBorderLineStyle(),
table::BorderLineStyle::SOLID);
CPPUNIT_ASSERT_EQUAL(pRight-GetWidth(),30L);
+
+pDoc-GetBorderLines( 7, 9, 0, pLeft, pTop, pRight, pBottom );
+CPPUNIT_ASSERT(pRight);
+CPPUNIT_ASSERT_EQUAL(pRight-GetBorderLineStyle(),
+table::BorderLineStyle::FINE_DASHED);
+CPPUNIT_ASSERT_EQUAL(pRight-GetWidth(),1L);
+}
+
+void ScFiltersTest::testBorderXLS()
+{
+testBorderImpl( XLS );
}
+
+void ScFiltersTest::testBorderXLSX()
+{
+testBorderImpl( XLSX );
+}
+
struct Border
{
sal_Int16 column;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 44664, which changed state. Bug 44664 Summary: cups landscape woes with pdf: printer truncates Landscape orientation pages to Portrait dimensions https://bugs.freedesktop.org/show_bug.cgi?id=44664 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC] Android Impress Remote: Weekly Report #2
Hi All, This summer I am working on Android Impress Remote improvements. Past week progress. * All code related to the server communication at the client’s side was refactored. Plans for this week. * Finish refactoring. * Start working on the UI improvements. As you see past week wasn’t productive enough (or just interesting to mention), so its time to speed up! Regards, Artur. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/drawdoc.hxx |1
sd/inc/shapelist.hxx | 21 -
sd/source/core/drawdoc.cxx | 11 +++---
sd/source/core/drawdoc4.cxx | 10 +-
sd/source/core/sdpage.cxx| 39
sd/source/core/sdpage2.cxx |6 ++-
sd/source/core/shapelist.cxx | 49 ---
sd/source/ui/view/drviews1.cxx |7 +---
sd/source/ui/view/sdview5.cxx|5 +--
sd/source/ui/view/viewoverlaymanager.cxx |5 +--
10 files changed, 84 insertions(+), 70 deletions(-)
New commits:
commit 90ffe25cdda7f7922ea7def4a5bf99ff1671b0d3
Author: Noel Power noel.po...@suse.com
Date: Tue Jun 25 11:01:52 2013 +0100
remove unwanted files added with ee51444ed1f7003dafc93c8181b5f8c1b0fd165b
sigh added some files that were part of a patch that I was testing
were not intended as part of commit
Change-Id: I34ed7f55de28fa09739c0dd8d5084824de676477
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 1d05eb3..77ac6b6 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -145,7 +145,6 @@ private:
Timer* mpWorkStartupTimer;
Timer* mpOnlineSpellingTimer;
sd::ShapeList* mpOnlineSpellingList;
-sd::ShapeList::const_iterator maShapeListIterator;
SvxSearchItem* mpOnlineSearchItem;
std::vectorsd::FrameView* maFrameViewList;
SdCustomShowList* mpCustomShowList;
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index 2d759a2..f828ebc6 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -29,10 +29,6 @@ namespace sd
class ShapeList : public sdr::ObjectUser
{
public:
-/** const_iterator guarantee only that the list itself is not
- altered. The objects referenced by the list are still mutable. */
-typedef std::list SdrObject* ::const_iterator const_iterator;
-
ShapeList();
virtual ~ShapeList();
@@ -52,17 +48,26 @@ namespace sd
/** @return true if given shape is part of this list */
bool hasShape( SdrObject rObject ) const;
-/** @return const_iterator pointing to the first element */
-const_iterator cbegin() const;
+/** returns the shape the internal iterator points to, or 0 if
+ * the list end is reached. moves the internal iterator to the
+ * next shape. */
+SdrObject* getNextShape();
+
+/** Sets the internal iterator to the shape at given index. */
+void seekShape( sal_uInt32 nIndex );
+
+/**
+*/
+bool hasMore() const;
-/** @return const_iterator pointing to the list termination element */
-const_iterator cend() const;
+const std::list SdrObject* getList() const { return maShapeList; }
private:
virtual void ObjectInDestruction(const SdrObject rObject);
typedef std::list SdrObject* ListImpl;
ListImpl maShapeList;
+ListImpl::iterator maIter;
};
}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index ed8d1fc..aca4996 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -144,7 +144,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
, mpWorkStartupTimer(NULL)
, mpOnlineSpellingTimer(NULL)
, mpOnlineSpellingList(NULL)
-, maShapeListIterator()
, mpOnlineSearchItem(NULL)
, mpCustomShowList(NULL)
, mpDocSh(static_cast ::sd::DrawDocShell*(pDrDocSh))
@@ -695,7 +694,7 @@ void SdDrawDocument::UpdateAllLinks()
*/
void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool*
pSPool )
{
-const sd::ShapeList rPresentationShapes(
pPage-GetPresentationShapeList() );
+sd::ShapeList rPresentationShapes( pPage-GetPresentationShapeList() );
if(!rPresentationShapes.isEmpty())
{
// Create lists of title and outline styles
@@ -707,13 +706,13 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
SfxStyleSheet* pTitleSheet =
(SfxStyleSheet*)pSPool-GetTitleSheet(aName);
+SdrObject* pObj = 0;
+rPresentationShapes.seekShape(0);
+
// Now look for title and outline text objects, then make those objects
// listeners.
-for( ShapeList::const_iterator aIter (rPresentationShapes.cbegin() );
- aIter != rPresentationShapes.cend(); ++aIter )
+while( (pObj = rPresentationShapes.getNextShape()) )
{
-SdrObject* pObj = *aIter;
-
if (pObj-GetObjInventor() == SdrInventor)
{
OutlinerParaObject* pOPO = pObj-GetOutlinerParaObject();
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 6c90cac..6954913 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -755,7 +755,6 @@ void
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b8298f8e191d0bdfb558ec26607bc1ec7076a7f3
Author: Michael Stahl mst...@redhat.com
Date: Tue Jun 25 12:48:19 2013 +0200
DocxAttributeOutput: -Werror=unused-macros, -Werror=sign-compare
Change-Id: I9d75b0a625009d483467042584d2d2f89501cb96
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 03e717b..4614efc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3715,7 +3715,6 @@ void DocxAttributeOutput::CharAnimatedText( const
SvxBlinkItem rBlink )
m_pSerializer-singleElementNS(XML_w, XML_effect, FSNS( XML_w, XML_val
), none, FSEND );
}
-#define MSWORD_CH_SHADING_CLR 0xD8D8D8 // This color is the same color as the
ms-word's character shading color.
#define MSWORD_CH_SHADING_FILL FF // The attribute w:fill of w:shd, for
MS-Word's character shading,
#define MSWORD_CH_SHADING_COLOR auto // The attribute w:color of w:shd, for
MS-Word's character shading,
#define MSWORD_CH_SHADING_VAL pct15 // The attribute w:value of w:shd, for
MS-Word's character shading,
@@ -3723,7 +3722,7 @@ void DocxAttributeOutput::CharAnimatedText( const
SvxBlinkItem rBlink )
void DocxAttributeOutput::CharBackground( const SvxBrushItem rBrush )
{
// Check if the brush shading pattern is 'PCT15'. If so - write it back to
the DOCX
-if (rBrush.GetShadingValue() == ShadingPattern::PCT15)
+if (rBrush.GetShadingValue() == +ShadingPattern::PCT15)
{
m_pSerializer-singleElementNS( XML_w, XML_shd,
FSNS( XML_w, XML_val ), MSWORD_CH_SHADING_VAL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2d9ebf1b95867f7df335b74f3e3c5328647f34a
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Tue Jun 25 12:36:01 2013 +0200
add safety check for '_' if had been put in the end of the text
Change-Id: I7fae615f644158c9e5137330daa4873ad4192fd5
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e79896e..4cc571f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2201,7 +2201,7 @@ OString VclBuilder::convertMnemonicMarkup(const OString
rIn)
OStringBuffer aRet(rIn);
for (sal_Int32 nI = 0; nI aRet.getLength(); ++nI)
{
-if (aRet[nI] == '_')
+if (aRet[nI] == '_' nI+1 aRet.getLength())
{
if (aRet[nI+1] != '_')
aRet[nI] = MNEMONIC_CHAR;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/res_bmp.src|5 ++
sd/source/ui/inc/res_bmp.hrc|1
sd/source/ui/slidesorter/controller/SlsAnimator.cxx |3 -
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx |1
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |8 +++
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx |3 +
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 16 ++
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 28 +---
8 files changed, 55 insertions(+), 10 deletions(-)
New commits:
commit e5990a9dcd97c2231115eae83770f9e6e7e130e9
Author: Ciorba Edmond edmond_cio...@yahoo.com
Date: Thu Jun 13 22:19:38 2013 +0300
fdo#65456 - Provide visual clues in slidesorter for custom animation.
Change-Id: I08666492fea76395fd24b0ebd02647821f49573d
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 3114587..246f230 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -338,6 +338,11 @@ Bitmap BMP_FADE_EFFECT_INDICATOR
File = fade_effect_indicator.bmp;
};
+Bitmap BMP_CUSTOM_ANIMATION_INDICATOR
+{
+File = click_16.bmp;
+};
+
Bitmap BMP_COMMENTS_INDICATOR
{
File = comments_indicator.bmp;
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index ec35436..efdd47a 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -44,6 +44,7 @@
// additional effects
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
+#define BMP_CUSTOM_ANIMATION_INDICATOR RID_SD_START+332
#define BMP_COMMENTS_INDICATOR RID_SD_START+338
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index a8ce2dc..7b28c7d 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -140,9 +140,6 @@ Animator::AnimationId Animator::AddAnimation (
return pAnimation-mnAnimationId;
}
-
-
-
void Animator::RemoveAnimation (const Animator::AnimationId nId)
{
OSL_ASSERT( ! mbIsDisposed);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index c3915cb..c9e78d7 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -86,6 +86,7 @@ public:
*/
void RemoveAnimation (const AnimationId nAnimationId);
+
/** A typical use case for this method is the temporary shutdown of the
slidesorter when the slide sorter bar is put into a cache due to a
change of the edit mode.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 1c50da9..2303c83 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -67,7 +67,10 @@ public:
Name,
// Indicator whether or not there is a slide transition associated
// with this slide.
-TransitionEffectIndicator
+TransitionEffectIndicator,
+// Indicator whether or not there is a custom animation associated
+// with this slide.
+CustomAnimationEffectIndicator
};
/** Two coordinate systems are supported. They differ only in
translation not in scale. Both relate to pixel values in the window.
@@ -109,6 +112,7 @@ public:
const CoordinateSystem eCoordinateSystem);
Image GetTransitionEffectIcon (void) const;
+Image GetCustomAnimationEffectIcon (void) const;
private:
SharedSdWindow mpWindow;
@@ -118,7 +122,9 @@ private:
Rectangle maPageNumberAreaBoundingBox;
Rectangle maPreviewBoundingBox;
Rectangle maTransitionEffectBoundingBox;
+Rectangle maCustomAnimationEffectBoundingBox;
const Image maTransitionEffectIcon;
+const Image maCustomAnimationEffectIcon;
const ::boost::shared_ptrFont mpPageNumberFont;
Size GetPageNumberAreaSize (const int nPageCount);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 3f73b56..a4bd182 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -100,6 +100,9 @@ private:
void PaintTransitionEffect (
OutputDevice rDevice,
const model::SharedPageDescriptor rpDescriptor) const;
+void PaintCustomAnimationEffect (
+OutputDevice rDevice,
+const model::SharedPageDescriptor rpDescriptor) const;
void PaintBorder (
OutputDevice rDevice,
const Theme::GradientColorType eColorType,
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc sw/source
Rebased ref, commits from common ancestor:
commit e303aa5e568707cfb3a35315dbb645fc7d950e74
Author: Alex Ivan alexni...@yahoo.com
Date: Tue Jun 25 14:22:06 2013 +0300
Revert prev changes; add SwTableFmt to Autoformat
Changes made in previous patch have been reverted.
A SwTableFmt memeber has been added to SwTableAutoFmt in
order to enable gradual transfer of items from one to
the other, while maintaining current functionality.
Change-Id: I844f77914277ed6f5e115aa82f41e753589c7057
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 7340427..1988933 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -233,6 +233,7 @@ class SW_DLLPUBLIC SwTableAutoFmt
friend void _FinitCore(); // To destroy dflt. pointer.
static SwBoxAutoFmt* pDfltBoxAutoFmt;
+SwTableFmt* m_pTableStyle;
String aName;
sal_uInt16 nStrResId;
@@ -259,7 +260,7 @@ class SW_DLLPUBLIC SwTableAutoFmt
SvxShadowItem m_aShadow;
public:
-SwTableAutoFmt( const String rName );
+SwTableAutoFmt( const String rName, SwTableFmt* pTableStyle );
SwTableAutoFmt( const SwTableAutoFmt rNew );
~SwTableAutoFmt();
@@ -293,7 +294,7 @@ public:
void SetValueFormat( const sal_Bool bNew ) { bInclValueFormat = bNew; }
void SetWidthHeight( const sal_Bool bNew ) { bInclWidthHeight = bNew; }
-sal_Bool Load( SvStream rStream, const SwAfVersions );
+static SwTableAutoFmt* Load( SvStream rStream, const SwAfVersions,
SwDoc* pDoc );
sal_Bool Save( SvStream rStream, sal_uInt16 fileVersion ) const;
};
@@ -301,12 +302,13 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
{
struct Impl;
::boost::scoped_ptrImpl m_pImpl;
+SwDoc* m_pDoc;
SW_DLLPRIVATE sal_Bool Load( SvStream rStream );
SW_DLLPRIVATE sal_Bool Save( SvStream rStream ) const;
public:
-explicit SwTableAutoFmtTbl();
+explicit SwTableAutoFmtTbl(SwDoc* pDoc);
~SwTableAutoFmtTbl();
size_t size() const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 2031563..bb4e682 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -590,8 +590,9 @@ sal_Bool SwBoxAutoFmt::SaveVersionNo( SvStream rStream,
sal_uInt16 fileVersion
-SwTableAutoFmt::SwTableAutoFmt( const String rName )
-: aName( rName )
+SwTableAutoFmt::SwTableAutoFmt( const String rName, SwTableFmt* pTableStyle )
+: m_pTableStyle( pTableStyle )
+, aName( rName )
, nStrResId( USHRT_MAX )
, m_aBreak( SVX_BREAK_NONE, RES_BREAK )
, m_aKeepWithNextPara( sal_False, RES_KEEP )
@@ -639,6 +640,7 @@ SwTableAutoFmt SwTableAutoFmt::operator=( const
SwTableAutoFmt rNew )
aBoxAutoFmt[ n ] = 0;
}
+m_pTableStyle = rNew.m_pTableStyle;
aName = rNew.aName;
nStrResId = rNew.nStrResId;
bInclFont = rNew.bInclFont;
@@ -913,8 +915,10 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable
table)
m_aShadow = static_castconst SvxShadowItem(rSet.Get(RES_SHADOW));
}
-sal_Bool SwTableAutoFmt::Load( SvStream rStream, const SwAfVersions
rVersions )
+SwTableAutoFmt* SwTableAutoFmt::Load( SvStream rStream, const SwAfVersions
rVersions, SwDoc* pDoc )
{
+SwTableAutoFmt* pRet = NULL;
+
sal_uInt16 nVal = 0;
rStream nVal;
sal_Bool bRet = 0 == rStream.GetError();
@@ -925,7 +929,8 @@ sal_Bool SwTableAutoFmt::Load( SvStream rStream, const
SwAfVersions rVersions
sal_Bool b;
// --- from 680/dr25 on: store strings as UTF-8
CharSet eCharSet = (nVal = AUTOFORMAT_ID_680DR25) ?
RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
-aName = rStream.ReadUniOrByteString( eCharSet );
+OUString aName = rStream.ReadUniOrByteString( eCharSet );
+sal_uInt16 nStrResId = USHRT_MAX;
if( AUTOFORMAT_DATA_ID_552 = nVal )
{
rStream nStrResId;
@@ -938,24 +943,34 @@ sal_Bool SwTableAutoFmt::Load( SvStream rStream, const
SwAfVersions rVersions
else
nStrResId = USHRT_MAX;
}
-rStream b; bInclFont = b;
-rStream b; bInclJustify = b;
-rStream b; bInclFrame = b;
-rStream b; bInclBackground = b;
-rStream b; bInclValueFormat = b;
-rStream b; bInclWidthHeight = b;
+
+// FIXME Yuk! we are creating the table styles ATM, but in the
targetted
+// ideal, the table styles are created with the document
+SwTableFmt* pStyle = pDoc-FindTblFmtByName(aName);
+if ( !pStyle )
+pStyle = pDoc-MakeTblFrmFmt(aName, NULL);
+pRet = new SwTableAutoFmt( aName, pStyle );
+
+pRet-nStrResId = nStrResId;
+
+rStream b; pRet-bInclFont = b;
+rStream b; pRet-bInclJustify = b;
+rStream b; pRet-bInclFrame = b;
+rStream b; pRet-bInclBackground = b;
+rStream b; pRet-bInclValueFormat = b;
+rStream b; pRet-bInclWidthHeight = b;
if (nVal
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/CellColorHandler.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 3a06d98fdfc213c3216de92878cff9818427e57a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Jun 25 14:00:05 2013 +0200
remove unused variable
Change-Id: I5dd8dc9a3a256e51706d32249260f6561202bbc9
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 58069d8..a6d36b8 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -49,7 +49,6 @@ CellColorHandler::~CellColorHandler()
void CellColorHandler::lcl_attribute(Id rName, Value rVal)
{
-OUString stringValue = rVal.getString();
sal_Int32 nIntValue = rVal.getInt();
switch( rName )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/pack
odk/pack/gendocu/idl_ref_javadoc.patch | 37 +
odk/pack/gendocu/makefile.mk |3 ++
2 files changed, 40 insertions(+)
New commits:
commit f92962f3c6c27db9058dfa7a0d9d1e88d34b53ba
Author: Jürgen Schmidt j...@apache.org
Date: Tue Jun 25 11:29:37 2013 +
#122356# patch for generated javadoc index
diff --git a/odk/pack/gendocu/idl_ref_javadoc.patch
b/odk/pack/gendocu/idl_ref_javadoc.patch
new file mode 100644
index 000..4ff644a
--- /dev/null
+++ b/odk/pack/gendocu/idl_ref_javadoc.patch
@@ -0,0 +1,37 @@
+14a15,50
+ if (targetPage != !validURL(targetPage))
+ targetPage = undefined;
+ function validURL(url) {
+ var pos = url.indexOf(.html);
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' = ch ch = 'z' ||
+ 'A' = ch ch = 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' = ch ch = '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 4498a94..624bbea 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -111,6 +111,9 @@ $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
$(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
-$(MKDIRHIER) $(@:d)
$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) $(JAVADOCLOG)
+.IF $(OS) != MACOSX
+patch $(JAVA_DOCU_INDEX_FILE) idl_ref_javadoc.patch
+.ENDIF
.ENDIF
.ELSE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO / Firebird DB Integration
I do not see any improvement with having to bundle hsqldb vs. having to bundle firebird. If Firebird becomes the default database in Base, it will not be a matter of bundling either HSQLDB or Firebird, but of bundling _both_ ! Otherwise what about existing legacy databases ? The main motivation for the switch was getting rid of java AFAIK the main issue in using a HSQLDB database embedded in the .odb file is that, when LO crashes, the chance is big that the database is destroyed: the recovery process does not recover that part of the file. Will it still be the case with an embedded Firebird database ? In that context I invite interested people to read a.o. the thread published last monday on http://forum.openoffice.org/en/forum/viewtopic.php?f=13t=62419 by DACM. An extract: Unfortunately, the devs remain preoccupied with the embedded database concept based on a default database engine. They're literally wasting the summer trying to shoe-horn Firebird into Base as the default in order to achieve yet another, single-file database (.odb), much like we have today with HSQLDB. They don't seem to understand or acknowledge that the user community has shelved the concept because it is inherently unreliable (as confirmed by Microsoft http://www.techrepublic.com/blog/10things/10-reasons-to-split-an-access-database/1119: http://www.techrepublic.com/blog/10things/10-reasons-to-split-an-access-database/1119). We've also moved beyond the idea of a default database with Base. This actually free's the devs to eliminate internal Java dependencies from the entire LibO/AOO code-base, perhaps with the exception of the hooks necessary for external JDBC support. Have users been enough involved in the debate so far ? Thanks for your feedbacks. Jean-Pierre On 24/06/2013 16:19, Andrzej J. R. Hunt wrote: On 24/06/13 12:25, David Tardon wrote: If this is the current option, could we please consider the possibility to drop the whole idea and just stay with hsqldb? With my distro hat on, I do not see any improvement with having to bundle hsqldb vs. having to bundle firebird. The main motivation for the switch was (another step in) getting rid of java (at least for me personally it is, and AFAICS for most other people too), and not the bundling of a db. And there appear to be solutions to allow reliable use of external firebird with various ICUs (see mails from Lionel/Michael) -- so either way firebird still makes the most sense to me. Cheers, Andrzej ___ 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: mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch mdds/UnpackedTarball_mdds.mk
mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch | 27
++
mdds/UnpackedTarball_mdds.mk |1
2 files changed, 28 insertions(+)
New commits:
commit 92e6db6c98b06bffbe7be856ee16ee68f5f901c5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 08:19:37 2013 -0400
Try to help the Windows tinderbox.
Change-Id: Ia3c6df80ff26ea00e91dd97841c4867bf0a55705
diff --git
a/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch
b/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch
new file mode 100644
index 000..783210d
--- /dev/null
+++ b/mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch
@@ -0,0 +1,27 @@
+From a2a1c432f65c0612bb6f1c23a50bd41d2cf0cbdd Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida kohei.yosh...@gmail.com
+Date: Tue, 25 Jun 2013 08:08:09 -0400
+Subject: [PATCH] Combine these two calls. There is no reason why they have to
+ separate.
+
+---
+ include/mdds/multi_type_vector_def.inl | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_def.inl
b/include/mdds/multi_type_vector_def.inl
+index 36dde5e..685899b 100644
+--- a/include/mdds/multi_type_vector_def.inl
b/c/d/include/mdds/multi_type_vector_def.inl
+@@ -1801,8 +1801,7 @@ void
multi_type_vector_CellBlockFunc::swap_single_blocks(
+ else
+ {
+ // Insert a new block to store the new elements.
+-m_blocks.insert(m_blocks.begin()+block_index, NULL);
+-m_blocks[block_index] = new block(len);
++m_blocks.insert(m_blocks.begin()+block_index, new block(len));
+ block* blk = m_blocks[block_index];
+ blk-mp_data = dst_data.release();
+ }
+--
+1.8.0
+
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 69fbf18..bbad2dd 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-an-old-gcc-bug.patch \
+ mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch \
))
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/source
sc/source/filter/oox/stylesbuffer.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 809154544ea1f49a1d7ef0f4b49b3378112f54d0
Author: Akash Shetye shetyeak...@gmail.com
Date: Tue Jun 25 18:06:08 2013 +0530
Add methods to get table name and Formatting and TableStyle.
Change-Id: Ifb9011a4734810ac1f6ea64b676cb52a3e251a8d
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 5428a34..502ceb7 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2677,6 +2677,16 @@ void TableStyle::importTableStyleElement( const
AttributeList rAttribs )
//is not showing up.
}
+const OUString TableStyle::getTableStyleName() const
+{
+return mxTableFormatting-GetTableStyleName();
+}
+
+ScDBDataFormatting TableStyle::getTableFormatting()
+{
+return (*mxTableFormatting);
+}
+
void TableStyle::finalizeImport()
{
}
@@ -3444,6 +3454,18 @@ void StylesBuffer::writeStyleXfToPropertySet(
PropertySet rPropSet, sal_Int32 n
pXf-writeToPropertySet( rPropSet );
}
+TableStyleRef StylesBuffer::getTableStyle( OUString rTableStyleName )
+{
+for( ::std::vector TableStyleRef ::iterator i = maTableStyles.begin(); i
maTableStyles.end(); ++i)
+{
+if( ((*i)-getTableStyleName() ).equals(rTableStyleName) )
+{
+return(*i);
+}
+}
+return 0;
+}
+
//
} // namespace xls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f9/2962f3c6c27db9058dfa7a0d9d1e88d34b53ba
f9/2962f3c6c27db9058dfa7a0d9d1e88d34b53ba |1 + 1 file changed, 1 insertion(+) New commits: commit ecb4393e6ca76618dcf13511b2f97042ce004617 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 13:57:01 2013 +0100 Notes added by 'git notes add' diff --git a/f9/2962f3c6c27db9058dfa7a0d9d1e88d34b53ba b/f9/2962f3c6c27db9058dfa7a0d9d1e88d34b53ba new file mode 100644 index 000..da35a16 --- /dev/null +++ b/f9/2962f3c6c27db9058dfa7a0d9d1e88d34b53ba @@ -0,0 +1 @@ +prefer: b786a33cfdca2e8a4114ddef0340e0e0628dd09c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo66040.rtf | 85 +
sw/qa/extras/rtfimport/rtfimport.cxx | 23 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 ++
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2
writerfilter/source/rtftok/rtfsdrimport.cxx| 52 ++-
5 files changed, 165 insertions(+), 6 deletions(-)
New commits:
commit a8ee2ee7529900628b1c533d77c039618917bc97
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 25 14:47:48 2013 +0200
fdo#66040 RTF import: initial groupshape support
There are two cases here: if the shapes contain tables (or other
Writer-specific features), we should use text frames and we should not
create the actual group shape, as Writer textframes can't be part of
such group shapes. The other case is when the shapes contain simple
text, OTOH there are groupshape-level transformations defined, in that
case we should choose drawinglayer rectangles and actually create a
group shape.
This commit implements support for the first case only.
Change-Id: I9dc99b0711ce5c7a29ea0b14539df0121f9de3d0
diff --git a/sw/qa/extras/rtfimport/data/fdo66040.rtf
b/sw/qa/extras/rtfimport/data/fdo66040.rtf
new file mode 100644
index 000..e067f23
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo66040.rtf
@@ -0,0 +1,85 @@
+{\rtf1
+\paperw16840\paperh11907\margl567\margr567\margt567\margb567
+{\shpgrp
+{\*\shpinst\shpleft-201\shptop-585\shpright16112\shpbottom11321
+{\sp
+{\sn groupLeft}
+{\sv 288}
+}
+{\sp
+{\sn groupTop}
+{\sv -18}
+}
+{\sp
+{\sn groupRight}
+{\sv 16601}
+}
+{\sp
+{\sn groupBottom}
+{\sv 11888}
+}
+{\shp
+{\*\shpinst
+{\sp
+{\sn relLeft}
+{\sv 288}
+}
+{\sp
+{\sn relTop}
+{\sv -18}
+}
+{\sp
+{\sn relRight}
+{\sv 8225}
+}
+{\sp
+{\sn relBottom}
+{\sv 11888}
+}
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\shptxt foo\par
+\pard\plain \intbl A\cell B\cell
+{
+\trowd \irow0\irowband0\lastrow
\ltrrow\ts32\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf17
\trbrdrl\brdrs\brdrw10\brdrcf17 \trbrdrb\brdrs\brdrw10\brdrcf17
\trbrdrr\brdrs\brdrw10\brdrcf17 \trbrdrh
+\brdrs\brdrw10\brdrcf17 \trbrdrv\brdrs\brdrw10\brdrcf17
\trftsWidth1\trftsWidthB3\trautofit1\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblrsid14568770\tbllkhdrrows\tbllkhdrcols\tbllknocolband\tblind0\tblindtype3
\clvertalt\clbrdrt
+\brdrs\brdrw10\brdrcf17 \clbrdrl\brdrs\brdrw10\brdrcf17
\clbrdrb\brdrs\brdrw10\brdrcf17 \clbrdrr\brdrs\brdrw10\brdrcf17
\cltxlrtb\clftsWidth3\clwWidth1783\clshdrawnil
\cellx1675\clvertalt\clbrdrt\brdrs\brdrw10\brdrcf17
\clbrdrl\brdrs\brdrw10\brdrcf17
+\clbrdrb\brdrs\brdrw10\brdrcf17 \clbrdrr\brdrs\brdrw10\brdrcf17
\cltxlrtb\clftsWidth3\clwWidth1784\clshdrawnil \cellx3459\row }
+\pard
+bar
+\par
+}
+}
+}
+{\shp
+{\*\shpinst
+{\sp
+{\sn relLeft}
+{\sv 8664}
+}
+{\sp
+{\sn relTop}
+{\sv -18}
+}
+{\sp
+{\sn relRight}
+{\sv 16601}
+}
+{\sp
+{\sn relBottom}
+{\sv 11888}
+}
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\shptxt baz
+}
+}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 53be3b2..a9c74b1 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -146,6 +146,7 @@ public:
void testN825305();
void testParaBottomMargin();
void testN823655();
+void testFdo66040();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -278,6 +279,7 @@ void Test::run()
{n825305.rtf, Test::testN825305},
{para-bottom-margin.rtf, Test::testParaBottomMargin},
{n823655.rtf, Test::testN823655},
+{fdo66040.rtf, Test::testFdo66040},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1332,6 +1334,27 @@ void Test::testN823655()
CPPUNIT_ASSERT_EQUAL(sal_Int32(286),
aCoordinates[0].Second.Value.getsal_Int32());
}
+void Test::testFdo66040()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+// This was 0 (no shapes were imported), we want two textframes.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws-getCount());
+
+// The second paragraph of the first shape should be actually a table,
with A in its A1 cell.
+uno::Referencetext::XTextRange xTextRange(xDraws-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XText xText = xTextRange-getText();
+uno::Referencetext::XTextTable xTable(getParagraphOrTable(2, xText),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(A),
uno::Referencetext::XTextRange(xTable-getCellByName(A1),
uno::UNO_QUERY)-getString());
+
+// Make sure the second shape has the correct position and size.
+uno::Referencedrawing::XShape xShape(xDraws-getByIndex(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(14420), getPropertysal_Int32(xShape,
[Libreoffice-commits] core.git: mdds/0001-Fix-it-here-too.patch mdds/UnpackedTarball_mdds.mk
mdds/0001-Fix-it-here-too.patch | 26 ++
mdds/UnpackedTarball_mdds.mk|1 +
2 files changed, 27 insertions(+)
New commits:
commit bc120d18144a78d42f9bbb017133e1da92e004ef
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 09:43:54 2013 -0400
Another place where the same fix needs to be applied.
Change-Id: I2d54fa4c39c28b815a051977715e1db672156957
diff --git a/mdds/0001-Fix-it-here-too.patch b/mdds/0001-Fix-it-here-too.patch
new file mode 100644
index 000..9884ff0
--- /dev/null
+++ b/mdds/0001-Fix-it-here-too.patch
@@ -0,0 +1,26 @@
+From e9fdebe0cad9277cfed994cae7fe9d08efbb4ba8 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida kohei.yosh...@gmail.com
+Date: Tue, 25 Jun 2013 09:42:19 -0400
+Subject: [PATCH] Fix it here too.
+
+---
+ include/mdds/multi_type_vector_def.inl | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_def.inl
b/include/mdds/multi_type_vector_def.inl
+index 685899b..cea8ae0 100644
+--- a/include/mdds/multi_type_vector_def.inl
b/c/d/include/mdds/multi_type_vector_def.inl
+@@ -1829,8 +1829,7 @@ void
multi_type_vector_CellBlockFunc::swap_single_blocks(
+ }
+ else
+ {
+-m_blocks.insert(m_blocks.begin()+block_index+1, NULL);
+-m_blocks[block_index+1] = new block(len);
++m_blocks.insert(m_blocks.begin()+block_index+1, new block(len));
+ block* blk = m_blocks[block_index+1];
+ blk-mp_data = dst_data.release();
+ }
+--
+1.8.0
+
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index bbad2dd..9d85d74 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-an-old-gcc-bug.patch \
mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch \
+ mdds/0001-Fix-it-here-too.patch \
))
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 443c13e92c6f900a41e6e383684623ead3e088f5
Author: Noel Power noel.po...@suse.com
Date: Tue Jun 25 14:40:45 2013 +0100
fix text position for custom shapes with zoom != 100% fdo#59862
custom shapes that had text suffered from strange display at zoom
levels != 100%, this was because there was a bug in the code to
correct the textposition
Change-Id: I8d1817cc6be91b3e6379200eb21eb2966d3c2aa9
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 654ed86..7aa29cb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -46,9 +46,11 @@ namespace sdr
basegfx::B2DRange
ViewContactOfSdrObjCustomShape::getCorrectedTextBoundRect() const
{
-const Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+aObjectBound += GetCustomShapeObj().GetGridOffset();
Rectangle aTextBound(aObjectBound);
GetCustomShapeObj().GetTextBounds(aTextBound);
+aTextBound += GetCustomShapeObj().GetGridOffset();
basegfx::B2DRange aTextRange(aTextBound.Left(), aTextBound.Top(),
aTextBound.Right(), aTextBound.Bottom());
const basegfx::B2DRange aObjectRange(aObjectBound.Left(),
aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |4 1 file changed, 4 insertions(+) New commits: commit 902a65ffb571fa69853440051765313b805ebad1 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Jun 25 15:47:14 2013 +0200 now that we detect msvc supports 'override', do not warn about it Change-Id: I127f6756bae786c41122174b615c607b2c3b7ec4 diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 162fd2f..579e6a9 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -101,6 +101,9 @@ gb_AFLAGS := $(AFLAGS) # of the compiler did not override when parameters only differed by # const/volatile qualifiers. +# C4481: nonstandard extension used: override specifier 'override' +# (MSVC 2010 warns about this, even though it's C++11 keyword) + # C4505: 'function' : unreferenced local function has been removed # C4512: 'class' : assignment operator could not be generated @@ -165,6 +168,7 @@ gb_CXXFLAGS := \ -wd4351 \ -wd4355 \ -wd4373 \ + -wd4481 \ -wd4505 \ -wd4512 \ -wd4611 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/digest.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 55599c4a1ece11d840c869db44e351468786916b
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Jun 25 00:00:32 2013 -0500
coverity #982634 and 5 other : Intentional fallthrough in cases
Change-Id: Ie6cfcc32c1ff80dab0f9835524c89d40503f69f0
Reviewed-on: https://gerrit.libreoffice.org/4498
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index e7cd528..75cf209 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -703,9 +703,13 @@ static void __rtl_digest_endMD5 (DigestContextMD5 *ctx)
switch (ctx-m_nDatLen 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) 0L;
+/* fallthrough */
case 1: X[i] |= ((sal_uInt32)(*(p++))) 8L;
+/* fallthrough */
case 2: X[i] |= ((sal_uInt32)(*(p++))) 16L;
+/* fallthrough */
case 3: X[i] |= ((sal_uInt32)(*p)) 24L;
+/* fallthrough */
}
i += 1;
@@ -1154,9 +1158,13 @@ static void __rtl_digest_endSHA (DigestContextSHA *ctx)
switch (ctx-m_nDatLen 0x03)
{
case 0: X[i] = ((sal_uInt32)(*(p++))) 0L;
+/* fallthrough */
case 1: X[i] |= ((sal_uInt32)(*(p++))) 8L;
+/* fallthrough */
case 2: X[i] |= ((sal_uInt32)(*(p++))) 16L;
+/* fallthrough */
case 3: X[i] |= ((sal_uInt32)(*(p++))) 24L;
+/* fallthrough */
}
__rtl_digest_swapLong (X, i + 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/osl/file/osl_File.cxx | 72 +++
1 file changed, 72 insertions(+)
New commits:
commit aeea32af5651a3a288ac9127883e66009d751f6c
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Jun 24 23:50:57 2013 -0500
coverity : #984128 and 21 others : Uninitialized scalar field
Change-Id: If801818c2efc8cdec651ff259243075abac41d20
Reviewed-on: https://gerrit.libreoffice.org/4497
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index a2e2501..15df1b8 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1210,6 +1210,11 @@ namespace osl_FileBase
public:
+searchFileURL()
+: nError1(FileBase::E_None)
+, nError2(FileBase::E_None)
+, nError3(FileBase::E_None)
+, nError4(FileBase::E_None) {}
// test code.
void searchFileURL_001()
{
@@ -1305,6 +1310,7 @@ namespace osl_FileBase
::osl::FileBase::RC nError;
public:
+getTempDirURL() :nError(FileBase::E_None) {}
// initialization
void setUp()
{
@@ -1355,6 +1361,7 @@ namespace osl_FileBase
::rtl::OUString *pUStr_FileURL;
public:
+createTempFile() :nError1(FileBase::E_None),nError2(FileBase::E_None)
{}
// initialization
void setUp()
@@ -1468,6 +1475,7 @@ namespace osl_VolumeInfo
::osl::VolumeDevice aVolumeDevice1;
public:
+ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
void setUp()
{
@@ -1563,6 +1571,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+isValid() :nError1(FileBase::E_None) {}
// initialization
void setUp()
{
@@ -1641,6 +1650,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getRemoteFlag() :nError1(FileBase::E_None) {}
// test code.
void getRemoteFlag_001()
{
@@ -1689,6 +1699,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getRemoveableFlag() :nError1(FileBase::E_None) {}
// test code.
void getRemoveableFlag_001()
{
@@ -1729,6 +1740,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getCompactDiscFlag() :nError1(FileBase::E_None) {}
// test code.
void getCompactDiscFlag_001()
{
@@ -1769,6 +1781,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getFloppyDiskFlag() :nError1(FileBase::E_None) {}
// test code.
void getFloppyDiskFlag_001()
{
@@ -1809,6 +1822,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getFixedDiskFlag() :nError1(FileBase::E_None) {}
// test code.
void getFixedDiskFlag_001()
{
@@ -1848,6 +1862,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getRAMDiskFlag() :nError1(FileBase::E_None) {}
// test code.
void getRAMDiskFlag_001()
{
@@ -1888,6 +1903,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getTotalSpace() :nError1(FileBase::E_None) {}
// test code.
void getTotalSpace_001()
{
@@ -1969,6 +1985,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getFreeSpace() :nError1(FileBase::E_None) {}
// test code.
void getFreeSpace_001()
{
@@ -2050,6 +2067,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getUsedSpace() :nError1(FileBase::E_None) {}
// test code.
void getUsedSpace_001()
{
@@ -2133,6 +2151,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getMaxNameLength() :nError1(FileBase::E_None) {}
// test code.
void getMaxNameLength_001()
{
@@ -2192,6 +2211,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getMaxPathLength() :nError1(FileBase::E_None) {}
// test code.
void getMaxPathLength_001()
{
@@ -2246,6 +2266,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getFileSystemName() :nError1(FileBase::E_None) {}
// test code.
void getFileSystemName_001()
{
@@ -2306,6 +2327,7 @@ namespace osl_VolumeInfo
::osl::FileBase::RC nError1;
public:
+getDeviceHandle() :nError1(FileBase::E_None) {}
// test code.
void getDeviceHandle_001()
{
@@ -2363,6 +2385,7 @@ namespace
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tplnedef.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a62a5c34a46715cb9d13c60f8423526c0625d1e Author: David Tardon dtar...@redhat.com Date: Tue Jun 25 16:18:58 2013 +0200 fdo#62119 fix copypasta Change-Id: I236b14822ae1852298ccd28aca9b54bc79a97312 diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index e58b7a9..46ded4b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -772,7 +772,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) aPathURL.removeFinalSlash(); XDashListRef pDshLst = XPropertyList::CreatePropertyList( -XGRADIENT_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ) )-AsDashList(); +XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ) )-AsDashList(); pDshLst-SetName( aURL.getName() ); if( pDshLst-Load() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: src/msodraw.py
src/msodraw.py | 92 + 1 file changed, 47 insertions(+), 45 deletions(-) New commits: commit a42ed0ce34b0529f355b7d30f15857e1dab0f2a4 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jun 25 16:35:54 2013 +0200 msodraw: fix dumping of ShapeBooleanProperties diff --git a/src/msodraw.py b/src/msodraw.py index 79e27fc..fa60a8f 100644 --- a/src/msodraw.py +++ b/src/msodraw.py @@ -573,62 +573,64 @@ class FOPT: class ShapeBooleanProperties: +# The order of the members is in the opposite order in the spec, but +# this seems to be the reality. memberNames = [ +'fBackground', +'reserved1', +'fInitiator', +'fLockShapeType', +'fPreferRelativeResize', +'fOleIcon', +'fFlipVOverride', +'fFlipHOverride', +'fPolicyBarcode', +'fPolicyLabel', 'unused1', 'unused2', 'unused3', -'fUsefPolicyLabel', -'fUsefPolicyBarcode', -'fUsefFlipHOverride', -'fUsefFlipVOverride', -'fUsefOleIcon', -'fUsefPreferRelativeResize', -'fUsefLockShapeType', -'fUsefInitiator', -'unused4', 'fUsefBackground', +'unused4', +'fUsefInitiator', +'fUsefLockShapeType', +'fusePreferrelativeResize', +'fUsefOleIcon', +'fUsefFlipVOverride', +'fUsefFlipHOverride', +'fUsefPolicyBarcode', +'fUsefPolicyLabel', 'unused5', 'unused6', 'unused7', -'fPolicyLabel', -'fPolicyBarcode', -'fFlipHOverride', -'fFlipVOverride', -'fOleIcon', -'fPreferRelativeResize', -'fLockShapeType', -'fInitiator', -'reserved1', -'fBackground' ] def __parseBytes(self, buf): -self.unused1 =buf 0x000f # 1..4th bits -self.unused2 = (buf 0x0010) 4 # 5th bit -self.unused3 = (buf 0x0020) 5 # 6th bit -self.fUsefPolicyLabel = (buf 0x0040) 6 # 7th bit -self.fUsefPolicyBarcode =(buf 0x0080) 7 # 8th bit -self.fUsefFlipHOverride =(buf 0x0100) 8 # 9th bit -self.fUsefFlipVOverride =(buf 0x0200) 9 # 10th bit -self.fUsefOleIcon = (buf 0x0400) 10 # 11th bit -self.fUsefPreferRelativeResize = (buf 0x0800) 11 # 12th bit -self.fUsefLockShapeType =(buf 0x1000) 12 # 13th bit -self.fUsefInitiator =(buf 0x2000) 13 # 14th bit -self.unused4 = (buf 0x4000) 14 # 15th bit -self.fUsefBackground = (buf 0x8000) 15 # 16th bit -self.unused5 = (buf 0x000f) 16 # 17..20th bits -self.unused6 = (buf 0x0010) 20 # 21th bit -self.unused7 = (buf 0x0020) 21 # 22th bit -self.fPolicyLabel = (buf 0x0040) 22 # 23th bit -self.fPolicyBarcode =(buf 0x0080) 23 # 24th bit -self.fFlipHOverride =(buf 0x0100) 24 # 25th bit -self.fFlipVOverride =(buf 0x0200) 25 # 26th bit -self.fOleIcon = (buf 0x0400) 26 # 27th bit -self.fPreferRelativeResize = (buf 0x0800) 27 # 28th bit -self.fLockShapeType =(buf 0x1000) 28 # 29th bit -self.fInitiator =(buf 0x2000) 29 # 30th bit -self.reserved1 = (buf 0x4000) 30 # 31th bit -self.fBackground = (buf 0x8000) 31 # 32th bit +self.fBackground = buf 0x0001 # 1st bit +self.reserved1 = (buf 0x0002) 1 # 2nd bit +self.fInitiator = (buf 0x0004) 2 # 3rd bit +self.fLockShapeType = (buf 0x0008) 3 # 4th bit +self.fPreferRelativeResize = (buf 0x0010) 4 # 5th bit +self.fOleIcon = (buf 0x0020) 5 # 6th bit +self.fFlipVOverride = (buf 0x0040) 6 # 7th bit +self.fFlipHOverride = (buf 0x0080) 7 # 8th bit +self.fPolicyBarcode = (buf 0x0100) 8 # 9th bit +self.fPolicyLabel = (buf 0x0200) 9 # 10th bit +self.unused1 =(buf 0x0400) 10 # 11th
[Libreoffice-commits] core.git: mdds/0001-Fix-it-here-too.patch
mdds/0001-Fix-it-here-too.patch | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 9aafef1baea2cbdd73fa0c1f0a33684ac9f35216
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Jun 25 16:47:35 2013 +0200
one more fix for mdds with msvc
Change-Id: I49dfc1b3efcd00547764159fc9ce3dcc1339f7d2
diff --git a/mdds/0001-Fix-it-here-too.patch b/mdds/0001-Fix-it-here-too.patch
index 9884ff0..5f99a3d 100644
--- a/mdds/0001-Fix-it-here-too.patch
+++ b/mdds/0001-Fix-it-here-too.patch
@@ -21,6 +21,16 @@ index 685899b..cea8ae0 100644
block* blk = m_blocks[block_index+1];
blk-mp_data = dst_data.release();
}
+@@ -2713,8 +2713,7 @@
+ else
+ {
+ // Insert a new block to store the new elements.
+-m_blocks.insert(m_blocks.begin()+dst_index+1, NULL);
+-m_blocks[dst_index+1] = new block(len);
++m_blocks.insert(m_blocks.begin()+dst_index+1, new block(len));
+ blk = m_blocks[dst_index+1];
+ blk-mp_data = element_block_func::create_new_block(cat_src, 0);
+ assert(blk-mp_data);
--
1.8.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch mdds/0001-Fix-it-here-too.patch mdds/UnpackedTar
mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch | 27 ++
mdds/0001-Fix-it-here-too.patch | 26 ++
mdds/UnpackedTarball_mdds.mk |2
sc/qa/unit/ucalc.cxx | 122
+++---
sc/source/core/data/dociter.cxx |6
5 files changed, 145 insertions(+), 38 deletions(-)
New commits:
commit 1efd0a6a1db0414bc4929865fc6e282cabacab8d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 11:06:43 2013 -0400
The horizontal cell iterator was *still* broken. Let's fix it again.
And add a test for it.
Change-Id: If76a67e02ac6ad5199d664850bd8591bd3032f32
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b29a89e..462087a4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -404,6 +404,12 @@ void printRange(ScDocument* pDoc, const ScRange rRange,
const char* pCaption)
templatesize_t _Size
ScRange insertRangeData(ScDocument* pDoc, const ScAddress rPos, const char*
aData[][_Size], size_t nRowCount)
{
+ScRange aRange(rPos);
+aRange.aEnd.SetCol(rPos.Col()+_Size-1);
+aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
+
+clearRange(pDoc, aRange);
+
for (size_t i = 0; i _Size; ++i)
{
for (size_t j = 0; j nRowCount; ++j)
@@ -417,9 +423,6 @@ ScRange insertRangeData(ScDocument* pDoc, const ScAddress
rPos, const char* aDa
}
}
-ScRange aRange(rPos);
-aRange.aEnd.SetCol(rPos.Col()+_Size-1);
-aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
printRange(pDoc, aRange, Range data content);
return aRange;
}
@@ -1785,48 +1788,97 @@ void Test::testVolatileFunc()
m_pDoc-DeleteTab(0);
}
-void Test::testHorizontalIterator()
-{
-m_pDoc-InsertTab(0, test);
+namespace {
-// Raw data
-const char* aData[][2] = {
-{ A, B },
-{ C, 1 },
-{ D, 2 },
-{ E, 3 }
-};
+struct HoriIterCheck
+{
+SCCOL nCol;
+SCROW nRow;
+const char* pVal;
+};
+templatesize_t _Size
+bool checkHorizontalIterator(ScDocument* pDoc, const char* pData[][_Size],
size_t nDataCount, const HoriIterCheck* pChecks, size_t nCheckCount)
+{
ScAddress aPos(0,0,0);
-insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData));
-ScHorizontalCellIterator aIter(m_pDoc, 0, 0, 0, 1, SAL_N_ELEMENTS(aData));
-
-struct {
-SCCOL nCol;
-SCROW nRow;
-const char* pVal;
-} aChecks[] = {
-{ 0, 0, A },
-{ 1, 0, B },
-{ 0, 1, C },
-{ 1, 1, 1 },
-{ 0, 2, D },
-{ 1, 2, 2 },
-{ 0, 3, E },
-{ 1, 3, 3 },
-};
+insertRangeData(pDoc, aPos, pData, nDataCount);
+ScHorizontalCellIterator aIter(pDoc, 0, 0, 0, 1, nDataCount-1);
SCCOL nCol;
SCROW nRow;
-size_t i = 0, n = SAL_N_ELEMENTS(aChecks);
+size_t i = 0;
for (ScRefCellValue* pCell = aIter.GetNext(nCol, nRow); pCell; pCell =
aIter.GetNext(nCol, nRow), ++i)
{
-if (i = n)
+if (i = nCheckCount)
CPPUNIT_FAIL(Iterator claims there is more data than there should
be.);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nCol, nCol);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nRow, nRow);
-CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(aChecks[i].pVal),
pCell-getString());
+if (pChecks[i].nCol != nCol)
+return false;
+
+if (pChecks[i].nRow != nRow)
+return false;
+
+if (OUString::createFromAscii(pChecks[i].pVal) != pCell-getString())
+return false;
+}
+
+return true;
+}
+
+}
+
+void Test::testHorizontalIterator()
+{
+m_pDoc-InsertTab(0, test);
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 1 },
+{ D, 2 },
+{ E, 3 }
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 1, 1, 1 },
+{ 0, 2, D },
+{ 1, 2, 2 },
+{ 0, 3, E },
+{ 1, 3, 3 },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 1.);
+}
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 0 },
+{ D, E },
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 0, 2, D },
+{ 1, 2, E },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 2.);
}
m_pDoc-DeleteTab(0);
diff --git
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc.cxx| 122
sc/source/core/data/dociter.cxx |6 -
2 files changed, 90 insertions(+), 38 deletions(-)
New commits:
commit f9704bf73dfba50421132e5379165912a2779906
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 11:06:43 2013 -0400
The horizontal cell iterator was *still* broken. Let's fix it again.
And add a test for it.
Change-Id: If76a67e02ac6ad5199d664850bd8591bd3032f32
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b29a89e..462087a4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -404,6 +404,12 @@ void printRange(ScDocument* pDoc, const ScRange rRange,
const char* pCaption)
templatesize_t _Size
ScRange insertRangeData(ScDocument* pDoc, const ScAddress rPos, const char*
aData[][_Size], size_t nRowCount)
{
+ScRange aRange(rPos);
+aRange.aEnd.SetCol(rPos.Col()+_Size-1);
+aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
+
+clearRange(pDoc, aRange);
+
for (size_t i = 0; i _Size; ++i)
{
for (size_t j = 0; j nRowCount; ++j)
@@ -417,9 +423,6 @@ ScRange insertRangeData(ScDocument* pDoc, const ScAddress
rPos, const char* aDa
}
}
-ScRange aRange(rPos);
-aRange.aEnd.SetCol(rPos.Col()+_Size-1);
-aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
printRange(pDoc, aRange, Range data content);
return aRange;
}
@@ -1785,48 +1788,97 @@ void Test::testVolatileFunc()
m_pDoc-DeleteTab(0);
}
-void Test::testHorizontalIterator()
-{
-m_pDoc-InsertTab(0, test);
+namespace {
-// Raw data
-const char* aData[][2] = {
-{ A, B },
-{ C, 1 },
-{ D, 2 },
-{ E, 3 }
-};
+struct HoriIterCheck
+{
+SCCOL nCol;
+SCROW nRow;
+const char* pVal;
+};
+templatesize_t _Size
+bool checkHorizontalIterator(ScDocument* pDoc, const char* pData[][_Size],
size_t nDataCount, const HoriIterCheck* pChecks, size_t nCheckCount)
+{
ScAddress aPos(0,0,0);
-insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData));
-ScHorizontalCellIterator aIter(m_pDoc, 0, 0, 0, 1, SAL_N_ELEMENTS(aData));
-
-struct {
-SCCOL nCol;
-SCROW nRow;
-const char* pVal;
-} aChecks[] = {
-{ 0, 0, A },
-{ 1, 0, B },
-{ 0, 1, C },
-{ 1, 1, 1 },
-{ 0, 2, D },
-{ 1, 2, 2 },
-{ 0, 3, E },
-{ 1, 3, 3 },
-};
+insertRangeData(pDoc, aPos, pData, nDataCount);
+ScHorizontalCellIterator aIter(pDoc, 0, 0, 0, 1, nDataCount-1);
SCCOL nCol;
SCROW nRow;
-size_t i = 0, n = SAL_N_ELEMENTS(aChecks);
+size_t i = 0;
for (ScRefCellValue* pCell = aIter.GetNext(nCol, nRow); pCell; pCell =
aIter.GetNext(nCol, nRow), ++i)
{
-if (i = n)
+if (i = nCheckCount)
CPPUNIT_FAIL(Iterator claims there is more data than there should
be.);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nCol, nCol);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nRow, nRow);
-CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(aChecks[i].pVal),
pCell-getString());
+if (pChecks[i].nCol != nCol)
+return false;
+
+if (pChecks[i].nRow != nRow)
+return false;
+
+if (OUString::createFromAscii(pChecks[i].pVal) != pCell-getString())
+return false;
+}
+
+return true;
+}
+
+}
+
+void Test::testHorizontalIterator()
+{
+m_pDoc-InsertTab(0, test);
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 1 },
+{ D, 2 },
+{ E, 3 }
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 1, 1, 1 },
+{ 0, 2, D },
+{ 1, 2, 2 },
+{ 0, 3, E },
+{ 1, 3, 3 },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 1.);
+}
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 0 },
+{ D, E },
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 0, 2, D },
+{ 1, 2, E },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 2.);
}
m_pDoc-DeleteTab(0);
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index b5c36b8..5076569 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1787,9 +1787,6 @@ void ScHorizontalCellIterator::Advance()
if (r.maPos == r.maEnd)
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/Library_cui.mk cui/source
cui/Library_cui.mk|1 +
cui/source/options/optaboutconfig.cxx |7 +--
cui/source/options/optaboutconfig.hxx |8 +---
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 36abcf55e73766f9230fb114e72a4b1fec65cfea
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Tue Jun 25 18:03:57 2013 +0300
Module is compileable again.
Fixed a few more mistakes which makes cui uncompileable. Files added
to Library_cui.mk.
Change-Id: I4b24c007beeae40449d7102a2656a6446abd25a5
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index fc27d59..984febb 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/doclinkdialog \
cui/source/options/fontsubs \
cui/source/options/internationaloptions \
+ cui/source/options/optaboutconfig \
cui/source/options/optaccessibility \
cui/source/options/optasian \
cui/source/options/optchart \
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index e96829c..55870f9 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -8,14 +8,17 @@
*/
#include optaboutconfig.hxx
+#include optHeaderTabListbox.hxx
+
+using namespace svx;
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet rItemSet )
-:SfxTabPage( pParent, AboutConfig, cui/ui/optaboutconfigdialog.ui)
+:SfxTabPage( pParent, AboutConfig, cui/ui/optaboutconfigdialog.ui,
rItemSet)
{
//get(m_pEditBtn, );
WinBits nBits = WB_SCROLL | WB_SORT;
-pPrefBox = new OptHeaderTabListBox( pPrefCtrl, nbits );
+pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
}
CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 3d7859d..e0d8815 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -8,11 +8,13 @@
*/
#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
-#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
+#define INCLUDED_CUI_OPTABOUTCONFIG_HXX
+#include sfx2/tabdlg.hxx
#include svx/simptabl.hxx
+#include optHeaderTabListbox.hxx
-namespace cui
+namespace svx
{
class OptHeaderTabListBox;
}
@@ -26,7 +28,7 @@ private:
//PushButton* m_pDefaultBtn
PushButton* m_pEditBtn;
-::cui::OptHeaderTabListBox* pPrefBox;
+::svx::OptHeaderTabListBox* pPrefBox;
public:
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet rItemSet );
~CuiAboutConfigTabPage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12 +
sc/inc/calcconfig.hxx|1
sc/source/core/data/documen9.cxx |7
sc/source/core/tool/calcconfig.cxx |8
sc/source/core/tool/formulaopt.cxx | 16 +
sc/source/ui/optdlg/calcoptionsdlg.cxx | 123 ---
sc/source/ui/optdlg/calcoptionsdlg.hrc |3
sc/source/ui/optdlg/calcoptionsdlg.hxx |5
sc/source/ui/optdlg/calcoptionsdlg.src | 12 +
9 files changed, 131 insertions(+), 56 deletions(-)
New commits:
commit 26a45c1886d9167d8f9ae9aad6234a3702768d8a
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jun 25 13:38:22 2013 +0100
cleanup options dialog, and add an option for formula grouping.
Change-Id: I3cb19fb24028bc07d24b56786b6573dc79911bda
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 8ee1809..b396438 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1318,6 +1318,18 @@
info
descContains settings that affect formula handling./desc
/info
+ group oor:name=Calculation
+info
+ descContains settings for how to calculate formulae./desc
+/info
+prop oor:name=OpenCL oor:type=xs:boolean oor:nillable=false
+ !-- UIHints: Tools - Options Spreadsheet Formula --
+ info
+descWhether to use OpenCL for formula computation, if
available./desc
+ /info
+ valuefalse/value
+/prop
+ /group
group oor:name=Syntax
info
descContains settings for formula syntax./desc
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 96eabcc..aace08d 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -28,6 +28,7 @@ struct SC_DLLPUBLIC ScCalcConfig
{
formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax;
bool mbEmptyStringAsZero:1;
+bool mbOpenCLEnabled:1;
ScCalcConfig();
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d081379..525f12d 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -52,6 +52,7 @@
#include editutil.hxx
#include postit.hxx
#include charthelper.hxx
+#include interpre.hxx
using namespace ::com::sun::star;
#include stdio.h
@@ -689,9 +690,11 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter rEngine )
void ScDocument::RebuildFormulaGroups()
{
-static const char *pEnableFormulaGroups = getenv(SC_FORMULAGROUP);
+bool bEnableFormulaGroups;
-if ( !pEnableFormulaGroups )
+bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
+
+if ( !bEnableFormulaGroups )
return;
SCTAB nTab;
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index c85ddf2..ed93f64 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -14,7 +14,10 @@
ScCalcConfig::ScCalcConfig() :
meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED),
-mbEmptyStringAsZero(false) {}
+mbEmptyStringAsZero(false),
+mbOpenCLEnabled(false)
+{
+}
void ScCalcConfig::reset()
{
@@ -24,7 +27,8 @@ void ScCalcConfig::reset()
bool ScCalcConfig::operator== (const ScCalcConfig r) const
{
return meStringRefAddressSyntax == r.meStringRefAddressSyntax
-mbEmptyStringAsZero == r.mbEmptyStringAsZero;
+ mbEmptyStringAsZero == r.mbEmptyStringAsZero
+ mbOpenCLEnabled == r.mbOpenCLEnabled;
}
bool ScCalcConfig::operator!= (const ScCalcConfig r) const
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index df9e69a..db35f93 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -204,7 +204,8 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
#define SCFORMULAOPT_EMPTY_STRING_AS_ZERO 6
#define SCFORMULAOPT_OOXML_RECALC 7
#define SCFORMULAOPT_ODF_RECALC 8
-#define SCFORMULAOPT_COUNT9
+#define SCFORMULAOPT_OPENCL_ENABLED 9
+#define SCFORMULAOPT_COUNT 10
SequenceOUString ScFormulaCfg::GetPropertyNames()
{
@@ -219,6 +220,7 @@ SequenceOUString ScFormulaCfg::GetPropertyNames()
Syntax/EmptyStringAsZero, // SCFORMULAOPT_EMPTY_STRING_AS_ZERO
Load/OOXMLRecalcMode, // SCFORMULAOPT_OOXML_RECALC
Load/ODFRecalcMode,// SCFORMULAOPT_ODF_RECALC
+Calculation/OpenCL // SCFORMULAOPT_OPENCL_ENABLED
};
SequenceOUString aNames(SCFORMULAOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -390,6 +392,12 @@
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - mdds/0001-Fix-it-here-too.patch
mdds/0001-Fix-it-here-too.patch | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit f77744e5ef9a3855c07b559077b51c5456999738
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Jun 25 16:47:35 2013 +0200
one more fix for mdds with msvc
Change-Id: I49dfc1b3efcd00547764159fc9ce3dcc1339f7d2
diff --git a/mdds/0001-Fix-it-here-too.patch b/mdds/0001-Fix-it-here-too.patch
index 9884ff0..5f99a3d 100644
--- a/mdds/0001-Fix-it-here-too.patch
+++ b/mdds/0001-Fix-it-here-too.patch
@@ -21,6 +21,16 @@ index 685899b..cea8ae0 100644
block* blk = m_blocks[block_index+1];
blk-mp_data = dst_data.release();
}
+@@ -2713,8 +2713,7 @@
+ else
+ {
+ // Insert a new block to store the new elements.
+-m_blocks.insert(m_blocks.begin()+dst_index+1, NULL);
+-m_blocks[dst_index+1] = new block(len);
++m_blocks.insert(m_blocks.begin()+dst_index+1, new block(len));
+ blk = m_blocks[dst_index+1];
+ blk-mp_data = element_block_func::create_new_block(cat_src, 0);
+ assert(blk-mp_data);
--
1.8.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 4 commits - mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch mdds/0001-Fix-it-here-too.patch mdds/Unpacked
mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch | 27 ++
mdds/0001-Fix-it-here-too.patch | 36 ++
mdds/UnpackedTarball_mdds.mk |2
sc/qa/unit/ucalc.cxx | 122
+++---
sc/source/core/data/dociter.cxx |6
5 files changed, 155 insertions(+), 38 deletions(-)
New commits:
commit 0cb19d943fc54684a6d4bb4da0e2c9008fde098a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 11:06:43 2013 -0400
The horizontal cell iterator was *still* broken. Let's fix it again.
And add a test for it.
Change-Id: If76a67e02ac6ad5199d664850bd8591bd3032f32
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2934a59..302890b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -384,6 +384,12 @@ void printRange(ScDocument* pDoc, const ScRange rRange,
const char* pCaption)
templatesize_t _Size
ScRange insertRangeData(ScDocument* pDoc, const ScAddress rPos, const char*
aData[][_Size], size_t nRowCount)
{
+ScRange aRange(rPos);
+aRange.aEnd.SetCol(rPos.Col()+_Size-1);
+aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
+
+clearRange(pDoc, aRange);
+
for (size_t i = 0; i _Size; ++i)
{
for (size_t j = 0; j nRowCount; ++j)
@@ -397,9 +403,6 @@ ScRange insertRangeData(ScDocument* pDoc, const ScAddress
rPos, const char* aDa
}
}
-ScRange aRange(rPos);
-aRange.aEnd.SetCol(rPos.Col()+_Size-1);
-aRange.aEnd.SetRow(rPos.Row()+nRowCount-1);
printRange(pDoc, aRange, Range data content);
return aRange;
}
@@ -1721,48 +1724,97 @@ void Test::testVolatileFunc()
m_pDoc-DeleteTab(0);
}
-void Test::testHorizontalIterator()
-{
-m_pDoc-InsertTab(0, test);
+namespace {
-// Raw data
-const char* aData[][2] = {
-{ A, B },
-{ C, 1 },
-{ D, 2 },
-{ E, 3 }
-};
+struct HoriIterCheck
+{
+SCCOL nCol;
+SCROW nRow;
+const char* pVal;
+};
+templatesize_t _Size
+bool checkHorizontalIterator(ScDocument* pDoc, const char* pData[][_Size],
size_t nDataCount, const HoriIterCheck* pChecks, size_t nCheckCount)
+{
ScAddress aPos(0,0,0);
-insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData));
-ScHorizontalCellIterator aIter(m_pDoc, 0, 0, 0, 1, SAL_N_ELEMENTS(aData));
-
-struct {
-SCCOL nCol;
-SCROW nRow;
-const char* pVal;
-} aChecks[] = {
-{ 0, 0, A },
-{ 1, 0, B },
-{ 0, 1, C },
-{ 1, 1, 1 },
-{ 0, 2, D },
-{ 1, 2, 2 },
-{ 0, 3, E },
-{ 1, 3, 3 },
-};
+insertRangeData(pDoc, aPos, pData, nDataCount);
+ScHorizontalCellIterator aIter(pDoc, 0, 0, 0, 1, nDataCount-1);
SCCOL nCol;
SCROW nRow;
-size_t i = 0, n = SAL_N_ELEMENTS(aChecks);
+size_t i = 0;
for (ScRefCellValue* pCell = aIter.GetNext(nCol, nRow); pCell; pCell =
aIter.GetNext(nCol, nRow), ++i)
{
-if (i = n)
+if (i = nCheckCount)
CPPUNIT_FAIL(Iterator claims there is more data than there should
be.);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nCol, nCol);
-CPPUNIT_ASSERT_EQUAL(aChecks[i].nRow, nRow);
-CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(aChecks[i].pVal),
pCell-getString());
+if (pChecks[i].nCol != nCol)
+return false;
+
+if (pChecks[i].nRow != nRow)
+return false;
+
+if (OUString::createFromAscii(pChecks[i].pVal) != pCell-getString())
+return false;
+}
+
+return true;
+}
+
+}
+
+void Test::testHorizontalIterator()
+{
+m_pDoc-InsertTab(0, test);
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 1 },
+{ D, 2 },
+{ E, 3 }
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 1, 1, 1 },
+{ 0, 2, D },
+{ 1, 2, 2 },
+{ 0, 3, E },
+{ 1, 3, 3 },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 1.);
+}
+
+{
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 0 },
+{ D, E },
+};
+
+HoriIterCheck aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 0, 2, D },
+{ 1, 2, E },
+};
+
+bool bRes = checkHorizontalIterator(
+m_pDoc, aData, SAL_N_ELEMENTS(aData), aChecks,
SAL_N_ELEMENTS(aChecks));
+
+if (!bRes)
+CPPUNIT_FAIL(Failed on test 2.);
}
m_pDoc-DeleteTab(0);
diff --git
[Libreoffice-commits] dev-tools.git: scripts/tpconv.py
scripts/tpconv.py | 50 ++
1 file changed, 50 insertions(+)
New commits:
commit 5b3b00828609e79a0603b99ddd6d64be3089f7e0
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 25 17:43:38 2013 +0200
import tpconv
Change-Id: Iba30b32fbbb9011f81dc80e3c36237b492a692b5
diff --git a/scripts/tpconv.py b/scripts/tpconv.py
new file mode 100755
index 000..a9e7bd1
--- /dev/null
+++ b/scripts/tpconv.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#
+# 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/.
+#
+
+import re
+import sys
+
+# Inspired by http://www.unitconversion.org/unit_converter/typography.html
+#
+# Additionally:
+# - supports UNO API's mm100 by default
+# - supports OOXML's EMU by default
+# - possible to extend
+
+conv = {
+'inch': 914400, # there are 914,400 EMUs per inch
+'point': 914400/72, # EMU / point
+'twip': 914400/72/20, # EMU / twip
+
+'m': 360*10, # EMU / m
+'cm': 360*1000, # EMU is defined as 1/360,000 of a centimeter
+'mm': 360*100, # EMU / mm
+'mm100': 360, # EMU / mm100
+
+'emu': 1, # EMU / EMU
+}
+
+def convert(amount, fro, to):
+# convert to EMU
+emu = amount * conv[re.sub(s$, , fro)]
+return emu / conv[re.sub(s$, , to)]
+
+def main(args):
+try:
+amount = float(args[1])
+fro = args[2]
+to = args[4]
+except IndexError:
+print usage: tpconv amount from in to
+return
+
+print convert(amount, fro, to)
+
+if __name__ == '__main__':
+main(sys.argv)
+
+# vim:set filetype=python 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: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/dociter.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit fbc67f736ba39c43d6a2320c074e1e96af896b29
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 11:54:10 2013 -0400
Move a common if statement into the function.
Change-Id: Ic13c9e7bdfea97c4f7782181dc70d6965ba0b6b9
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 032362b..9c92fc8 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1762,6 +1762,10 @@ namespace {
bool advanceBlock(size_t nRow, sc::CellStoreType::const_iterator rPos, const
sc::CellStoreType::const_iterator rEnd)
{
+if (nRow rPos-position + rPos-size)
+// Block already contains the specified row. Nothing to do.
+return true;
+
// This block is behind the current row position. Advance the block.
for (++rPos; rPos != rEnd; ++rPos)
{
@@ -1789,9 +1793,8 @@ void ScHorizontalCellIterator::Advance()
if (nRow r.maPos-position)
continue;
-if (r.maPos-position + r.maPos-size = nRow)
-if (!advanceBlock(nRow, r.maPos, r.maEnd))
-continue;
+if (!advanceBlock(nRow, r.maPos, r.maEnd))
+continue;
if (r.maPos-type == sc::element_type_empty)
continue;
@@ -1827,9 +1830,8 @@ void ScHorizontalCellIterator::Advance()
continue;
}
-if (r.maPos-position + r.maPos-size = nRow)
-if (!advanceBlock(nRow, r.maPos, r.maEnd))
-continue;
+if (!advanceBlock(nRow, r.maPos, r.maEnd))
+continue;
if (r.maPos-type == sc::element_type_empty)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12 +
sc/inc/calcconfig.hxx|1
sc/source/core/data/documen9.cxx |7
sc/source/core/tool/calcconfig.cxx |8
sc/source/core/tool/formulaopt.cxx | 16 +
sc/source/ui/optdlg/calcoptionsdlg.cxx | 123 ---
sc/source/ui/optdlg/calcoptionsdlg.hrc |3
sc/source/ui/optdlg/calcoptionsdlg.hxx |5
sc/source/ui/optdlg/calcoptionsdlg.src | 12 +
9 files changed, 131 insertions(+), 56 deletions(-)
New commits:
commit 38d3b909091db887688e6f178fa61e4654c0262a
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jun 25 13:38:22 2013 +0100
cleanup options dialog, and add an option for formula grouping.
Change-Id: I3cb19fb24028bc07d24b56786b6573dc79911bda
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 463b6e4..6f68b9d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1318,6 +1318,18 @@
info
descContains settings that affect formula handling./desc
/info
+ group oor:name=Calculation
+info
+ descContains settings for how to calculate formulae./desc
+/info
+prop oor:name=OpenCL oor:type=xs:boolean oor:nillable=false
+ !-- UIHints: Tools - Options Spreadsheet Formula --
+ info
+descWhether to use OpenCL for formula computation, if
available./desc
+ /info
+ valuefalse/value
+/prop
+ /group
group oor:name=Syntax
info
descContains settings for formula syntax./desc
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 96eabcc..aace08d 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -28,6 +28,7 @@ struct SC_DLLPUBLIC ScCalcConfig
{
formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax;
bool mbEmptyStringAsZero:1;
+bool mbOpenCLEnabled:1;
ScCalcConfig();
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 0177c78..f4b2258 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -52,6 +52,7 @@
#include editutil.hxx
#include postit.hxx
#include charthelper.hxx
+#include interpre.hxx
using namespace ::com::sun::star;
#include stdio.h
@@ -697,9 +698,11 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter rEngine )
void ScDocument::RebuildFormulaGroups()
{
-static const char *pEnableFormulaGroups = getenv(SC_FORMULAGROUP);
+bool bEnableFormulaGroups;
-if ( !pEnableFormulaGroups )
+bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
+
+if ( !bEnableFormulaGroups )
return;
SCTAB nTab;
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index c85ddf2..ed93f64 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -14,7 +14,10 @@
ScCalcConfig::ScCalcConfig() :
meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED),
-mbEmptyStringAsZero(false) {}
+mbEmptyStringAsZero(false),
+mbOpenCLEnabled(false)
+{
+}
void ScCalcConfig::reset()
{
@@ -24,7 +27,8 @@ void ScCalcConfig::reset()
bool ScCalcConfig::operator== (const ScCalcConfig r) const
{
return meStringRefAddressSyntax == r.meStringRefAddressSyntax
-mbEmptyStringAsZero == r.mbEmptyStringAsZero;
+ mbEmptyStringAsZero == r.mbEmptyStringAsZero
+ mbOpenCLEnabled == r.mbOpenCLEnabled;
}
bool ScCalcConfig::operator!= (const ScCalcConfig r) const
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index 8e5caea..063deb9 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -204,7 +204,8 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
#define SCFORMULAOPT_EMPTY_STRING_AS_ZERO 6
#define SCFORMULAOPT_OOXML_RECALC 7
#define SCFORMULAOPT_ODF_RECALC 8
-#define SCFORMULAOPT_COUNT9
+#define SCFORMULAOPT_OPENCL_ENABLED 9
+#define SCFORMULAOPT_COUNT 10
SequenceOUString ScFormulaCfg::GetPropertyNames()
{
@@ -219,6 +220,7 @@ SequenceOUString ScFormulaCfg::GetPropertyNames()
Syntax/EmptyStringAsZero, // SCFORMULAOPT_EMPTY_STRING_AS_ZERO
Load/OOXMLRecalcMode, // SCFORMULAOPT_OOXML_RECALC
Load/ODFRecalcMode,// SCFORMULAOPT_ODF_RECALC
+Calculation/OpenCL // SCFORMULAOPT_OPENCL_ENABLED
};
SequenceOUString aNames(SCFORMULAOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -390,6 +392,12 @@
[Libreoffice-commits] mso-dumper.git: src/docrecord.py src/docstream.py
src/docrecord.py |1 -
src/docstream.py |3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c8a02ce6baad0b4e99c1eeb451ca1246eec9ae2c
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 25 18:03:46 2013 +0200
Don't crash on abi13064-1.doc
http://bugzilla.abisource.com/show_bug.cgi?id=13064 says it's corrupted
anyway, so just make the code not crash on it.
diff --git a/src/docrecord.py b/src/docrecord.py
index c747d91..87ece9d 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -3194,7 +3194,6 @@ class SttbListNames(DOCDirStream):
print 'string value=%s/' %
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'),
lowOnly = True)
self.pos += 2*cchData
print '/cchData'
-assert self.pos == self.mainStream.fcSttbListNames + self.size
print '/sttbListNames'
class SttbSavedBy(DOCDirStream):
diff --git a/src/docstream.py b/src/docstream.py
index cc0766b..398207c 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -952,6 +952,9 @@ class WordDocumentStream(DOCDirStream):
def retrieveCPs(self, start, end):
Retrieves a range of characters.
+if not len(self.clx.pcdt.plcPcd.aPcd):
+print 'info what=clx.pcdt.plcPcd.aPcd is empty, probably
corrupted document/'
+return
ret = []
i = start
while i end:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc
sw/inc/swtblfmt.hxx | 89 +---
1 file changed, 84 insertions(+), 5 deletions(-)
New commits:
commit f5beea954e1cfe38de9608c6fb8431b1c67f10e5
Author: Alex Ivan alexni...@yahoo.com
Date: Tue Jun 25 18:44:36 2013 +0300
Add structure for format classes
SwTableFmt now stores data about the lines/columns.
These, in turn, store information about the boxes.
Not yet integrated with the current implementation.
Change-Id: Ibc936f68c20905fca1cd636977eb47850eb0faa9
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index a54faa49..76c6311 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -22,6 +22,8 @@
#include frmfmt.hxx
class SwDoc;
+class SwTableLineFmt;
+class SwTableBoxFmt;
class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
{
@@ -31,14 +33,64 @@ protected:
SwTableFmt( SwAttrPool rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-{}
+{
+pFstLineFmt = NULL;
+pLstLineFmt = NULL;
+pOddLineFmt = NULL;
+pEvnLineFmt = NULL;
+
+pFstColFmt = NULL;
+pLstColFmt = NULL;
+pOddColFmt = NULL;
+pEvnColFmt = NULL;
+}
SwTableFmt( SwAttrPool rPool, const String rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-{}
-
+{
+pFstLineFmt = NULL;
+pLstLineFmt = NULL;
+pOddLineFmt = NULL;
+pEvnLineFmt = NULL;
+
+pFstColFmt = NULL;
+pLstColFmt = NULL;
+pOddColFmt = NULL;
+pEvnColFmt = NULL;
+}
+
+SwTableLineFmt* pFstLineFmt;
+SwTableLineFmt* pLstLineFmt;
+SwTableLineFmt* pOddLineFmt;
+SwTableLineFmt* pEvnLineFmt;
+
+SwTableLineFmt* pFstColFmt;
+SwTableLineFmt* pLstColFmt;
+SwTableLineFmt* pOddColFmt;
+SwTableLineFmt* pEvnColFmt;
public:
+
+void SetFirstLineFmt( SwTableLineFmt* pNew ) { pFstLineFmt = pNew; }
+void SetLastLineFmt( SwTableLineFmt* pNew ) { pLstLineFmt = pNew; }
+void SetOddLineFmt( SwTableLineFmt* pNew ) { pOddLineFmt = pNew; }
+void SetEvenLineFmt( SwTableLineFmt* pNew ) { pEvnLineFmt = pNew; }
+
+void SetFirstColFmt( SwTableLineFmt* pNew ) { pFstColFmt = pNew; }
+void SetLastColFmt( SwTableLineFmt* pNew ) { pLstColFmt = pNew; }
+void SetOddColFmt( SwTableLineFmt* pNew ) { pOddColFmt = pNew; }
+void SetEvenColFmt( SwTableLineFmt* pNew ) { pEvnColFmt = pNew; }
+
+SwTableLineFmt* GetFirstLineFmt() { return pFstLineFmt; }
+SwTableLineFmt* GetLastLineFmt() { return pLstLineFmt; }
+SwTableLineFmt* GetOddLineFmt() { return pOddLineFmt; }
+SwTableLineFmt* GetEvenLineFmt() { return pEvnLineFmt; }
+
+SwTableLineFmt* GetFirstColFmt() { return pFstColFmt; }
+SwTableLineFmt* GetLastColFmt() { return pLstColFmt; }
+SwTableLineFmt* GetOddColFmt() { return pOddColFmt; }
+SwTableLineFmt* GetEvenColFmt() { return pEvnColFmt; }
+
TYPEINFO(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
@@ -52,13 +104,40 @@ protected:
SwTableLineFmt( SwAttrPool rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
-{}
+{
+pFstBoxFmt = NULL;
+pLstBoxFmt = NULL;
+pOddBoxFmt = NULL;
+pEvnBoxFmt = NULL;
+}
SwTableLineFmt( SwAttrPool rPool, const String rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
-{}
+{
+pFstBoxFmt = NULL;
+pLstBoxFmt = NULL;
+pOddBoxFmt = NULL;
+pEvnBoxFmt = NULL;
+}
+
+// Odd and Even Box formats will be used to handle alternating columns
+SwTableBoxFmt* pFstBoxFmt;
+SwTableBoxFmt* pLstBoxFmt;
+SwTableBoxFmt* pOddBoxFmt;
+SwTableBoxFmt* pEvnBoxFmt;
public:
+
+void SetFirstBoxFmt( SwTableBoxFmt* pNew ) { pFstBoxFmt = pNew; }
+void SetLastBoxFmt( SwTableBoxFmt* pNew ) { pLstBoxFmt = pNew; }
+void SetOddBoxFmt( SwTableBoxFmt* pNew ) { pOddBoxFmt = pNew; }
+void SetEvenBoxFmt( SwTableBoxFmt* pNew ) { pEvnBoxFmt = pNew; }
+
+SwTableBoxFmt* GetFirstBoxFmt() { return pFstBoxFmt; }
+SwTableBoxFmt* GetLastBoxFmt() { return pLstBoxFmt; }
+SwTableBoxFmt* GetOddBoxFmt() { return pOddBoxFmt; }
+SwTableBoxFmt* GetEvenBoxFmt() { return pEvnBoxFmt; }
+
TYPEINFO(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
___
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/data/table3.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit bd50bbe0c81a750b844f1c59ff3112fff6549704
Author: Wang Lei l...@apache.org
Date: Fri Jul 27 06:47:57 2012 +
Resolves: #i119637# Case sensitive in Special Filter dialog can not
work.
Patch by: Clarence GUO
Review by: Wang Lei
(cherry picked from commit 0f04f29fbc7c1f3700343304c01e8934b6dad45b)
Conflicts:
sc/source/core/data/table3.cxx
Change-Id: I7ffa7b82dc88b78982af2d5291f6c15b88a81c4c
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index e003aa7..03a0ca0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2014,7 +2014,6 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow
while (nCol = nCol2)
{
GetInputString( nCol, nRow, aCellStr );
-aCellStr = ScGlobal::pCharClass-uppercase(aCellStr);
if (!aCellStr.isEmpty())
{
if (nIndex nNewEntries)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0f/04f29fbc7c1f3700343304c01e8934b6dad45b
0f/04f29fbc7c1f3700343304c01e8934b6dad45b |1 + 1 file changed, 1 insertion(+) New commits: commit ee1f03d2ce069d9bc853c092329114a220a708eb Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 17:17:53 2013 +0100 Notes added by 'git notes add' diff --git a/0f/04f29fbc7c1f3700343304c01e8934b6dad45b b/0f/04f29fbc7c1f3700343304c01e8934b6dad45b new file mode 100644 index 000..0bd11d9 --- /dev/null +++ b/0f/04f29fbc7c1f3700343304c01e8934b6dad45b @@ -0,0 +1 @@ +merged as: bd50bbe0c81a750b844f1c59ff3112fff6549704 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx|2 ++
sc/inc/table.hxx |2 ++
sc/source/core/data/column3.cxx | 15 +++
sc/source/core/data/document.cxx | 18 ++
sc/source/core/data/table1.cxx |6 ++
5 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit 5873c22ed9b634b4b97d5932f305ae2f5e080b0d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 12:29:46 2013 -0400
Replace ScCellIterator with sc::ProcessFormula.
Change-Id: I0adf57e5e80972175633dd0c69d465544aa7d7a9
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 79c37fc..3cbd7b8 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -455,6 +455,8 @@ public:
void BroadcastCells( const std::vectorSCROW rRows );
void EndFormulaListening( sc::ColumnBlockPosition rBlockPos, SCROW nRow1,
SCROW nRow2 );
+void InterpretDirtyCells( SCROW nRow1, SCROW nRow2 );
+
private:
void CopyCellsInRangeToColumn(
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fe88f09..e945477 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -847,6 +847,8 @@ public:
void FillMatrix( ScMatrix rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2 ) const;
+void InterpretDirtyCells( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2 );
+
/** Replace behaves differently to the Search; adjust the rCol and rRow
accordingly.
'Replace' replaces at the 'current' position, but in order to achieve
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c85f914..16a4d0a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -115,6 +115,21 @@ void ScColumn::EndFormulaListening(
sc::ColumnBlockPosition rBlockPos, SCROW nR
sc::ProcessFormula(rBlockPos.miCellPos, maCells, nRow1, nRow2, aFunc);
}
+struct DirtyCellInterpreter
+{
+void operator() (size_t, ScFormulaCell* p)
+{
+if (p-GetDirty())
+p-Interpret();
+}
+};
+
+void ScColumn::InterpretDirtyCells( SCROW nRow1, SCROW nRow2 )
+{
+DirtyCellInterpreter aFunc;
+sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
+}
+
void ScColumn::Delete( SCROW nRow )
{
std::pairsc::CellStoreType::iterator,size_t aPos =
maCells.position(nRow);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f40e416..3ed67c3 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3482,20 +3482,22 @@ void ScDocument::SetTableOpDirty( const ScRange rRange
)
SetAutoCalc( bOldAutoCalc );
}
-
void ScDocument::InterpretDirtyCells( const ScRangeList rRanges )
{
+if (!GetAutoCalc())
+return;
+
for (size_t nPos=0, nRangeCount = rRanges.size(); nPos nRangeCount;
nPos++)
{
-ScCellIterator aIter( this, *rRanges[ nPos ] );
-for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
+const ScRange rRange = *rRanges[nPos];
+for (SCTAB nTab = rRange.aStart.Tab(); nTab = rRange.aEnd.Tab();
++nTab)
{
-if (aIter.getType() != CELLTYPE_FORMULA)
-continue;
+ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return;
-ScFormulaCell* p = aIter.getFormulaCell();
-if (p-GetDirty() GetAutoCalc())
-p-Interpret();
+pTab-InterpretDirtyCells(
+rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(),
rRange.aEnd.Row());
}
}
}
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index d3d26a8..2de23b1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2209,6 +2209,12 @@ void ScTable::FillMatrix( ScMatrix rMat, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2,
aCol[nCol].FillMatrix(rMat, nMatCol, nRow1, nRow2);
}
+void ScTable::InterpretDirtyCells( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2 )
+{
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+aCol[nCol].InterpretDirtyCells(nRow1, nRow2);
+}
+
const SvtBroadcaster* ScTable::GetBroadcaster( SCCOL nCol, SCROW nRow ) const
{
if (!ValidColRow(nCol, nRow))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/gsoc-impresslayout'
New branch 'feature/gsoc-impresslayout' available with the following commits: commit ca67297df1f85aed21f150c9824a7bbf12853ec8 Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com Date: Tue Jun 25 18:59:00 2013 +0530 Creation of XML parser function Updating the first working version of parser function readLayoutPropFromFile.And it parses information from XML file for layout AUTOLAYOUT_TITLE_2VTEXT. Change-Id: I24a52ae8c2b0c18ef806d9723d7eb6a7e43a20ec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/validat.hxx|1 -
sc/source/core/inc/interpre.hxx |1 -
sc/source/filter/xml/xmlexprt.cxx | 13 +
sc/source/ui/view/tabview4.cxx| 11 +--
4 files changed, 2 insertions(+), 24 deletions(-)
New commits:
commit 4f34a4019cc006adfad3332dd05b1c4025da12a2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 12:39:27 2013 -0400
Remove duplicate code blocks.
Change-Id: Ie014ec8866d9e3055a6e67bd20503fc6fc26f503
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 85737a3..904279a 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -29,7 +29,6 @@ namespace ValidListType =
::com::sun::star::sheet::TableValidationVisibility;
class ScPatternAttr;
class ScTokenArray;
class ScTypedStrData;
-class ScCellIterator;
enum ScValidationMode
{
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4c8dd4b..75947d6 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -49,7 +49,6 @@ struct ScComplexRefData;
class ScToken;
class ScJumpMatrix;
-class ScCellIterator;
struct ScRefCellValue;
#define MAXSTACK (4096 / sizeof(formula::FormulaToken*))
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 2b72e89..ac5d4b3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2052,18 +2052,7 @@ void ScXMLExport::_ExportAutoStyles()
SCTAB nTabCount = pDoc-GetTableCount();
for (SCTAB nTab=0; nTabnTabCount; ++nTab)
if (pDoc-IsStreamValid(nTab))
-{
-ScCellIterator aIter( pDoc, ScRange(0, 0, nTab, MAXCOL,
MAXROW, nTab) );
-for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
-{
-if (aIter.getType() != CELLTYPE_FORMULA)
-continue;
-
-ScFormulaCell* pFC = aIter.getFormulaCell();
-if (pFC)
-pFC-IsValue(); // interpret if dirty
-}
-}
+pDoc-InterpretDirtyCells(ScRange(0, 0, nTab, MAXCOL,
MAXROW, nTab));
// stored cell styles
const std::vectorScCellStyleEntry rCellEntries =
pSheetData-GetCellStyles();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 227d3d5..8140d51 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -506,16 +506,7 @@ void ScTabView::InterpretVisible()
if (nX2 MAXCOL) nX2 = MAXCOL;
if (nY2 MAXROW) nY2 = MAXROW;
-ScCellIterator aIter(pDoc, ScRange(nX1, nY1, nTab, nX2, nY2,
nTab));
-for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
-{
-if (aIter.getType() != CELLTYPE_FORMULA)
-continue;
-
-ScFormulaCell* p = aIter.getFormulaCell();
-if (p-GetDirty())
-p-Interpret();
-}
+pDoc-InterpretDirtyCells(ScRange(nX1, nY1, nTab, nX2, nY2, nTab));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/view/viewsh.cxx | 73 ++---
1 file changed, 40 insertions(+), 33 deletions(-)
New commits:
commit 280a43a8e35993eb5ec7d317599eb7cffb5d8e7f
Author: Michael Stahl mst...@redhat.com
Date: Mon Jun 24 18:09:35 2013 +0200
fdo#43765, fdo#57884, fdo#58052, fdo#63949: disappearing form controls
Transparent form controls in Writer may not be painted properly, if
painted from ViewShell::ImplUnlockPaint(true), called from
SwLayIdle::SwLayIdle.
The problem is that SdrPaintWindow::OutputPreRenderDevice will paint
the background of the transparent form controls (thus over-painting the
controls), so it has to be followed by painting the controls themselves.
Change-Id: Icda4ad835a398bbd50139be32ff5014a34f23bd5
(cherry picked from commit cfa994ccbd6ee681f5ab3648ce068c4881b495f5)
Reviewed-on: https://gerrit.libreoffice.org/4486
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b1ac5c3..993a037 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -101,6 +101,43 @@ void ViewShell::ToggleHeaderFooterEdit()
GetWin()-Invalidate();
}
+static void
+lcl_PaintTransparentFormControls(ViewShell rShell, SwRect const rRect)
+{
+// Direct paint has been performed: the background of transparent child
+// windows has been painted, so need to paint the child windows now.
+if (rShell.GetWin())
+{
+Window rWindow = *(rShell.GetWin());
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+if (pCandidate)
+{
+const Rectangle aRectanglePixel(
+rWindow.LogicToPixel(rRect.SVRect()));
+while (pCandidate)
+{
+if (pCandidate-IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(aRectanglePixel))
+{
+pCandidate-Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+pCandidate-Update();
+}
+}
+pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
+}
+}
+}
+}
+}
+
// #i72754# 2nd set of Pre/PostPaints
// This time it uses the lock counter (mPrePostPaintRegions empty/non-empty)
to allow only one activation
// and deactivation and mpPrePostOutDev to remember the OutDev from the
BeginDrawLayers
@@ -358,39 +395,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
DLPostPaint2(true);
}
-// #i107365#
-// Direct paint has been performed. Thus, take care of
-// transparent child windows.
-if ( GetWin() )
-{
-Window rWindow = *(GetWin());
-if (rWindow.IsChildTransparentModeEnabled())
-{
-Window* pCandidate = rWindow.GetWindow(
WINDOW_FIRSTCHILD );
-if (pCandidate)
-{
-const Rectangle
aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
-
-while (pCandidate)
-{
-if ( pCandidate-IsPaintTransparent() )
-{
-const Rectangle aCandidatePosSizePixel(
-
pCandidate-GetPosPixel(),
-
pCandidate-GetSizePixel());
-
-if (
aCandidatePosSizePixel.IsOver(aRectanglePixel) )
-{
-pCandidate-Invalidate(
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-pCandidate-Update();
-}
-}
-
-pCandidate = pCandidate-GetWindow(
WINDOW_NEXT );
-}
-}
-}
-}
+lcl_PaintTransparentFormControls(*this, aRect); // i#107365
}
delete pVout;
@@ -473,6 +478,8 @@ void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit d7e10cc71cd40ad84294f992f5d7e3c7c915e305
Author: Michael Stahl mst...@redhat.com
Date: Mon Jun 24 19:05:45 2013 +0200
fdo#60444: Revert fdo#58029 - substantially accelerate re-rendering...
This reverts commit 6c98ad71478cb72b51634b32d6e553ccaec30190.
This breaks selection of transparent form controls (fdo#60444), because
the Update method is not called on the children.
Change-Id: Id0b6a34a15aa1ed7bd5aa0d7b5626e60bee57e30
(cherry picked from commit f022f39638fbe970f1b839c757dcccd3baa69445)
Reviewed-on: https://gerrit.libreoffice.org/4487
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 81b53b2..133accc 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -348,15 +348,28 @@ namespace sdr
if(bTargetIsWindow)
{
Window rWindow = static_cast Window (rmOutputDevice);
-if(rWindow.IsChildTransparentModeEnabled())
+
+if(rWindow.IsChildTransparentModeEnabled()
rWindow.GetChildCount())
{
-// Get VCL to invalidate it's children - more
efficiently. fdo#58029
const Rectangle aRegionRectanglePixel(
maBufferRememberedRangePixel.getMinX(),
maBufferRememberedRangePixel.getMinY(),
maBufferRememberedRangePixel.getMaxX(),
maBufferRememberedRangePixel.getMaxY());
-rWindow.Invalidate(aRegionRectanglePixel,
-
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN|INVALIDATE_UPDATE);
+for(sal_uInt16 a(0); a rWindow.GetChildCount(); a++)
+{
+Window* pCandidate = rWindow.GetChild(a);
+
+if(pCandidate pCandidate-IsPaintTransparent())
+{
+const Rectangle
aCandidatePosSizePixel(pCandidate-GetPosPixel(), pCandidate-GetSizePixel());
+
+
if(aCandidatePosSizePixel.IsOver(aRegionRectanglePixel))
+{
+
pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+pCandidate-Update();
+}
+}
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/svx svx/source sw/source
include/svx/sdrpaintwindow.hxx|6
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 29 +-
svx/source/svdraw/sdrpaintwindow.cxx | 27
sw/source/core/view/viewsh.cxx| 28 +
4 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 576cc750e38108ada5ea40870f1fe8cf2054e7b6
Author: Michael Stahl mst...@redhat.com
Date: Mon Jun 24 19:50:30 2013 +0200
fdo#58029: replace quadratic child window loop with linear
... which should speed things up without introducing problems.
(Window::GetChild(n) is inefficient because the children are a linked
list)
Change-Id: I343d51a6866c5014cbca4c256b0c15f938958c39
(cherry picked from commit 38dcfadda85058a0ee87292c8943aec82e34b81e)
Reviewed-on: https://gerrit.libreoffice.org/4488
Tested-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Thorsten Behrens tbehr...@suse.com
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index bf8620c..d1694ee 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -41,6 +41,12 @@ namespace sdr
#endif
+/// paint the transparent children of rWin that overlap rPixelRect
+/// (for example, transparent form controls like check boxes)
+void SVX_DLLPUBLIC
+PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect);
+
+
class SdrPreRenderDevice
{
// The original OutputDevice
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 133accc..c8c2db3 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -18,6 +18,7 @@
*/
#include svx/sdr/overlay/overlaymanagerbuffered.hxx
+#include svx/sdrpaintwindow.hxx
#include vcl/outdev.hxx
#include basegfx/point/b2dpoint.hxx
#include basegfx/range/b2drange.hxx
@@ -349,28 +350,12 @@ namespace sdr
{
Window rWindow = static_cast Window (rmOutputDevice);
-if(rWindow.IsChildTransparentModeEnabled()
rWindow.GetChildCount())
-{
-const Rectangle aRegionRectanglePixel(
-maBufferRememberedRangePixel.getMinX(),
maBufferRememberedRangePixel.getMinY(),
-maBufferRememberedRangePixel.getMaxX(),
maBufferRememberedRangePixel.getMaxY());
-
-for(sal_uInt16 a(0); a rWindow.GetChildCount(); a++)
-{
-Window* pCandidate = rWindow.GetChild(a);
-
-if(pCandidate pCandidate-IsPaintTransparent())
-{
-const Rectangle
aCandidatePosSizePixel(pCandidate-GetPosPixel(), pCandidate-GetSizePixel());
-
-
if(aCandidatePosSizePixel.IsOver(aRegionRectanglePixel))
-{
-
pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
-pCandidate-Update();
-}
-}
-}
-}
+const Rectangle aRegionRectanglePixel(
+maBufferRememberedRangePixel.getMinX(),
+maBufferRememberedRangePixel.getMinY(),
+maBufferRememberedRangePixel.getMaxX(),
+maBufferRememberedRangePixel.getMaxY());
+PaintTransparentChildren(rWindow, aRegionRectanglePixel);
}
// #i80730# restore visibility of VCL cursor
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 3df44a1..6ab2b40 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -23,6 +23,33 @@
#include vcl/gdimtf.hxx
#include vcl/svapp.hxx
+
+void PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect)
+{
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
+{
+if (pCandidate-IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
+{
+pCandidate-Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+// important: actually paint the child here!
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source
cui/source/tabpages/tplnedef.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8383aad8191c96282985d05216e4c9627bef8e8e Author: David Tardon dtar...@redhat.com Date: Tue Jun 25 16:18:58 2013 +0200 fdo#62119 fix copypasta (cherry picked from commit 7a62a5c34a46715cb9d13c60f8423526c0625d1e) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: cui/source/tabpages/tplnedef.cxx Change-Id: I236b14822ae1852298ccd28aca9b54bc79a97312 Reviewed-on: https://gerrit.libreoffice.org/4516 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 44fe3f1..2b94c14 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -773,7 +773,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) aPathURL.removeFinalSlash(); XDashListRef pDshLst = XPropertyList::CreatePropertyList( -XGRADIENT_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool )-AsDashList(); +XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool )-AsDashList(); pDshLst-SetName( aURL.getName() ); if( pDshLst-Load() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source
cui/source/tabpages/tplnedef.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 938d2506d64bf995897be0c8f5b5ea50fac81302 Author: David Tardon dtar...@redhat.com Date: Tue Jun 25 16:18:58 2013 +0200 fdo#62119 fix copypasta (cherry picked from commit 7a62a5c34a46715cb9d13c60f8423526c0625d1e) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: cui/source/tabpages/tplnedef.cxx Change-Id: I236b14822ae1852298ccd28aca9b54bc79a97312 Reviewed-on: https://gerrit.libreoffice.org/4517 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4718ec5..a31d296 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -768,7 +768,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) aPathURL.removeFinalSlash(); XDashListRef pDshLst = XPropertyList::CreatePropertyList( -XGRADIENT_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool )-AsDashList(); +XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool )-AsDashList(); pDshLst-SetName( aURL.getName() ); if( pDshLst-Load() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/ui/app/transobj.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 75d85ab7ae4cb5b6f36ba7ac17c3177b95fd5058
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 13:38:20 2013 -0400
I forgot to pass the string param objects.
Change-Id: I691de93daa1a6acaa99fba3af359f062406023d3
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 1fecb49..c929a62 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -808,7 +808,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
ScSetStringParam aParam;
aParam.setTextInput();
-pDestDoc-SetString(aPos, ScGlobal::GetErrorString(nErrCode));
+pDestDoc-SetString(aPos, ScGlobal::GetErrorString(nErrCode),
aParam);
}
else if (pFCell-IsValue())
{
@@ -827,7 +827,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
{
ScSetStringParam aParam;
aParam.setTextInput();
-pDestDoc-SetString(aPos, aStr);
+pDestDoc-SetString(aPos, aStr, aParam);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: SVX ID collision
Hi, On Mon, Jun 24, 2013 at 3:59 PM, Caolán McNamara caol...@redhat.com wrote: Does 669ad519902e21e0cb3537fb7e203987f75a4077 fix the problem (I'm not entirely sure what buttons I'm supposed to push to find your rotation thing) C. Yes this solves it. Thanks. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO / Firebird DB Integration
On 24/06/13 20:38, Jean-Pierre Ledure wrote: I do not see any improvement with having to bundle hsqldb vs. having to bundle firebird. If Firebird becomes the default database in Base, it will not be a matter of bundling either HSQLDB or Firebird, but of bundling _both_ ! Otherwise what about existing legacy databases ? Not exactly: the plan would be to eventually have a parser that can import an HSQLDB database, meaning HSQLDB itself can still be binned. The main motivation for the switch was getting rid of java AFAIK the main issue in using a HSQLDB database embedded in the .odb file is that, when LO crashes, the chance is big that the database is destroyed: the recovery process does not recover that part of the file. Will it still be the case with an embedded Firebird database ? I don't know enough of the background on this unfortunately, so can't really comment in depth. I guess it depends on how robust the specific database in use is and I haven't seen any reports of problems with recovering FB databases. (This may also have something to do with the overriding of Javas i/o in order to get hsqldb writing directly into an odb file -- Firebird, at least for the moment, will be using an external file which is then copied into the odb file, which would eliminate issues in that transition.) In that context I invite interested people to read a.o. the thread published last monday on http://forum.openoffice.org/en/forum/viewtopic.php?f=13t=62419 by DACM. An extract: Unfortunately, the devs remain preoccupied with the embedded database concept based on a default database engine. They're literally wasting the summer trying to shoe-horn Firebird into Base as the default in order to achieve yet another, single-file database (.odb), much like we have today with HSQLDB. They don't seem to understand or acknowledge that the user community has shelved the concept because it is inherently unreliable (as confirmed by Microsoft http://www.techrepublic.com/blog/10things/10-reasons-to-split-an-access-database/1119: http://www.techrepublic.com/blog/10things/10-reasons-to-split-an-access-database/1119). We've also moved beyond the idea of a default database with Base. This actually free's the devs to eliminate internal Java dependencies from the entire LibO/AOO code-base, perhaps with the exception of the hooks necessary for external JDBC support. Have users been enough involved in the debate so far ? If I've understood correctly the suggestion is to remove the Create a new database option from the Base startup dialog (which creates the embedded database) along with the associated embedded database loading code (very little code in Base is embedded specific) in order to prevent the use of embedded databases? This wouldn't lead to any advantage for external db users, and would massively disadvantage embedded db users (e.g. casual users like myself, possibly some more serious uses requiring everything in one file, ...), so seems to be a bit of a complete non-starter really (not to mention increased entry barrier for new users, setup required for unit-testing, etc.). Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12 +
sc/inc/calcconfig.hxx|1
sc/source/core/data/documen9.cxx |7
sc/source/core/tool/calcconfig.cxx |8
sc/source/core/tool/formulaopt.cxx | 16 +
sc/source/ui/optdlg/calcoptionsdlg.cxx | 123 ---
sc/source/ui/optdlg/calcoptionsdlg.hrc |3
sc/source/ui/optdlg/calcoptionsdlg.hxx |5
sc/source/ui/optdlg/calcoptionsdlg.src | 12 +
9 files changed, 131 insertions(+), 56 deletions(-)
New commits:
commit 1a78d6a5ccddb320a78ffae5c2a083353fceac1b
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jun 25 13:38:22 2013 +0100
cleanup options dialog, and add an option for formula grouping.
Change-Id: I3cb19fb24028bc07d24b56786b6573dc79911bda
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 8ee1809..b396438 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1318,6 +1318,18 @@
info
descContains settings that affect formula handling./desc
/info
+ group oor:name=Calculation
+info
+ descContains settings for how to calculate formulae./desc
+/info
+prop oor:name=OpenCL oor:type=xs:boolean oor:nillable=false
+ !-- UIHints: Tools - Options Spreadsheet Formula --
+ info
+descWhether to use OpenCL for formula computation, if
available./desc
+ /info
+ valuefalse/value
+/prop
+ /group
group oor:name=Syntax
info
descContains settings for formula syntax./desc
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 96eabcc..aace08d 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -28,6 +28,7 @@ struct SC_DLLPUBLIC ScCalcConfig
{
formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax;
bool mbEmptyStringAsZero:1;
+bool mbOpenCLEnabled:1;
ScCalcConfig();
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d081379..525f12d 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -52,6 +52,7 @@
#include editutil.hxx
#include postit.hxx
#include charthelper.hxx
+#include interpre.hxx
using namespace ::com::sun::star;
#include stdio.h
@@ -689,9 +690,11 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter rEngine )
void ScDocument::RebuildFormulaGroups()
{
-static const char *pEnableFormulaGroups = getenv(SC_FORMULAGROUP);
+bool bEnableFormulaGroups;
-if ( !pEnableFormulaGroups )
+bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
+
+if ( !bEnableFormulaGroups )
return;
SCTAB nTab;
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index c85ddf2..ed93f64 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -14,7 +14,10 @@
ScCalcConfig::ScCalcConfig() :
meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED),
-mbEmptyStringAsZero(false) {}
+mbEmptyStringAsZero(false),
+mbOpenCLEnabled(false)
+{
+}
void ScCalcConfig::reset()
{
@@ -24,7 +27,8 @@ void ScCalcConfig::reset()
bool ScCalcConfig::operator== (const ScCalcConfig r) const
{
return meStringRefAddressSyntax == r.meStringRefAddressSyntax
-mbEmptyStringAsZero == r.mbEmptyStringAsZero;
+ mbEmptyStringAsZero == r.mbEmptyStringAsZero
+ mbOpenCLEnabled == r.mbOpenCLEnabled;
}
bool ScCalcConfig::operator!= (const ScCalcConfig r) const
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index df9e69a..db35f93 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -204,7 +204,8 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
#define SCFORMULAOPT_EMPTY_STRING_AS_ZERO 6
#define SCFORMULAOPT_OOXML_RECALC 7
#define SCFORMULAOPT_ODF_RECALC 8
-#define SCFORMULAOPT_COUNT9
+#define SCFORMULAOPT_OPENCL_ENABLED 9
+#define SCFORMULAOPT_COUNT 10
SequenceOUString ScFormulaCfg::GetPropertyNames()
{
@@ -219,6 +220,7 @@ SequenceOUString ScFormulaCfg::GetPropertyNames()
Syntax/EmptyStringAsZero, // SCFORMULAOPT_EMPTY_STRING_AS_ZERO
Load/OOXMLRecalcMode, // SCFORMULAOPT_OOXML_RECALC
Load/ODFRecalcMode,// SCFORMULAOPT_ODF_RECALC
+Calculation/OpenCL // SCFORMULAOPT_OPENCL_ENABLED
};
SequenceOUString aNames(SCFORMULAOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -390,6 +392,12 @@
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/ui/optdlg/calcoptionsdlg.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 39b246ee6a4c91b0ff155c19415a9ee70c8eb1dd Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jun 25 14:20:20 2013 -0400 Avoid ID number clash. Change-Id: I7fbaad5ffc89e4df0d9ce79595e9e0426802e3cf diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hrc b/sc/source/ui/optdlg/calcoptionsdlg.hrc index a6f5ee4..be1dbbe 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hrc +++ b/sc/source/ui/optdlg/calcoptionsdlg.hrc @@ -35,8 +35,8 @@ #define STR_EMPTY_STRING_AS_ZERO_CAPTION 27 #define STR_EMPTY_STRING_AS_ZERO_DESC 28 -#define STR_OPENCL_ENABLED 28 -#define STR_OPENCL_ENABLED_DESC 29 +#define STR_OPENCL_ENABLED 29 +#define STR_OPENCL_ENABLED_DESC 30 /* 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: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/ui/optdlg/calcoptionsdlg.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 63c23d453da58185955dd19ab731d5b1dd4ca141 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jun 25 14:20:20 2013 -0400 Avoid ID number clash. Change-Id: I7fbaad5ffc89e4df0d9ce79595e9e0426802e3cf diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hrc b/sc/source/ui/optdlg/calcoptionsdlg.hrc index a6f5ee4..be1dbbe 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hrc +++ b/sc/source/ui/optdlg/calcoptionsdlg.hrc @@ -35,8 +35,8 @@ #define STR_EMPTY_STRING_AS_ZERO_CAPTION 27 #define STR_EMPTY_STRING_AS_ZERO_DESC 28 -#define STR_OPENCL_ENABLED 28 -#define STR_OPENCL_ENABLED_DESC 29 +#define STR_OPENCL_ENABLED 29 +#define STR_OPENCL_ENABLED_DESC 30 /* 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: sc/source
sc/source/ui/optdlg/calcoptionsdlg.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 06cf194af710d82e441d9cfcc05ed44cffcb5c41 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jun 25 14:20:20 2013 -0400 Avoid ID number clash. Change-Id: I7fbaad5ffc89e4df0d9ce79595e9e0426802e3cf diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hrc b/sc/source/ui/optdlg/calcoptionsdlg.hrc index a6f5ee4..be1dbbe 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hrc +++ b/sc/source/ui/optdlg/calcoptionsdlg.hrc @@ -35,8 +35,8 @@ #define STR_EMPTY_STRING_AS_ZERO_CAPTION 27 #define STR_EMPTY_STRING_AS_ZERO_DESC 28 -#define STR_OPENCL_ENABLED 28 -#define STR_OPENCL_ENABLED_DESC 29 +#define STR_OPENCL_ENABLED 29 +#define STR_OPENCL_ENABLED_DESC 30 /* 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: offapi/com
offapi/com/sun/star/accessibility/XAccessibleText.idl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ffe5c9ce94234971a8c2081610842a2542f5cfb8 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 25 20:58:28 2013 +0200 Fix idl throw part description Change-Id: I561674db910d60ee6ade230cfc48bee7f37c9107 diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl index 6ad8355..5dad20f 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleText.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl @@ -373,7 +373,7 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface @throws ::com::sun::star::lang::IndexOutOfBoundsException if the index is invalid -@throws ::com::sun::star::lang::InvalidArgumentException +@throws ::com::sun::star::lang::IllegalArgumentException if the given text type is not valid. */ TextSegment getTextAtIndex([in] long nIndex, [in] short nTextType) @@ -412,7 +412,7 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface @throws ::com::sun::star::lang::IndexOutOfBoundsException if the index is invalid. -@throws ::com::sun::star::lang::InvalidArgumentException +@throws ::com::sun::star::lang::IllegalArgumentException if the given text type is not valid. */ TextSegment getTextBeforeIndex([in] long nIndex, [in] short nTextType) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx |2 ++
sw/source/core/crsr/crsrsh.cxx | 28 +++-
2 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit 61533b8c54077bf1aa203f503e271037b6553411
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 25 20:19:49 2013 +0100
Resolves: fdo#65743 MovePara gets stuck on hidden para fields
Change-Id: I03b26aaa9be491e760335185c5a9ffd5d04990bb
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d38329f..a652acc 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -258,6 +258,8 @@ private:
SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
+SW_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+
typedef sal_Bool (SwCursor:: *FNCrsr)();
SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index c8ed632..44de565 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -570,14 +570,34 @@ sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage,
SwPosPage fnPosPage )
return bRet;
}
+bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
+{
+SwCntntNode *pCNode = pShellCrsr-GetCntntNode();
+SwCntntFrm *pFrm = pCNode ?
+pCNode-getLayoutFrm( GetLayout(), pShellCrsr-GetPtPos(),
pShellCrsr-GetPoint(), sal_False ) : 0;
+return !pFrm || (pFrm-IsTxtFrm() ((SwTxtFrm*)pFrm)-IsHiddenNow());
+}
sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-SwCursor* pTmpCrsr = getShellCrsr( true );
+SwShellCrsr* pTmpCrsr = getShellCrsr( true );
sal_Bool bRet = pTmpCrsr-MovePara( fnWhichPara, fnPosPara );
if( bRet )
+{
+//keep going until we get something visible, i.e. skip
+//over hidden paragraphs, don't get stuck at the start
+//which is what SwCrsrShell::UpdateCrsrPos will reset
+//the position to if we pass it a position in an
+//invisible hidden paragraph field
+while (isInHiddenTxtFrm(pTmpCrsr))
+{
+if (!pTmpCrsr-MovePara(fnWhichPara, fnPosPara))
+break;
+}
+
UpdateCrsr();
+}
return bRet;
}
@@ -1215,10 +1235,8 @@ void SwCrsrShell::UpdateCrsrPos()
++mnStartAction;
SwShellCrsr* pShellCrsr = getShellCrsr( true );
Size aOldSz( GetDocSize() );
-SwCntntNode *pCNode = pShellCrsr-GetCntntNode();
-SwCntntFrm *pFrm = pCNode ?
-pCNode-getLayoutFrm( GetLayout(), pShellCrsr-GetPtPos(),
pShellCrsr-GetPoint(), sal_False ) :0;
-if( !pFrm || (pFrm-IsTxtFrm() ((SwTxtFrm*)pFrm)-IsHiddenNow()) )
+
+if( isInHiddenTxtFrm(pShellCrsr) )
{
SwCrsrMoveState aTmpState( MV_NONE );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/scriptdlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a85aed77e68f703db04e9f78625734c7551a9281 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 20:31:15 2013 +0100 Resolves: fdo#65716 MACROLANG not substituted in title Change-Id: I1fa71a926e0df753a553f43aebaa201a13f74f95 diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 672ff5e..e353412 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -508,6 +508,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language ) get(m_pDelButton, delete); // must be a neater way to deal with the strings than as above // append the language to the dialog title +setDeferredProperties(); String winTitle( GetText() ); winTitle.SearchAndReplace( OUString( %MACROLANG ), m_sLanguage ); SetText( winTitle ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/WindowAttribute.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87f5900d3a8b7bffd681e4fe4369ea86282a0c04 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 25 21:37:58 2013 +0200 Fix idl description Change-Id: I604bb2eeac5b2b5285d80c5edef98b98b6c42f52 diff --git a/offapi/com/sun/star/awt/WindowAttribute.idl b/offapi/com/sun/star/awt/WindowAttribute.idl index 9fff643..922d535 100644 --- a/offapi/com/sun/star/awt/WindowAttribute.idl +++ b/offapi/com/sun/star/awt/WindowAttribute.idl @@ -87,7 +87,7 @@ published constants WindowAttribute /** specifies that the window should support the -com::sun::star::awtXSystemDependentWindowPeer +com::sun::star::awt::XSystemDependentWindowPeer interface. pThis flag may be ignored, but in this case no system-dependent ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 39/2eeb6146035f4e52e15e16f5ae16d6cb5ad92c
39/2eeb6146035f4e52e15e16f5ae16d6cb5ad92c |1 + 1 file changed, 1 insertion(+) New commits: commit ace1eb469ac1005e0d9679c1298372f6affc8c6f Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 20:41:42 2013 +0100 Notes added by 'git notes add' diff --git a/39/2eeb6146035f4e52e15e16f5ae16d6cb5ad92c b/39/2eeb6146035f4e52e15e16f5ae16d6cb5ad92c new file mode 100644 index 000..657164e --- /dev/null +++ b/39/2eeb6146035f4e52e15e16f5ae16d6cb5ad92c @@ -0,0 +1 @@ +reject: nothing ended up using this, so drop as unused core ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source
cui/source/dialogs/scriptdlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 321447137f94c986da56dc048e40c8ce46123ac4 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 20:31:15 2013 +0100 Resolves: fdo#65716 MACROLANG not substituted in title Change-Id: I1fa71a926e0df753a553f43aebaa201a13f74f95 (cherry picked from commit a85aed77e68f703db04e9f78625734c7551a9281) Reviewed-on: https://gerrit.libreoffice.org/4518 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 672ff5e..e353412 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -508,6 +508,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language ) get(m_pDelButton, delete); // must be a neater way to deal with the strings than as above // append the language to the dialog title +setDeferredProperties(); String winTitle( GetText() ); winTitle.SearchAndReplace( OUString( %MACROLANG ), m_sLanguage ); SetText( winTitle ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xsltdialog/xmlfiltertestdialog.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9102d2517007db3afa867a9902ca526153439eb5 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 25 20:48:38 2013 +0100 Related: fdo#65716 title substitutions Change-Id: I1d9fe14cdfd77ef79089cdf9c20a876238862bae diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 0490c3f..2de74ef 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -162,6 +162,7 @@ XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent, m_pPBRecentFile-SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) ); m_pPBClose-SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) ); +setDeferredProperties(); m_sDialogTitle = GetText(); try ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3e58bf2cddb7d725f32d3f26c87e7417cd6e652a Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 25 21:58:04 2013 +0200 Fix idl description Change-Id: Id853f17f973edfc5aa41843c99e77e4b86f27bf8 diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl index 4a3ccdf..d3d1f86 100644 --- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl +++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl @@ -52,7 +52,7 @@ service AccessiblePageHeaderFooterAreasView ul li::com::sun::star::text::AccessibleHeaderFooterView: A child where calling - ::com::sun::star::text::XAccessibleContext::getAccessibleChild() + ::com::sun::star::accessibility::XAccessibleContext::getAccessibleChild() an object that supports this service is returned for every header and footer that is at least partially visible./li /ul ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: udkapi/com
udkapi/com/sun/star/container/XMap.idl |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 5470bea93e7047ef5742466246487e17813cf5ed Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 25 22:18:34 2013 +0200 Fix idl descriptions Change-Id: I119cd010f6f54d428017ea59016b5fdd91c6d4da diff --git a/udkapi/com/sun/star/container/XMap.idl b/udkapi/com/sun/star/container/XMap.idl index 2a191a6..b4f25fb 100644 --- a/udkapi/com/sun/star/container/XMap.idl +++ b/udkapi/com/sun/star/container/XMap.idl @@ -59,7 +59,7 @@ interface XMap /** clears the map, removing all key-value pairs from it. -@throws ::com::sun::star::beans::NoSupportException +@throws ::com::sun::star::lang::NoSupportException if the map is not mutable. */ void clear() @@ -113,7 +113,7 @@ interface XMap @throws ::com::sun::star::beans::IllegalTypeException if the given key is not of a type which is accepted by the map -@throws ::com::sun::star::beans::IllegalArgumentException +@throws ::com::sun::star::lang::IllegalArgumentException if the given key is not supported to be put into the map. It's up to the service implementing the codeXMap/code interface to specify which special values are not supported. For instances, implementations might decide to not allow `VOID` keys, or @@ -149,7 +149,7 @@ interface XMap For instances, implementations might decide to not allow `VOID` keys or values, or to reject codeDouble.NaN/code (emnot a number/em) to due its problematic behavior with respect to equality. -@throws ::com::sun::star::beans::NoSupportException +@throws ::com::sun::star::lang::NoSupportException if the map does not support putting new mappings into it */ any put( [in] any Key, [in] any Value ) @@ -172,7 +172,7 @@ interface XMap supported. For instances, implementations might decide to not allow `VOID` keys, or to reject codeDouble.NaN/code (emnot a number/em) to due its problematic behavior with respect to equality. -@throws ::com::sun::star::beans::NoSupportException +@throws ::com::sun::star::lang::NoSupportException if the map does not support removing mappings @throws ::com::sun::star::container::NoSuchElementException if there is no value associated with the given key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/drawing/AccessibleGraphicShape.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87bf4eaf526e0e2124c26f9f1ff3059f06423d58 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jun 25 22:31:52 2013 +0200 Fix a pb in idl but 2 others remain Change-Id: Ide5c6562c9be947ac2e59c79493c021031c7203e diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl index e2484c0..880583f 100644 --- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl +++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl @@ -54,7 +54,7 @@ service AccessibleGraphicShape /** Give access to image specific information. pThe support of the -::com::sun::star::accessibility::AccessibleImage interface +::com::sun::star::accessibility::XAccessibleImage interface requires the shape to provide a description of the displayed image and the image's size in the screen coordinate system (pixel). At the time being this interface does not provide information that is ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO / Firebird DB Integration
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Em 25-06-2013 15:02, Andrzej J. R. Hunt escreveu: If I've understood correctly the suggestion is to remove the Create a new database option from the Base startup dialog (which creates the embedded database) along with the associated embedded database loading code (very little code in Base is embedded specific) in order to prevent the use of embedded databases? This wouldn't lead to any advantage for external db users, and would massively disadvantage embedded db users (e.g. casual users like myself, possibly some more serious uses requiring everything in one file, ...), so seems to be a bit of a complete non-starter really (not to mention increased entry barrier for new users, setup required for unit-testing, etc.). Cheers, Andrzej Hi Andrzej, the Create a new database in the Base startup dialog is a configuration option already implemented. See attachemnt I hope it helps somehow. - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJRyf5+AAoJEJp3R7nH3vLxjUoIAJ78qAwMleOG5LSWKZCuybCf 4u2IRfdv4aaTU2AzisUCkeB++HGw/R459QfQdZds+QcGjKF66hwDyWtFdkO1W0kL Z/lubfOIepf9Y+tSzaxF3kkHfN4lERvSFVy1ef4LdVvNjiREYDuS7NqB4KlCVZdC B9GeHU07h8dKvPxxqQ4WGdjZd9HkwNgfRhMbwqcn/iIQV4w4DviD4t0FC/7m12v6 LwYKLlR+s55jpG4XwK4jav7iKbNCPKle+LZqdLqa1O6JtdnNDg73VYvVqoCsrHcZ 46HFzwzXb9DA95tvCrTSX1N5r8v8Pw8ZhfvTSSe9bCExG9FKXRd3oCUU+Wo8Vjw= =/yXC -END PGP SIGNATURE- ?xml version=1.0? oor:data xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:oor=http://openoffice.org/2001/registry; dependency file=main/ oor:component-data xmlns:install=http://openoffice.org/2004/installation; oor:name=DataAccess oor:package=org.openoffice.Office node oor:name=Policies node oor:name=Features node oor:name=Base prop oor:name=CreateLocalDatabase oor:type=xs:boolean valuefalse/value /prop /node node oor:name=Writer prop oor:name=DatabaseFields oor:type=xs:boolean valuetrue/value /prop /node node oor:name=Common prop oor:name=EditDatabaseFromDataSourceView oor:type=xs:boolean valuetrue/value /prop /node /node /node /oor:component-data /oor:data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/embed/XHatchWindowFactory.idl |2 +-
offapi/com/sun/star/form/runtime/XFilterController.idl |2 +-
offapi/com/sun/star/form/runtime/XFormOperations.idl|2 +-
offapi/com/sun/star/i18n/Calendar2.idl |2 +-
offapi/com/sun/star/rendering/XCanvas.idl |2 +-
offapi/com/sun/star/script/provider/XScriptProvider.idl |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a80c7d5118454a60d4cd67448d567e1cb3f48f4e
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jun 25 23:10:34 2013 +0200
Fix some idl descriptions
Change-Id: Ia14bf30cf65ea5cbaa268b1461fc5c6d7acb702d
diff --git a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index fa707ec..a1acfc3 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -47,7 +47,7 @@ published interface XHatchWindowFactory:
com::sun::star::uno::XInterface
@returns
a new hatch window
-@throws ::com::sun::star::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
one of arguments is illegal
*/
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl
b/offapi/com/sun/star/form/runtime/XFilterController.idl
index f8554db..85c7c78 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -130,7 +130,7 @@ interface XFilterController
@throws ::com::sun::star::lang::IndexOutOfBoundsException
if _Component is out of the allowed range.
-@see
::com::sun::star::form::component::DataAwareControlModel::BoundField
+@see ::com::sun::star::form::DataAwareControlModel::BoundField
*/
::com::sun::star::awt::XControl
getFilterComponent( [in] long _Component )
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl
b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index cccd187..86cf3b2 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -42,7 +42,7 @@ interface XFeatureInvalidation;
pAs an example, imagine you have a database form, displayed in some user
interface, which you want to move to the next record.br/
-It is as easy as calling com:::sun::star::sdbc::XResultSet::next()
+It is as easy as calling com::sun::star::sdbc::XResultSet::next()
on this form, right? Wrong. First, you need to care for saving the current
record, so the user doesn't lose her input. So you need to call
com::sun::star::sdbc::XResultSetUpdate::updateRow() or
diff --git a/offapi/com/sun/star/i18n/Calendar2.idl
b/offapi/com/sun/star/i18n/Calendar2.idl
index 16f5984..6df975e 100644
--- a/offapi/com/sun/star/i18n/Calendar2.idl
+++ b/offapi/com/sun/star/i18n/Calendar2.idl
@@ -29,7 +29,7 @@ module com { module sun { module star { module i18n {
nominative case nouns in Calendar::Months. If a
locale does not provide the partitive case in
#PartitiveMonths, the names are identical to
-#GenititiveMonths. /p
+#GenitiveMonths. /p
p The sequences are of type
com::sun::star::i18n::CalendarItem2 instead of
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl
b/offapi/com/sun/star/rendering/XCanvas.idl
index 029da22..28e2a8f 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -88,7 +88,7 @@ interface XTextLayout;
that such caching is a lot more complicated, should the actual
rendering a method yields depend on internal state (which is the
case e.g. for the
-::com::sun::star::drawingcom::sun::star::drawing::XGraphics
+::com::sun::star::awt::XGraphics
interface). Please note, though, that deciding whether to return
an XCachedPrimitive is completely up to the
implementation - don't rely on the methods returning something
diff --git a/offapi/com/sun/star/script/provider/XScriptProvider.idl
b/offapi/com/sun/star/script/provider/XScriptProvider.idl
index fac9b8f..fe3f94a 100644
--- a/offapi/com/sun/star/script/provider/XScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProvider.idl
@@ -43,7 +43,7 @@ interface XScriptProvider : ::com::sun::star::uno::XInterface
{
@returns
an object implementing ::com::sun::star::script::provider::XScript
representing the script
-@throws ::com::sun::star::provider::ScriptFrameworkErrorException
+@throws
::com::sun::star::script::provider::ScriptFrameworkErrorException
Framework error getting script for URI.
*/
XScript getScript( [in] string sScriptURI ) raises (
::com::sun::star::script::provider::ScriptFrameworkErrorException );
___
Libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 397c95b49dc29d480687c5a96e0e385964726e94 Author: László Németh nem...@numbertext.org Date: Wed Jun 26 02:00:51 2013 +0200 fdo#66180 librelogo: clockwise HEADING Change-Id: I1154b29119fd3fbb30d50246e94b3906bea24220 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 2231646..4b66ae3 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -739,7 +739,7 @@ def heading(deg = -1, go = False): if go and n 0: __go__(__TURTLE__, -n, False, a) else: -turtle.RotateAngle = deg * 100 +turtle.RotateAngle = -deg * 100 def rotate(shapename, deg): shape = __getshape__(shapename) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx | 22 +
sc/source/core/data/column.cxx | 63 +++-
sc/source/core/data/column2.cxx | 24 ++-
sc/source/core/data/column3.cxx | 32
4 files changed, 127 insertions(+), 14 deletions(-)
New commits:
commit 8406603b8e73b7ac169d569f82d423b34b4745f5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 17:06:45 2013 -0400
Identify spots where we may need to regroup formula cells.
Change-Id: Ib448480bb3a3e39638dd42cafc272934a226cc1e
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3cbd7b8..69f3420 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -457,6 +457,28 @@ public:
void InterpretDirtyCells( SCROW nRow1, SCROW nRow2 );
+/**
+ * Regroup formula cells for the entire column.
+ */
+void RegroupFormulaCells();
+
+/**
+ * Regroup existing formula cells when a new cell is inserted.
+ *
+ * @param nRow row at which a new cell is inserted.
+ */
+void RegroupFormulaCells( SCROW nRow );
+
+/**
+ * Regroup existing formula cells when a range of new cells are inserted.
+ *
+ * @param nRow1 first row of inserted new cell span.
+ * @param nRow2 last row of inserted new cell span.
+ */
+void RegroupFormulaCells( SCROW nRow1, SCROW nRow2 );
+
+void FormulaCellsUndecided( SCROW nRow1, SCROW nRow2 );
+
private:
void CopyCellsInRangeToColumn(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index bd1eeae..ac3ab98 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -886,6 +886,9 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
ScFormulaCell* pNew2 = cloneFormulaCell(pDocument,
ScAddress(nCol, nRow2, nTab), *pOld1);
*itf1 = pNew1;
*itf2 = pNew2;
+
+RegroupFormulaCells(nRow1);
+RegroupFormulaCells(nRow2);
}
break;
default:
@@ -930,6 +933,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
ScFormulaCell* pNew = cloneFormulaCell(pDocument,
ScAddress(nCol, nRow1, nTab), *aCell2.mpFormula);
it1 = maCells.set(it1, nRow1, pNew);
maCells.set_empty(it1, nRow2, nRow2); // original formula cell
gets deleted.
+
+RegroupFormulaCells(nRow2);
}
break;
default:
@@ -971,6 +976,9 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
ScFormulaCell* pNew = cloneFormulaCell(pDocument,
ScAddress(nCol, nRow2, nTab), *aCell1.mpFormula);
it1 = maCells.set_empty(it1, nRow1, nRow1); // original
formula cell is gone.
maCells.set(it1, nRow2, pNew);
+
+RegroupFormulaCells(nRow1);
+RegroupFormulaCells(nRow2);
}
break;
default:
@@ -1012,6 +1020,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
}
maCells.set(it1, nRow2, aCell1.mfValue);
+
}
break;
case CELLTYPE_STRING:
@@ -1101,6 +1110,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
}
SwapCellTextAttrs(nRow1, nRow2);
+RegroupFormulaCells(nRow1);
+RegroupFormulaCells(nRow2);
CellStorageModified();
BroadcastCells(aRows);
}
@@ -1125,6 +1136,7 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn rCol)
ScFormulaCell* pCell2 = rCol.maCells.getScFormulaCell*(nRow);
if (pCell1)
updateRefInFormulaCell(*pCell1, rCol.nCol, nTab, rCol.nCol - nCol);
+
if (pCell2)
updateRefInFormulaCell(*pCell2, nCol, nTab, nCol - rCol.nCol);
@@ -1133,6 +1145,13 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn rCol)
CellStorageModified();
rCol.CellStorageModified();
+
+if (pCell1 || pCell2)
+{
+// At least one of the two cells is a formula cell. Regroup them.
+RegroupFormulaCells(nRow);
+rCol.RegroupFormulaCells(nRow);
+}
}
@@ -1200,15 +1219,18 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize
)
maCellTextAttrs.insert_empty(nStartRow, nSize);
maCellTextAttrs.resize(MAXROWCOUNT);
-maCells.insert_empty(nStartRow, nSize);
+// Check if this insertion will split an existing formula block.
+sc::CellStoreType::position_type aPos = maCells.position(nStartRow);
+bool bSplitFormulaBlock = aPos.second != 0;
+
+sc::CellStoreType::iterator it = maCells.insert_empty(aPos.first,
nStartRow, nSize);
maCells.resize(MAXROWCOUNT);
-bool bOldAutoCalc = pDocument-GetAutoCalc();
-pDocument-SetAutoCalc( false );// avoid recalculations
+sc::AutoCalcSwitch aSwitch(*pDocument, false);
// Get the position of the first affected cell.
-std::pairsc::CellStoreType::iterator,size_t aPos =
maCells.position(nStartRow+nSize);
-sc::CellStoreType::iterator it =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0508a56fdf11daa7c0becc7020ad0b22acd56a7e Author: László Németh nem...@numbertext.org Date: Wed Jun 26 02:00:51 2013 +0200 fdo#66180 librelogo: clockwise HEADING Change-Id: I1154b29119fd3fbb30d50246e94b3906bea24220 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 2231646..bf925c8 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -722,7 +722,7 @@ def turnright(deg): def heading(deg = -1, go = False): turtle = __getshape__(__TURTLE__) if deg == -1: -return turtle.RotateAngle / 100 +return -turtle.RotateAngle / 100 + 360 else: if deg == u'any': turtle.RotateAngle = random.random() * 36000 @@ -739,7 +739,7 @@ def heading(deg = -1, go = False): if go and n 0: __go__(__TURTLE__, -n, False, a) else: -turtle.RotateAngle = deg * 100 +turtle.RotateAngle = -deg * 100 def rotate(shapename, deg): shape = __getshape__(shapename) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4c9b22fffcc976339971431deff5241429ae066 Author: László Németh nem...@numbertext.org Date: Wed Jun 26 02:00:51 2013 +0200 fdo#66180 librelogo: clockwise HEADING Change-Id: I1154b29119fd3fbb30d50246e94b3906bea24220 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 2231646..bf925c8 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -722,7 +722,7 @@ def turnright(deg): def heading(deg = -1, go = False): turtle = __getshape__(__TURTLE__) if deg == -1: -return turtle.RotateAngle / 100 +return -turtle.RotateAngle / 100 + 360 else: if deg == u'any': turtle.RotateAngle = random.random() * 36000 @@ -739,7 +739,7 @@ def heading(deg = -1, go = False): if go and n 0: __go__(__TURTLE__, -n, False, a) else: -turtle.RotateAngle = deg * 100 +turtle.RotateAngle = -deg * 100 def rotate(shapename, deg): shape = __getshape__(shapename) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee311c55c999a68aa677faac69b3462975ad05d4 Author: László Németh nem...@numbertext.org Date: Wed Jun 26 02:00:51 2013 +0200 fdo#66180 librelogo: clockwise HEADING Change-Id: I1154b29119fd3fbb30d50246e94b3906bea24220 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 4b66ae3..bf925c8 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -722,7 +722,7 @@ def turnright(deg): def heading(deg = -1, go = False): turtle = __getshape__(__TURTLE__) if deg == -1: -return turtle.RotateAngle / 100 +return -turtle.RotateAngle / 100 + 360 else: if deg == u'any': turtle.RotateAngle = random.random() * 36000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column.cxx | 31 ---
1 file changed, 8 insertions(+), 23 deletions(-)
New commits:
commit 62df0aefa69dd9b1d10d4f86372d379b0337d6f2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 21:01:37 2013 -0400
Remove this inheritance.
Change-Id: I37e0a6b8e95f56210df823af7aa8828189edfbef
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ac3ab98..cfea95d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2002,22 +2002,19 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow,
ScColumn rCol)
namespace {
-class UpdateRefHandler
+class UpdateRefOnCopy
{
protected:
ScRange maRange;
SCCOL mnDx;
SCROW mnDy;
SCTAB mnDz;
-UpdateRefMode meMode;
ScDocument* mpUndoDoc;
bool mbUpdated;
public:
-UpdateRefHandler(const ScRange rRange, SCCOL nDx, SCROW nDy, SCTAB nDz,
UpdateRefMode eMode, ScDocument* pUndoDoc) :
-maRange(rRange), mnDx(nDx), mnDy(nDy), mnDz(nDz), meMode(eMode),
mpUndoDoc(pUndoDoc), mbUpdated(false) {}
-
-virtual ~UpdateRefHandler() {}
+UpdateRefOnCopy(const ScRange rRange, SCCOL nDx, SCROW nDy, SCTAB nDz,
ScDocument* pUndoDoc) :
+maRange(rRange), mnDx(nDx), mnDy(nDy), mnDz(nDz), mpUndoDoc(pUndoDoc),
mbUpdated(false) {}
bool isUpdated() const { return mbUpdated; }
@@ -2031,23 +2028,11 @@ public:
sc::formula_block::iterator itEnd = it;
std::advance(itEnd, nDataSize);
-size_t nRow = node.position + nOffset;
-for (; it != itEnd; ++it, ++nRow)
-updateReference(**it, static_castSCROW(nRow));
-}
-
-virtual void updateReference(ScFormulaCell rCell, SCROW nRow) = 0;
-};
-
-class UpdateRefOnCopy : public UpdateRefHandler
-{
-public:
-UpdateRefOnCopy(const ScRange rRange, SCCOL nDx, SCROW nDy, SCTAB nDz,
ScDocument* pUndoDoc) :
-UpdateRefHandler(rRange, nDx, nDy, nDz, URM_COPY, pUndoDoc) {}
-
-virtual void updateReference(ScFormulaCell rCell, SCROW /*nRow*/)
-{
-mbUpdated |= rCell.UpdateReference(meMode, maRange, mnDx, mnDy, mnDz,
mpUndoDoc);
+for (; it != itEnd; ++it)
+{
+ScFormulaCell rCell = **it;
+mbUpdated |= rCell.UpdateReference(URM_COPY, maRange, mnDx, mnDy,
mnDz, mpUndoDoc);
+}
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx |4 +
sc/source/core/data/column.cxx | 104 ++---
2 files changed, 102 insertions(+), 6 deletions(-)
New commits:
commit 892e74227d872178a3c93682d92a9252d8f5d182
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 23:07:25 2013 -0400
Replace CopyCellsInRangeToColumn() with ParseBlock().
Change-Id: I7b7f827fcdb9e31956d0b123ecee8751d791e54f
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 69f3420..c6b3945 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -144,6 +144,10 @@ public:
const ScDocument GetDoc() const;
SCTAB GetTab() const { return nTab; }
SCCOL GetCol() const { return nCol; }
+sc::CellStoreType GetCellStore() { return maCells; }
+const sc::CellStoreType GetCellStore() const { return maCells; }
+sc::CellTextAttrStoreType GetCellAttrStore() { return maCellTextAttrs; }
+const sc::CellTextAttrStoreType GetCellAttrStore() const { return
maCellTextAttrs; }
ScRefCellValue GetCellValue( SCROW nRow ) const;
ScRefCellValue GetCellValue( sc::CellStoreType::const_iterator itPos,
SCROW nRow ) const;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index cfea95d..600eb58 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1270,12 +1270,102 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE
nSize )
namespace {
-class CopyToClipHandler : public sc::CellBlockCloneHandler
+class CopyToClipHandler
{
+const ScColumn mrSrcCol;
+ScColumn mrDestCol;
+sc::ColumnBlockPosition maDestPos;
+
+void setDefaultAttrsToDest(size_t nRow, size_t nSize)
+{
+std::vectorsc::CellTextAttr aAttrs(nSize); // default values
+maDestPos.miCellTextAttrPos = mrDestCol.GetCellAttrStore().set(
+maDestPos.miCellTextAttrPos, nRow, aAttrs.begin(), aAttrs.end());
+}
+
public:
-CopyToClipHandler(ScDocument rSrcDoc, ScDocument rDestDoc,
- sc::CellStoreType rDestCellStore,
sc::CellTextAttrStoreType rDestAttrStore) :
-sc::CellBlockCloneHandler(rSrcDoc, rDestDoc, rDestCellStore,
rDestAttrStore) {}
+CopyToClipHandler(const ScColumn rSrcCol, ScColumn rDestCol,
sc::ColumnBlockPosition* pDestPos) :
+mrSrcCol(rSrcCol), mrDestCol(rDestCol)
+{
+if (pDestPos)
+maDestPos = *pDestPos;
+else
+mrDestCol.InitBlockPosition(maDestPos);
+}
+
+void operator() (const sc::CellStoreType::value_type aNode, size_t
nOffset, size_t nDataSize)
+{
+size_t nTopRow = aNode.position;
+
+switch (aNode.type)
+{
+case sc::element_type_numeric:
+{
+sc::numeric_block::const_iterator it =
sc::numeric_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::numeric_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+maDestPos.miCellPos =
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nTopRow, it, itEnd);
+setDefaultAttrsToDest(nTopRow, nDataSize);
+}
+break;
+case sc::element_type_string:
+{
+sc::string_block::const_iterator it =
sc::string_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::string_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+maDestPos.miCellPos =
mrDestCol.GetCellStore().set(maDestPos.miCellPos, nTopRow, it, itEnd);
+setDefaultAttrsToDest(nTopRow, nDataSize);
+}
+break;
+case sc::element_type_edittext:
+{
+sc::edittext_block::const_iterator it =
sc::edittext_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::edittext_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+
+std::vectorEditTextObject* aCloned;
+aCloned.reserve(nDataSize);
+for (; it != itEnd; ++it)
+aCloned.push_back(ScEditUtil::Clone(**it,
mrDestCol.GetDoc()));
+
+maDestPos.miCellPos = mrDestCol.GetCellStore().set(
+maDestPos.miCellPos, nTopRow, aCloned.begin(),
aCloned.end());
+
+setDefaultAttrsToDest(nTopRow, nDataSize);
+}
+break;
+case sc::element_type_formula:
+{
+sc::formula_block::const_iterator it =
sc::formula_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::formula_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+
+std::vectorScFormulaCell* aCloned;
+aCloned.reserve(nDataSize);
+ScAddress aDestPos(mrDestCol.GetCol(), nTopRow,
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 7a8f1b95ac66b06865e5d31d525bf43e822fdd54
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 23:14:43 2013 -0400
Let's not forget to store the position afterward.
Change-Id: Ia5067db46460e164643dd8cc6d21b68a05b3b33a
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 600eb58..2ff8780 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1275,6 +1275,7 @@ class CopyToClipHandler
const ScColumn mrSrcCol;
ScColumn mrDestCol;
sc::ColumnBlockPosition maDestPos;
+sc::ColumnBlockPosition* mpDestPos;
void setDefaultAttrsToDest(size_t nRow, size_t nSize)
{
@@ -1285,14 +1286,20 @@ class CopyToClipHandler
public:
CopyToClipHandler(const ScColumn rSrcCol, ScColumn rDestCol,
sc::ColumnBlockPosition* pDestPos) :
-mrSrcCol(rSrcCol), mrDestCol(rDestCol)
+mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos)
{
-if (pDestPos)
-maDestPos = *pDestPos;
+if (mpDestPos)
+maDestPos = *mpDestPos;
else
mrDestCol.InitBlockPosition(maDestPos);
}
+~CopyToClipHandler()
+{
+if (mpDestPos)
+*mpDestPos = maDestPos;
+}
+
void operator() (const sc::CellStoreType::value_type aNode, size_t
nOffset, size_t nDataSize)
{
size_t nTopRow = aNode.position;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 1bb5724be6e3e8844526a8d160013b25d6ce976f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jun 25 23:30:56 2013 -0400
CopyUpdated() to use ParseBlock() instead of CopyCellsInRangeToColumn().
Change-Id: I7f1456462ac3bb9d551d3d1bb303a68d74fa16f1
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 2ff8780..c561035 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1897,13 +1897,7 @@ void ScColumn::UndoToColumn(
void ScColumn::CopyUpdated( const ScColumn rPosCol, ScColumn rDestCol ) const
{
// Copy cells from this column to the destination column only for those
-// rows that are present in the position column.
-
-sc::CellBlockCloneHandler aHdl(*pDocument, *rDestCol.pDocument,
rDestCol.maCells, rDestCol.maCellTextAttrs);
-sc::ColumnBlockConstPosition aSrcPos;
-sc::ColumnBlockPosition aDestPos;
-InitBlockPosition(aSrcPos);
-rDestCol.InitBlockPosition(aDestPos);
+// rows that are present in the position column (rPosCol).
// First, mark all the non-empty cell ranges from the position column.
sc::SingleColumnSpanSet aRangeSet;
@@ -1913,9 +1907,17 @@ void ScColumn::CopyUpdated( const ScColumn rPosCol,
ScColumn rDestCol ) const
// marked row ranges.
sc::SingleColumnSpanSet::SpansType aRanges;
aRangeSet.getSpans(aRanges);
+
+CopyToClipHandler aFunc(*this, rDestCol, NULL);
+sc::CellStoreType::const_iterator itPos = maCells.begin();
sc::SingleColumnSpanSet::SpansType::const_iterator it = aRanges.begin(),
itEnd = aRanges.end();
for (; it != itEnd; ++it)
-CopyCellsInRangeToColumn(aSrcPos, aDestPos, aHdl, it-mnRow1,
it-mnRow2, rDestCol);
+{
+itPos = sc::ParseBlock(itPos, maCells, aFunc, it-mnRow1, it-mnRow2);
+rDestCol.RegroupFormulaCells(it-mnRow1, it-mnRow2);
+}
+
+rDestCol.CellStorageModified();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] Short news about BSA_fr
Hi all, Short news from the BSA in French. So it's up and running since last week. Today, I've documented our process on the wiki for our team [1]. I propose that we let a period of tests/improvements for about 2 months before I document the process in English. [1] https://wiki.documentfoundation.org/BSA_NLPProcess/fr Kind regards Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Short news about BSA_fr
On Tue, Jun 25, 2013 at 7:36 AM, Sophie Gautier gautier.sop...@gmail.com wrote: Hi all, Short news from the BSA in French. So it's up and running since last week. Today, I've documented our process on the wiki for our team [1]. I propose that we let a period of tests/improvements for about 2 months before I document the process in English. Sounds good. [1] https://wiki.documentfoundation.org/BSA_NLPProcess/fr I suggest the pages documenting the process live somewhere under https://wiki.documentfoundation.org/QA/BSA/ or https://wiki.documentfoundation.org/QA/BSA/Localization/ Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Short news about BSA_fr
Short news from the BSA in French. So it's up and running since last week. Today, I've documented our process on the wiki for our team [1]. I propose that we let a period of tests/improvements for about 2 months before I document the process in English. Sounds good. +1, thanks for the update Sophie. Best, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Triage Contest
I fixed a formatting error on the wiki page but it is still missing a link to the Top priority item. Hopefully this message is not ignored as well... -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Triage-Contest-tp4062244p4063045.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 63547] Cannot scroll horizontally using trackpad
https://bugs.freedesktop.org/show_bug.cgi?id=63547 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|target:4.2.0 target:4.1.0.2 |target:4.2.0 target:4.1.0.2 ||target:4.0.5 --- Comment #14 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tor Lillqvist committed a patch related to this issue. It has been pushed to libreoffice-4-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=67d28a26bc43fcf7e7455c006684d4282be5d560h=libreoffice-4-0 fdo#63547: Fix wheel/trackpad scrolling on OS X: Single char copy/paste error It will be available in LibreOffice 4.0.5. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62531] LibreOffice CMIS checkout does not work when using Alfresco atom endpoint
https://bugs.freedesktop.org/show_bug.cgi?id=62531 --- Comment #6 from Ingo Schnieders schnieders.i...@drako.de --- Could it be a file locking problem? I use LibreOffice from a WinXP client -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58995] ACCESSIBILITY: [a11y] Java SE JRE 1.7 Java Accessibility API not fully supporting LibreOffice UNO Accessibility API via JAB bridge
https://bugs.freedesktop.org/show_bug.cgi?id=58995 --- Comment #26 from DavidO d.ostrov...@gmx.de --- so building with JDK 1.7, i can reproduce the problem with LO 4.2.0 alpha (unchanged master from 2013-06-24) = JAB 2.0.3, JDK 1.7u25 and can confirm that switching back to JDK 1.6u45, JAB 2.0.2 solves the problem for the same LO build. No NVDA installation is actually needed to see the problem: JavaFerret-32 is enough with activated traces for Focus gain/lost event. The logging analysis shows though, that in both cases (working and not working JAB) the events broadcasting works in Component.java: case AccessibleStateType.FOCUSED: getEventQueue().postEvent(new java.awt.event.FocusEvent( Component.this, enable ? java.awt.event.FocusEvent.FOCUS_GAINED : java.awt.event.FocusEvent.FOCUS_LOST)); break; I would like to isolate the problem and have a small reproducer to be able to report it. Are there other known/reported use cases or applications with not working JAB 2.0.3 included in JDK 1.7? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
