LibreOffice Gerrit News for core on 2014-03-25
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal about module sc + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal about module sc, starmath End of freshness + More vertical space for the options dialog in https://gerrit.libreoffice.org/8735 from Andreas Mantke about module cui + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt about module include, sd, sfx2 * Merged changes on master for project core changed in the last 25 hours: + fdo#74702 ImplDrawBitmap functionality moved to protected function in https://gerrit.libreoffice.org/8720 from Chris Sherlock + fdo#74702 GetPaintArea protected function introduced in https://gerrit.libreoffice.org/8727 from Chris Sherlock + fdo#56284 : soffice fails to start unless ~/.config exists and is writabl in https://gerrit.libreoffice.org/8630 from Michaël Lefèvre + fdo#75577: Add and use $helppackaddon variable in https://gerrit.libreoffice.org/8662 from Jan-Marek Glogowski * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + sal: use posix_memalign only if it's available in https://gerrit.libreoffice.org/8405 from Douglas Mencken + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) New commits: commit b2fd4bfe76c3ebc219f312d86d9759e5cb4131ac Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 26 17:25:30 2013 +0200 When using --with-macosx-sdk=10.8 or 9, use xcode-select -print-path I want to be able to use of a separate Xcode installation (like a developer preview) instead of the /Applications/Xcode.app one. Change-Id: I1faa84d028a8df6b4fc61b321fd2a6cde9a0ab0f diff --git a/configure.ac b/configure.ac index b8def00..0e112bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,13 +2706,9 @@ if test $_os = Darwin; then fi ;; 10.8|10.9) -if test -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then - MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk -else -xcodepath=`xcode-select -print-path` -if test -d $xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then - MACOSX_SDK_PATH=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk -fi +xcodepath=`xcode-select -print-path` +if test -d $xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then + MACOSX_SDK_PATH=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk fi ;; esac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/source xmloff/source
sw/source/core/uibase/uno/unomailmerge.cxx |5 ++---
sw/source/ui/dbui/mmpreparemergepage.cxx |1 -
xmloff/source/draw/shapeexport.cxx | 17 +++--
3 files changed, 5 insertions(+), 18 deletions(-)
New commits:
commit 05c1c60a8258caa7b088bc52e85c4b3d8e70f68a
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Tue Mar 25 08:04:41 2014 +0100
Remove stray fprintf
Change-Id: I9d85108b8c2659f1b167299840772f51f80b2e29
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx
b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 60f800f..af42dd3 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -67,7 +67,6 @@ IMPL_LINK_NOARG(SwMailMergePrepareMergePage,
EditDocumentHdl_Impl)
IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
{
-fprintf(stderr, move\n);
SwMailMergeConfigItem rConfigItem = m_pWizard-GetConfigItem();
sal_Int32 nPos = rConfigItem.GetResultSetPosition();
if (pCtrl == m_pFirstPB)
commit cd8c774030f9a8d3abbaf0eb43a5cdd228e643cf
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Mon Mar 24 23:57:38 2014 +0100
Simplify by choosing shape kind in SvXMLElementExport constructor
Change-Id: I6d8e1e3c78675b6096f354cace3ff060801cad9e
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 9f119ac..f2f7c1b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2096,21 +2096,10 @@ void XMLShapeExport::ImpExportEllipseShape(
sal_Bool bCreateNewline( (nFeatures SEF_EXPORT_NO_WS) == 0 ); //
#86116#/#92210#
-// prepare name (with most used)
-enum ::xmloff::token::XMLTokenEnum eName(XML_CIRCLE);
-
-if(bCircle)
-{
-// name already set
-}
-else
-{
-// set name
-eName = XML_ELLIPSE;
-}
-
// write ellipse or circle
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, eName,
bCreateNewline, sal_True);
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW,
+bCircle ? XML_CIRCLE : XML_ELLIPSE,
+bCreateNewline, sal_True);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
commit 794d71c4e990a24539a8dad3d960169538a4b0d4
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Mon Mar 24 23:40:25 2014 +0100
Use isEmpty and endsWith
The isEmpty could be redundant, since the first test for length in
the old code seemed to be just a pre-condition for evaluating the
expressions in the second one.
Change-Id: I0d1838d5eb143196a0d7be0cbadf9f0a59cff71b
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx
b/sw/source/core/uibase/uno/unomailmerge.cxx
index 63d8199..e72c80a 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -723,9 +723,8 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aURLObj.SetSmartURL( aCurOutputURL );
OUString aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
-OUString aDelim = OUString(INET_PATH_TOKEN);
-if (aPath.getLength() = aDelim.getLength()
-aPath.copy( aPath.getLength() - aDelim.getLength() ) != aDelim)
+const OUString aDelim = OUString(INET_PATH_TOKEN);
+if (!aPath.isEmpty() !aPath.endsWith(aDelim))
aPath += aDelim;
if (bCurFileNameFromColumn)
pMgr-SetEMailColumn( aCurFileNamePrefix );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - accessibility/inc accessibility/source include/svtools svtools/source UnoControls/inc UnoControls/source
UnoControls/inc/basecontainercontrol.hxx|
105 --
UnoControls/source/base/basecontainercontrol.cxx|
94
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx|
4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx|
20 -
accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx |
4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx |
4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx |
3
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx |
4
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx |
20 -
accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx|
4
accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx |
4
accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx |
3
accessibility/inc/accessibility/extended/accessibletablistbox.hxx |
4
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx|
3
accessibility/source/extended/AccessibleBrowseBox.cxx |
9
accessibility/source/extended/AccessibleBrowseBoxBase.cxx |
31 --
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx |
7
accessibility/source/extended/AccessibleBrowseBoxTable.cxx |
7
accessibility/source/extended/AccessibleGridControl.cxx |
11 -
accessibility/source/extended/AccessibleGridControlBase.cxx |
30 --
accessibility/source/extended/AccessibleGridControlHeader.cxx |
7
accessibility/source/extended/AccessibleGridControlTable.cxx|
7
accessibility/source/extended/textwindowaccessibility.cxx |
8
include/svtools/accessibletableprovider.hxx |
8
svtools/source/contnr/svtabbx.cxx |
6
25 files changed, 11 insertions(+), 396 deletions(-)
New commits:
commit f9cc7509855c2e9efc1b7a37259919131e04da2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 24 17:34:05 2014 +0100
Reduce IAccessibleTabListBox to what's actually used
...the calls to getAccessibleChild(0) and
getHeaderBar(BBYTE_COLUMNHEADERBAR)
ultimately all ended up at
AccessibleBrowseBox::implGetHeaderBar(BBTYPE_COLUMNHEADERBAR).
Change-Id: Ie25659e19d0d1ce2dcde2d1440ecc69b4fa265b0
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
index d14d764..985642e 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
@@ -83,9 +83,9 @@ public:
}
::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
-getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+getHeaderBar()
{
-return AccessibleBrowseBox::getHeaderBar( _eObjType );
+return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR
);
}
protected:
diff --git a/include/svtools/accessibletableprovider.hxx
b/include/svtools/accessibletableprovider.hxx
index 973ec03..acd3fea 100644
--- a/include/svtools/accessibletableprovider.hxx
+++ b/include/svtools/accessibletableprovider.hxx
@@ -145,14 +145,10 @@ public:
virtual css::uno::Reference css::accessibility::XAccessible
getMyself() = 0;
-virtual css::uno::Reference css::accessibility::XAccessible
-SAL_CALL getAccessibleChild( sal_Int32 nChildIndex )
-throw ( css::lang::IndexOutOfBoundsException,
css::uno::RuntimeException, std::exception ) = 0;
-
-/** returns the accessible object for the row or the column header bar
+/** returns the accessible object for the column header bar
*/
virtual css::uno::Reference css::accessibility::XAccessible
-getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
+getHeaderBar() = 0;
protected:
~IAccessibleTabListBox() {}
diff --git a/svtools/source/contnr/svtabbx.cxx
b/svtools/source/contnr/svtabbx.cxx
index c07ca6e..c2ecf34 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -921,10 +921,10 @@ Reference XAccessible
SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR
sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState );
if ( bIsCheckBox )
xChild =
m_pImpl-m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell(
-m_pAccessible-getAccessibleChild( 0 ), *this, NULL, _nRow,
_nColumnPos, eState, false );
+
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on|63087 | --- Comment #153 from Jorendc jore...@libreoffice.org --- (In reply to comment #152) Removed bug 63087 - was an enhancement request that does not belong on the list. done :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 47/3a118a62842270b85713d0ab0dc247b5778439
47/3a118a62842270b85713d0ab0dc247b5778439 |1 + 1 file changed, 1 insertion(+) New commits: commit ae43aaa3686470cf0d09fdfe62bae7d9e36962e6 Author: David Tardon dtar...@redhat.com Date: Tue Mar 25 09:30:49 2014 +0100 Notes added by 'git notes add' diff --git a/47/3a118a62842270b85713d0ab0dc247b5778439 b/47/3a118a62842270b85713d0ab0dc247b5778439 new file mode 100644 index 000..72ef677 --- /dev/null +++ b/47/3a118a62842270b85713d0ab0dc247b5778439 @@ -0,0 +1 @@ +merged as: 9ee0cf63a1dafebb673fbee9ccfc82a56fd050d4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sd/qa svx/source
sd/qa/unit/data/xml/fdo64586_0.xml |4 ++--
sd/qa/unit/data/xml/n758621_0.xml |8
sd/qa/unit/data/xml/n758621_1.xml |6 +++---
svx/source/svdraw/svdotext.cxx | 10 --
4 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 0a9cc5ce4d2d814587dba16ed8acc7eb38e347c8
Author: David Tardon dtar...@redhat.com
Date: Tue Mar 25 08:45:18 2014 +0100
Revert avoid infinite loop when setting vert. text dir.
The problem is already fixed by
33c310b6ff9feb277c001ce61db96864baedc3bc and
1a67b7cc3d5dc3dcd0de0e247f638c33d57dea1b .
This reverts commit 363119a9f2f0710a55530909330efb343d5a8bae.
Change-Id: Ieac14da9f37849cd51d14ed0035b3808b8dd77c0
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3270545..8e89fb2 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1617,17 +1617,15 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
case SDRTEXTHORZADJUST_BLOCK:
aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
}
+SetObjectItemSet(aNewSet);
+
pOutlinerParaObject = GetOutlinerParaObject();
if( pOutlinerParaObject )
{
-// Set ParaObject orientation accordingly. This _must_ be
-// done before applying the updated item set, otherwise we
-// get stuck in a loop leading to eventual stack overflow.
+// set ParaObject orientation accordingly
pOutlinerParaObject-SetVertical(bVertical);
}
-SetObjectItemSet(aNewSet);
-
// restore object size
SetSnapRect(aObjectRect);
}
commit 1e188aa0043907c478989b3e863b2719af02d360
Author: David Tardon dtar...@redhat.com
Date: Tue Mar 25 08:44:11 2014 +0100
update test files
Change-Id: I937a85fa7bda7df13e79e704973c21bfc732ba66
diff --git a/sd/qa/unit/data/xml/fdo64586_0.xml
b/sd/qa/unit/data/xml/fdo64586_0.xml
index e5c4316..a248783 100644
--- a/sd/qa/unit/data/xml/fdo64586_0.xml
+++ b/sd/qa/unit/data/xml/fdo64586_0.xml
@@ -1,6 +1,6 @@
?xml version=1.0?
XShapes
- XShape positionX=1397 positionY=838 sizeX=25197 sizeY=3507
type=com.sun.star.presentation.TitleTextShape fontHeight=44.00
fontColor=00 textAutoGrowHeight=true textAutoGrowWidth=false
textContourFrame=false textFitToSize=NONE textHorizontalAdjust=BLOCK
textVerticalAdjust=CENTER textLeftDistance=0 textRightDistance=0
textUpperDistance=0 textLowerDistance=0 textMaximumFrameHeight=0
textMaximumFrameWidth=0 textMinimumFrameHeight=3507
textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0
textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE
textAnimationStartInside=false textAnimationStopInside=false
textWritingMode=LR_TB fillStyle=NONE fillColor=ff
fillTransparence=0 fillTransparenceGradientName=
+ XShape positionX=1397 positionY=838 sizeX=25197 sizeY=3506
type=com.sun.star.presentation.TitleTextShape fontHeight=44.00
fontColor=00 textAutoGrowHeight=true textAutoGrowWidth=false
textContourFrame=false textFitToSize=NONE textHorizontalAdjust=BLOCK
textVerticalAdjust=CENTER textLeftDistance=0 textRightDistance=0
textUpperDistance=0 textLowerDistance=0 textMaximumFrameHeight=0
textMaximumFrameWidth=0 textMinimumFrameHeight=3506
textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0
textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE
textAnimationStartInside=false textAnimationStopInside=false
textWritingMode=LR_TB fillStyle=NONE fillColor=ff
fillTransparence=0 fillTransparenceGradientName=
FillTransparenceGradient style=LINEAR startColor=00
endColor=ff angle=0 border=0 xOffset=50 yOffset=50
startIntensity=100 endIntensity=100 stepCount=0/
FillGradient style=LINEAR startColor=00 endColor=ff angle=0
border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100
stepCount=0/
FillHatch style=SINGLE color=3465a4 distance=20 angle=0/
@@ -10,7 +10,7 @@
LineEnd/
Transformation
Line1 column1=25198.00 column2=0.00 column3=1397.00/
- Line2 column1=0.00 column2=3508.00 column3=838.00/
+ Line2 column1=0.00 column2=3507.00 column3=838.00/
Line3 column1=0.00 column2=0.00 column3=1.00/
/Transformation
/XShape
diff --git a/sd/qa/unit/data/xml/n758621_0.xml
b/sd/qa/unit/data/xml/n758621_0.xml
index b0523b0..754be1d 100644
--- a/sd/qa/unit/data/xml/n758621_0.xml
+++ b/sd/qa/unit/data/xml/n758621_0.xml
@@ -1,6 +1,6 @@
?xml version=1.0?
XShapes
- XShape positionX=12042 positionY=1774 sizeX=12087 sizeY=9782
type=com.sun.star.presentation.TitleTextShape fontHeight=60.00
fontColor=004990 textAutoGrowHeight=true textAutoGrowWidth=false
textContourFrame=false textFitToSize=NONE textHorizontalAdjust=RIGHT
textVerticalAdjust=CENTER textLeftDistance=250 textRightDistance=250
textUpperDistance=130
Re: Bunch of error messages related to gio_content.cxx
On 03/24/2014 10:31 PM, julien2412 wrote: On my different sources (master, 4.2 and 4.1), I noticed these logs: warn:ucb.ucp.gio:5217:1:ucb/source/ucp/gio/gio_content.cxx:378: ignoring GError L'emplacement indiqué n'est pas pris en charge for vnd.sun.star.job:alias=UpdateCheck [...] Those should be harmless; the GIO-based UCP is registered as a catch-all at the UCB, so is used for all URI schemes for which no specific UCP is registered (like file and http). That means it gets all the odd LO-internal URL schemes (like vnd.sun.star.job and macro) which GIO itself cannot handle. Appearance of these warnings would depend on configuration of --enable-gio vs. --enable-gnome-vfs at least. warn:unotools.config:5217:1:unotools/source/config/configitem.cxx:443: ignoring XHierarchicalNameAccess to /org.openoffice.Office.Calc/Formula/Syntax/StringConversion Exception: Syntax/StringConversion There is no configuration item /org.openoffice.Office.Calc/Formula/Syntax/StringConversion, but http://cgit.freedesktop.org/libreoffice/core/commit/?id=c52f3ea0eb327343b1945290c43d3b66f546dfe9 user selectable string conversion models, related fdo#37132 fdo#74622 looks like it assumes there is and added Syntax/StringConversion to ScFormulaCfg::GetPropertyNames (sc/source/core/tool/formulaopt.cxx). Eike, can you clarify? warn:configmgr:5217:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/julien/compile-libreoffice/libo/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu4k5tkj.tmp/Addons.xcu warn:configmgr:5217:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/julien/compile-libreoffice/libo/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu4k5tkj.tmp/Addons.xcu See http://lists.freedesktop.org/archives/libreoffice/2012-April/030786.html Cruft in potentially bundled extensions' Addons.xcu. So if you want those warnings to go away, either configure without explicit --enable-ext-google-docs or nudge Przemysław to fix upstream and/or whomever feels responsible for http://dev-www.libreoffice.org/src/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt to patch it there. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 43 +++---
writerfilter/source/ooxml/OOXMLStreamImpl.hxx |5 +++
2 files changed, 44 insertions(+), 4 deletions(-)
New commits:
commit f5ae42f9344a523e586fdcca4f0e670ee2a4d821
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Mar 25 09:40:27 2014 +0100
fdo#76563 DOCX import: speed up importing lots of hyperlinks
The problem was that in
writerfilter::ooxml::OOXMLStreamImpl::lcl_getTarget(), we went over the
list of all hyperlinks for each request. Instead, let's do it once, and
in the remaining cases just look up the result from a map.
Numbers before on my machine (ms, load time):
2215, 2243, 2205
After:
1362, 1358, 1358
So that causes about 39% speedup for a non-debug build.
Change-Id: Ib4718abbe834c5ba49a85469148b656e3c808041
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 6f639e6..284d369 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -93,6 +93,42 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
const OUString rId,
OUString rDocumentTarget)
{
+static OUString sId(Id);
+static OUString sTarget(Target);
+static OUString sTargetMode(TargetMode);
+static OUString sExternal(External);
+if (maIdCache.empty())
+{
+// Cache is empty? Then let's build it!
+uno::Sequence uno::Sequencebeans::StringPair aSeqs =
xRelationshipAccess-getAllRelationships();
+for (sal_Int32 i = 0; i aSeqs.getLength(); ++i)
+{
+const uno::Sequencebeans::StringPair rSeq = aSeqs[i];
+OUString aId;
+OUString aTarget;
+bool bExternal = false;
+for (sal_Int32 j = 0; j rSeq.getLength(); ++j)
+{
+const beans::StringPair rPair = rSeq[j];
+if (rPair.First == sId)
+aId = rPair.Second;
+else if (rPair.First == sTarget)
+aTarget = rPair.Second;
+else if (rPair.First == sTargetMode rPair.Second ==
sExternal)
+bExternal = true;
+}
+// Only cache external targets, internal ones are more complex
(see below)
+if (bExternal)
+maIdCache[aId] = aTarget;
+}
+}
+
+if (maIdCache.find(rId) != maIdCache.end())
+{
+rDocumentTarget = maIdCache[rId];
+return true;
+}
+
bool bFound = false;
static uno::Reference com::sun::star::uri::XUriReferenceFactory xFac =
::com::sun::star::uri::UriReferenceFactory::create( mxContext );
// use '/' to representent the root of the zip package ( and provide a
'file' scheme to
@@ -101,7 +137,6 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
uno::Reference com::sun::star::uri::XUriReference xBase = xFac-parse(
OUString( file:/// ) + msPath );
static OUString sType(Type);
-static OUString sId(Id);
static OUString
sDocumentType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument;);
static OUString
sStylesType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles;);
static OUString
sNumberingType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering;);
@@ -142,9 +177,6 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
static OUString
sFootersTypeStrict(http://purl.oclc.org/ooxml/officeDocument/relationships/footer;);
static OUString
sHeaderTypeStrict(http://purl.oclc.org/ooxml/officeDocument/relationships/header;);
static OUString
sOleObjectTypeStrict(http://purl.oclc.org/ooxml/officeDocument/relationships/oleObject;);
-static OUString sTarget(Target);
-static OUString sTargetMode(TargetMode);
-static OUString sExternal(External);
static OUString
sVBAProjectType(http://schemas.microsoft.com/office/2006/relationships/vbaProject;);
OUString sStreamType;
@@ -348,6 +380,9 @@ void OOXMLStreamImpl::init()
openStreamElementByHierarchicalName
(msTarget, embed::ElementModes::SEEKABLEREAD));
aAny = mxDocumentStream;
+// Non-cached ID lookup works by accessing mxDocumentStream as an
embed::XRelationshipAccess.
+// So when it changes, we should empty the cache.
+maIdCache.clear();
}
}
}
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 4db03a2..2230944 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -19,6 +19,8 @@
#ifndef
Re: Who pressed Ctrl-Alt-Shift-D?
On 03/24/2014 03:57 PM, Regina Henschel wrote: Stephan Bergmann schrieb: On 03/24/2014 02:25 PM, Regina Henschel wrote: I use it. The default setting is to show the error message in a message box. But I want to get the error message in a window. I assume you are developing on Windows. What error messages are you talking about? I'd assumed that all debug output (tools/debug.hxx DBG_ASSERT et al; osl/diagnose.h OSL_ASSERT et al; sal/log.hxx SAL_WARN et al) by now goes to stderr on all platforms (where on Windows the stderr output is at least visible when running soffice from a Cygwin shell). Yes, it is on Windows and about these messages. But if you document what values are needed in the dbgsv.ini file, then the dialog itself is not needed. The documentation would have to include the help texts of the dialog as well. No, I was mostly interested in removing the underlying functionality. You asked Does anyone do that..? and therefore I have answered. But I have not developed for LO directly for a long time, but my things come in from AOO. So there is no need to take me into account. Ah, that explains the above, about redirecting DBG_ASSERT output, which is no longer available in LO since the introduction of the sal/log.hxx functionality. And don't get me wrong---your input is welcome. I should have phrased my original question better. I wonder, why you want to remove the functionality. Does it any harm? The usual thing, reducing maintenance cost by removing unused (if it turns out to be) code. (I stumbled across it when pondering how best to fix https://bugs.freedesktop.org/show_bug.cgi?id=76179 [Embedded Firebird] - no DbgTestSolarMutex function set warning.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/dispatch.cxx | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
New commits:
commit 93d7c753051664bc3f03d41fe634c1d996a07a80
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 25 09:59:58 2014 +0100
Adapt to sal/log.hxx
Change-Id: I96786bcab1205d212926af6c7c6afbf88bfe1453
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index d74bd22..1f8da2e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2099,7 +2099,7 @@ bool SfxDispatcher::_FillState
pSh-CallState( pFunc, rState );
#ifdef DBG_UTIL
// To examine the conformity of IDL (SlotMap) and current Items
-if ( DbgIsAssertWarning() rState.Count() )
+if ( rState.Count() )
{
SfxInterface *pIF = pSh-GetInterface();
SfxItemIter aIter( rState );
@@ -2110,15 +2110,11 @@ bool SfxDispatcher::_FillState
if ( !IsInvalidItem(pItem) !pItem-ISA(SfxVoidItem) )
{
sal_uInt16 nSlotId =
rState.GetPool()-GetSlotId(pItem-Which());
-if ( !pItem-IsA(pIF-GetSlot(nSlotId)-GetType()-Type())
)
-{
-OStringBuffer aMsg(item-type unequal to IDL (= no
BASIC));
-aMsg.append(\nwith SID: );
-aMsg.append(static_castsal_Int32(nSlotId));
-aMsg.append(\nin );
-aMsg.append(pIF-GetClassName());
-DbgOut(aMsg.getStr(), DBG_OUT_ERROR, __FILE__,
__LINE__);
-}
+SAL_WARN_IF(
+!pItem-IsA(pIF-GetSlot(nSlotId)-GetType()-Type()),
+sfx.control,
+item-type unequal to IDL (= no BASIC) with SID:
+ nSlotId in pIF-GetClassName());
}
}
}
___
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/seleng.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit b2b3dd2fe6d771f8c662ceb7dcab95149606f041
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 25 10:01:29 2014 +0100
Remove commented-out debug code
Change-Id: I1442d57eb2f80d98370549659eece5a2cd7db3c5
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 8c45086..f1291dc 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -247,7 +247,6 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent
rMEvt )
bool SelectionEngine::SelMouseButtonUp( const MouseEvent rMEvt )
{
aWTimer.Stop();
-//DbgOut(Up);
if( !pFunctionSet || !pWin )
{
nFlags = ~(SELENG_CMDEVT | SELENG_WAIT_UPEVT | SELENG_IN_SEL);
@@ -312,12 +311,10 @@ bool SelectionEngine::SelMouseMove( const MouseEvent
rMEvt )
if ( !(nFlags SELENG_HAS_ANCH) )
{
pFunctionSet-CreateAnchor();
-//DbgOut(Move:Creating anchor);
nFlags |= SELENG_HAS_ANCH;
}
}
-//DbgOut(Move:SetCursor);
pFunctionSet-SetCursorAtPoint( rMEvt.GetPosPixel() );
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optsecuritypage.ui | 215 ++--- 1 file changed, 109 insertions(+), 106 deletions(-) New commits: commit 0cb272bbf59cf734ea7a47f6ee3fb5c02eab7254 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 09:19:56 2014 + use a grid instead of a box because they shrink better Change-Id: If271f02d99625ffa6fd418cf83307add7c09d802 diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 1ff3755..55c9439 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -1,40 +1,39 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- - object class=GtkBox id=OptSecurityPage + requires lib=gtk+ version=3.0/ + object class=GtkGrid id=OptSecurityPage property name=visibleTrue/property property name=can_focusFalse/property -property name=hexpandTrue/property property name=border_width6/property -property name=orientationvertical/property -property name=spacing12/property +property name=row_spacing12/property child - object class=GtkFrame id=frame1 + object class=GtkFrame id=certificatepath property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=label_xalign0/property property name=shadow_typenone/property child - object class=GtkAlignment id=alignment1 + object class=GtkAlignment id=alignment5 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=top_padding6/property property name=left_padding12/property child - object class=GtkGrid id=grid1 + object class=GtkGrid id=grid7 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=column_spacing24/property child - object class=GtkLabel id=label4 + object class=GtkLabel id=label7 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=xalign0/property -property name=label translatable=yesAdjust security related options and define warnings for hidden information in documents. /property +property name=label translatable=yesSelect the Network Security Services certificate directory to use for digital signatures./property property name=wrapTrue/property property name=max_width_chars56/property /object @@ -46,8 +45,8 @@ /packing /child child - object class=GtkButton id=options -property name=label translatable=yesO_ptions.../property + object class=GtkButton id=cert +property name=label translatable=yes_Certificate.../property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -66,10 +65,85 @@ /object /child child type=label - object class=GtkLabel id=label1 + object class=GtkLabel id=label8 property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesSecurity options and warnings/property +property name=label translatable=yesCertificate Path/property +attributes + attribute name=weight value=bold/ +/attributes + /object +/child + /object + packing +property name=left_attach0/property +property name=top_attach3/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkFrame id=macrosecurity +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=top_padding6/property +property name=left_padding12/property +child + object class=GtkGrid id=grid3 +property
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sw/source
sw/source/ui/uno/unomailmerge.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 027e8b126b85d1c7abf458f2b37b61f76e7d3d47 Author: Andras Timar andras.ti...@collabora.com Date: Mon Mar 24 10:50:02 2014 +0100 fdo#74155 mailmerge output path fix regression from dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10 Change-Id: Ia79ed67df1f0e2803bd3e729951dee3a7438096d Reviewed-on: https://gerrit.libreoffice.org/8729 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Bjoern Michaelsen bjoern.michael...@canonical.com Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 6181b3fe2c11d55f46eaaf657877aa9396c16374) diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index f1a75fe..398376fac 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -707,7 +707,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( OUString aDelim = OUString(INET_PATH_TOKEN); if (aPath.getLength() = aDelim.getLength() -aPath.copy( aPath.getLength() - aDelim.getLength() ) == aDelim) +aPath.copy( aPath.getLength() - aDelim.getLength() ) != aDelim) aPath += aDelim; if (bCurFileNameFromColumn) pMgr-SetEMailColumn( aCurFileNamePrefix ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - framework/source
framework/source/services/autorecovery.cxx |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 7e1d17f1ba3776da70db40d6d1a518dcf3238860 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Mar 14 09:42:02 2014 +0100 fdo#51819: autorecovery: fix saving password in protected documents. Thanks to s...@mailinator.com for the idea. Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c (cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219) Reviewed-on: https://gerrit.libreoffice.org/8676 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8a32d78..3a18af4 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2305,9 +2305,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString // if the document was loaded with a password, it should be // stored with password utl::MediaDescriptor lNewArgs; -OUString sPassword = lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PASSWORD(), OUString()); -if (!sPassword.isEmpty()) -lNewArgs[utl::MediaDescriptor::PROP_PASSWORD()] = sPassword; +css::uno::Sequence css::beans::NamedValue aEncryptionData = + lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA(), +css::uno::Sequence css::beans::NamedValue ()); +if (aEncryptionData.getLength() 0) +lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] = aEncryptionData; // Further it must be saved using the default file format of that application. // Otherwhise we will some data lost. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] test-files.git: loperf/001_empty.ods loperf/002_empty.odt loperf/003_empty.odg loperf/004_empty.odp loperf/011_fdo#38513.odt loperf/012_fdo#38513.doc loperf/013_fdo#38513.docx lo
dev/null |binary loperf/001_empty.ods |binary loperf/002_empty.odt |binary loperf/003_empty.odg |binary loperf/004_empty.odp |binary loperf/011_fdo#38513.odt |binary loperf/012_fdo#38513.doc |binary loperf/013_fdo#38513.docx |binary loperf/021_fdo#59882.odt |binary loperf/022_fdo#59882.doc |binary loperf/023_fdo#59882.docx |binary loperf/031_numbers.ods|binary loperf/032_numbers.xls|binary loperf/033_numbers.xlsx |binary loperf/041_fdo#67303.docx |binary loperf/051_fdo#73300.odt |binary loperf/061_fdo#68750.doc |binary loperf/071_fdo#74516.ods |binary loperf/081_fdo#54638.ods |binary loperf/082_fdo#54638.xlsx |binary loperf/091_fdo#39372.odt |binary loperf/101_fdo#72884.doc |binary 22 files changed New commits: commit 5fea7b6f4b91e31ee5f0db49c7831066e05f7add Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Mar 25 10:48:54 2014 +0100 Add more test files for loperf from bugzilla. diff --git a/loperf/empty.ods b/loperf/001_empty.ods similarity index 100% rename from loperf/empty.ods rename to loperf/001_empty.ods diff --git a/loperf/empty.odt b/loperf/002_empty.odt similarity index 100% rename from loperf/empty.odt rename to loperf/002_empty.odt diff --git a/loperf/003_empty.odg b/loperf/003_empty.odg new file mode 100644 index 000..18dfedf Binary files /dev/null and b/loperf/003_empty.odg differ diff --git a/loperf/004_empty.odp b/loperf/004_empty.odp new file mode 100644 index 000..bc5c783 Binary files /dev/null and b/loperf/004_empty.odp differ diff --git a/loperf/011_fdo#38513.odt b/loperf/011_fdo#38513.odt new file mode 100644 index 000..23edde6 Binary files /dev/null and b/loperf/011_fdo#38513.odt differ diff --git a/loperf/012_fdo#38513.doc b/loperf/012_fdo#38513.doc new file mode 100644 index 000..302e917 Binary files /dev/null and b/loperf/012_fdo#38513.doc differ diff --git a/loperf/013_fdo#38513.docx b/loperf/013_fdo#38513.docx new file mode 100644 index 000..8d4217c Binary files /dev/null and b/loperf/013_fdo#38513.docx differ diff --git a/loperf/021_fdo#59882.odt b/loperf/021_fdo#59882.odt new file mode 100644 index 000..4c5bf9a Binary files /dev/null and b/loperf/021_fdo#59882.odt differ diff --git a/loperf/022_fdo#59882.doc b/loperf/022_fdo#59882.doc new file mode 100644 index 000..12c7471 Binary files /dev/null and b/loperf/022_fdo#59882.doc differ diff --git a/loperf/023_fdo#59882.docx b/loperf/023_fdo#59882.docx new file mode 100644 index 000..b806a1b Binary files /dev/null and b/loperf/023_fdo#59882.docx differ diff --git a/loperf/031_numbers.ods b/loperf/031_numbers.ods new file mode 100644 index 000..6ee32af Binary files /dev/null and b/loperf/031_numbers.ods differ diff --git a/loperf/032_numbers.xls b/loperf/032_numbers.xls new file mode 100644 index 000..d0b4e57 Binary files /dev/null and b/loperf/032_numbers.xls differ diff --git a/loperf/033_numbers.xlsx b/loperf/033_numbers.xlsx new file mode 100644 index 000..2575558 Binary files /dev/null and b/loperf/033_numbers.xlsx differ diff --git a/loperf/041_fdo#67303.docx b/loperf/041_fdo#67303.docx new file mode 100644 index 000..76b8f35 Binary files /dev/null and b/loperf/041_fdo#67303.docx differ diff --git a/loperf/051_fdo#73300.odt b/loperf/051_fdo#73300.odt new file mode 100644 index 000..0fdae4b Binary files /dev/null and b/loperf/051_fdo#73300.odt differ diff --git a/loperf/061_fdo#68750.doc b/loperf/061_fdo#68750.doc new file mode 100644 index 000..f1f74c9 Binary files /dev/null and b/loperf/061_fdo#68750.doc differ diff --git a/loperf/071_fdo#74516.ods b/loperf/071_fdo#74516.ods new file mode 100644 index 000..d4608bc Binary files /dev/null and b/loperf/071_fdo#74516.ods differ diff --git a/loperf/081_fdo#54638.ods b/loperf/081_fdo#54638.ods new file mode 100644 index 000..59c242a Binary files /dev/null and b/loperf/081_fdo#54638.ods differ diff --git a/loperf/082_fdo#54638.xlsx b/loperf/082_fdo#54638.xlsx new file mode 100644 index 000..b37f899 Binary files /dev/null and b/loperf/082_fdo#54638.xlsx differ diff --git a/loperf/091_fdo#39372.odt b/loperf/091_fdo#39372.odt new file mode 100644 index 000..9c6bf0f Binary files /dev/null and b/loperf/091_fdo#39372.odt differ diff --git a/loperf/101_fdo#72884.doc b/loperf/101_fdo#72884.doc new file mode 100644 index 000..f5082f7 Binary files /dev/null and b/loperf/101_fdo#72884.doc differ diff --git a/loperf/sample.xlsx b/loperf/sample.xlsx deleted file mode 100644 index 1c1cfc3..000 Binary files a/loperf/sample.xlsx and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/column.hxx|3 +
sc/inc/document.hxx |2 +
sc/inc/table.hxx |2 +
sc/source/core/data/column.cxx | 21 +--
sc/source/core/data/column3.cxx | 69 +++
sc/source/core/data/documen2.cxx | 12 ++
sc/source/core/data/table2.cxx |8
7 files changed, 113 insertions(+), 4 deletions(-)
New commits:
commit 572fdb94ecf3dfea6a6f787398efa4e4c54b4718
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Sat Mar 22 09:47:11 2014 -0400
fdo#76470: Avoid joining new formula cells individually.
Instead, insert the formula cells in the group first, then only try to join
the top and bottom cells afterward. Otherwise the grouping would get messed
up and a problem would ensue.
(cherry picked from commit 474b2ea601f7fa2f1fbeae0f169ff5b8abc965be)
Conflicts:
sc/inc/column.hxx
Change-Id: I4fdd5326c029032a636d8225b5fb16cbde427c7d
Reviewed-on: https://gerrit.libreoffice.org/8716
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e6a69e1..33a1bf7 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -291,6 +291,8 @@ public:
ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell );
ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
+bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
+
svl::SharedString GetSharedString( SCROW nRow ) const;
void SetRawString( SCROW nRow, const OUString rStr, bool bBroadcast =
true );
@@ -555,6 +557,7 @@ private:
sc::CellStoreType::iterator GetPositionToInsert( const
sc::CellStoreType::iterator it, SCROW nRow );
void ActivateNewFormulaCell( const sc::CellStoreType::iterator itPos,
SCROW nRow, ScFormulaCell rCell, bool bJoin = true );
void ActivateNewFormulaCell( const sc::CellStoreType::position_type aPos,
ScFormulaCell rCell, bool bJoin = true );
+void AttachNewFormulaCells( const sc::CellStoreType::position_type aPos,
size_t nLength );
void BroadcastNewCell( SCROW nRow );
bool UpdateScriptType( sc::CellTextAttr rAttr, SCROW nRow,
sc::CellStoreType::iterator itr );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 04ffa47..809689b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -839,6 +839,8 @@ public:
*/
SC_DLLPUBLIC ScFormulaCell* SetFormulaCell( const ScAddress rPos,
ScFormulaCell* pCell );
+bool SetFormulaCells( const ScAddress rPos, std::vectorScFormulaCell*
rCells );
+
SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
const ScMarkData rMark,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index eda54721..77e5996 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -345,6 +345,8 @@ public:
*/
ScFormulaCell* SetFormulaCell( SCCOL nCol, SCROW nRow, ScFormulaCell*
pCell );
+bool SetFormulaCells( SCCOL nCol, SCROW nRow, std::vectorScFormulaCell*
rCells );
+
svl::SharedString GetSharedString( SCCOL nCol, SCROW nRow ) const;
voidSetValue( SCCOL nCol, SCROW nRow, const double rVal );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7914fdf..7a448fd 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -43,6 +43,7 @@
#include refupdatecontext.hxx
#include listenercontext.hxx
#include refhint.hxx
+#include stlalgorithm.hxx
#include svl/poolcach.hxx
#include svl/zforlist.hxx
@@ -2553,21 +2554,33 @@ class UpdateRefOnNonCopy :
std::unary_functionFormulaGroup, void
void fillUndoDoc( const ScAddress rOldPos, SCROW nLength, const
ScTokenArray rOldCode )
{
-if (!mpUndoDoc)
+if (!mpUndoDoc || nLength = 0)
return;
// Insert the old formula group into the undo document.
ScAddress aUndoPos = rOldPos;
ScFormulaCell* pFC = new ScFormulaCell(mpUndoDoc, aUndoPos,
rOldCode.Clone());
-ScFormulaCellGroupRef xGroup = pFC-CreateCellGroup(nLength, false);
-mpUndoDoc-SetFormulaCell(aUndoPos, pFC);
+if (nLength == 1)
+{
+mpUndoDoc-SetFormulaCell(aUndoPos, pFC);
+return;
+}
+
+std::vectorScFormulaCell* aCells;
+aCells.reserve(nLength);
+ScFormulaCellGroupRef xGroup = pFC-CreateCellGroup(nLength, false);
+aCells.push_back(pFC);
aUndoPos.IncRow();
for (SCROW i = 1; i nLength; ++i, aUndoPos.IncRow())
{
pFC = new ScFormulaCell(mpUndoDoc, aUndoPos, xGroup);
-mpUndoDoc-SetFormulaCell(aUndoPos, pFC);
+aCells.push_back(pFC);
}
+
+if (!mpUndoDoc-SetFormulaCells(rOldPos, aCells))
[Libreoffice-commits] core.git: svx/source
svx/source/table/svdotable.cxx | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 26b06662ebc3e5d664400bc95c39d6220de03136
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Mar 25 11:27:51 2014 +0100
avoid repeated table layouting (fdo#75622)
With the document from fdo#75622, this saves 3775 calls and leaves only 13.
e586fe4585dc07e6f6dd061d09f6a7fb0b22948c removed avoiding the call
to LayoutTable(), which made loading slow. I checked that the doc from that
bugreport still works, so if very original code was correct in avoiding
the call sometimes, this should be ok too.
Change-Id: Ia80f974d4497e5cb04612331527eb87b579ddb76
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index ffb4ed7..2b08d7e 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -242,9 +242,19 @@ public:
void connectTableStyle();
void disconnectTableStyle();
virtual bool isInUse();
+private:
+static SdrTableObjImpl* lastLayoutTable;
+static Rectangle lastLayoutRectangle;
+static bool lastLayoutFitWidth;
+static bool lastLayoutFitHeight;
+static WritingMode lastLayoutMode;
};
-
+SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
+Rectangle SdrTableObjImpl::lastLayoutRectangle;
+bool SdrTableObjImpl::lastLayoutFitWidth;
+bool SdrTableObjImpl::lastLayoutFitHeight;
+WritingMode SdrTableObjImpl::lastLayoutMode;
SdrTableObjImpl::SdrTableObjImpl()
: mpTableObj( 0 )
@@ -257,6 +267,8 @@ SdrTableObjImpl::SdrTableObjImpl()
SdrTableObjImpl::~SdrTableObjImpl()
{
+if( lastLayoutTable == this )
+lastLayoutTable = NULL;
}
@@ -677,8 +689,21 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
{
if( mpLayouter mpTableObj-GetModel() )
{
-TableModelNotifyGuard aGuard( mxTable.get() );
-mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
+// with the same settings, noticeably increasing load time. Skip if
already done.
+WritingMode writingMode = mpTableObj-GetWritingMode();
+if( lastLayoutTable != this || lastLayoutRectangle != rArea
+|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
+|| lastLayoutMode != writingMode )
+{
+lastLayoutTable = this;
+lastLayoutRectangle = rArea;
+lastLayoutFitWidth = bFitWidth;
+lastLayoutFitHeight = bFitHeight;
+lastLayoutMode = writingMode;
+TableModelNotifyGuard aGuard( mxTable.get() );
+mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/sdi sw/source
include/sfx2/sfxsids.hrc |3 ++-
sfx2/sdi/sfx.sdi |5 +
sw/source/core/uibase/uiview/view2.cxx |7 ++-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 450cb7831f077df43582de15631de3886888e9e0
Author: Mathias Supp mathias.s...@vector.com
Date: Tue Feb 25 04:04:48 2014 +0100
add parameter to supress dialog
With the new parameter you can now supress the dialog for document
compare in writer.
Change-Id: I984ee75552e5c006332331510df5d437b687903f
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index b8bef21..ebac7de 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -264,6 +264,7 @@
#define SID_MAIL_SENDDOCASFORMAT(SID_SFX_START + 1707)
#define SID_MAIL_SENDDOCASMS(SID_SFX_START + 1708)
#define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709)
+#define SID_NO_ACCEPT_DIALOG(SID_SFX_START + 1710)
#define SID_NOAUTOSAVE (SID_SFX_START + 1711)
#define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712)
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
@@ -285,6 +286,7 @@
// SID_SFX_free_START (SID_SFX_START + 1728)
// SID_SFX_free_END(SID_SFX_START + 3999)
+
#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
// FREE, was SID_VIEW_ZOOM_MODE
// FREE, was SID_VIEW_POS_SIZE
@@ -753,7 +755,6 @@
#define SC_VIEW_START (SID_SC_START)
#endif
#define FID_CHG_RECORD (EDIT_MENU_START + 18)
-//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
#define SID_CHG_PROTECT (SC_VIEW_START + 84)
// eof
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index bba571c..59e6254 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1071,7 +1071,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
-(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName
SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions
SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION)
+(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName
SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions
SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION, SfxBoolItem
NoAcceptDialog SID_NO_ACCEPT_DIALOG)
[
/* flags: */
AutoUpdate = FALSE,
@@ -4302,9 +4302,6 @@ SfxObjectItem Open SID_OPENDOC
RecordPerSet;
Asynchron;
-/* status: */
-SlotType = SfxStringItem
-
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
diff --git a/sw/source/core/uibase/uiview/view2.cxx
b/sw/source/core/uibase/uiview/view2.cxx
index b7d865e..52212a3 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -732,6 +732,7 @@ void SwView::Execute(SfxRequest rReq)
sal_Int16 nVersion = 0;
bool bHasFileName = false;
m_pViewImpl-SetParam( 0 );
+bool bNoAcceptDialog = false;
if( pArgs )
{
@@ -747,6 +748,10 @@ void SwView::Execute(SfxRequest rReq)
nVersion = ((const SfxInt16Item *)pItem)-GetValue();
m_pViewImpl-SetParam( nVersion );
}
+if( SFX_ITEM_SET == pArgs-GetItemState(
SID_NO_ACCEPT_DIALOG, sal_False, pItem ))
+{
+bNoAcceptDialog = ((const SfxBoolItem
*)pItem)-GetValue();
+}
}
m_pViewImpl-InitRequest( rReq );
@@ -756,7 +761,7 @@ void SwView::Execute(SfxRequest rReq)
{
rReq.SetReturnValue( SfxInt32Item( nSlot, nFound ));
-if (nFound 0) // show Redline browser
+if (nFound 0 !bNoAcceptDialog) // show Redline browser
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame-ShowChildWindow(FN_REDLINE_ACCEPT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - svx/source
svx/source/table/svdotable.cxx | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 7eefd10324207c52fafc639e51e3d4eb32eb3024
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Mar 25 11:27:51 2014 +0100
avoid repeated table layouting (fdo#75622)
With the document from fdo#75622, this saves 3775 calls and leaves only 13.
e586fe4585dc07e6f6dd061d09f6a7fb0b22948c removed avoiding the call
to LayoutTable(), which made loading slow. I checked that the doc from that
bugreport still works, so if very original code was correct in avoiding
the call sometimes, this should be ok too.
Change-Id: Ia80f974d4497e5cb04612331527eb87b579ddb76
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 474d42d..823154f 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -244,8 +244,20 @@ public:
virtual bool isInUse();
bool UpdateWritingMode();
+private:
+static SdrTableObjImpl* lastLayoutTable;
+static Rectangle lastLayoutRectangle;
+static bool lastLayoutFitWidth;
+static bool lastLayoutFitHeight;
+static WritingMode lastLayoutMode;
};
+SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
+Rectangle SdrTableObjImpl::lastLayoutRectangle;
+bool SdrTableObjImpl::lastLayoutFitWidth;
+bool SdrTableObjImpl::lastLayoutFitHeight;
+WritingMode SdrTableObjImpl::lastLayoutMode;
+
//
-
SdrTableObjImpl::SdrTableObjImpl()
@@ -259,6 +271,8 @@ SdrTableObjImpl::SdrTableObjImpl()
SdrTableObjImpl::~SdrTableObjImpl()
{
+if( lastLayoutTable == this )
+lastLayoutTable = NULL;
}
//
-
@@ -681,8 +695,21 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
{
if( mpLayouter mpTableObj-GetModel() )
{
-TableModelNotifyGuard aGuard( mxTable.get() );
-mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
+// with the same settings, noticeably increasing load time. Skip if
already done.
+WritingMode writingMode = mpTableObj-GetWritingMode();
+if( lastLayoutTable != this || lastLayoutRectangle != rArea
+|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
+|| lastLayoutMode != writingMode )
+{
+lastLayoutTable = this;
+lastLayoutRectangle = rArea;
+lastLayoutFitWidth = bFitWidth;
+lastLayoutFitHeight = bFitHeight;
+lastLayoutMode = writingMode;
+TableModelNotifyGuard aGuard( mxTable.get() );
+mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/table/svdotable.cxx | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
New commits:
commit f74991af12c78b25292641605ce1f2c55c44b33f
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Mar 25 11:27:51 2014 +0100
avoid repeated table layouting (fdo#75622)
With the document from fdo#75622, this saves 3775 calls and leaves only 13.
e586fe4585dc07e6f6dd061d09f6a7fb0b22948c removed avoiding the call
to LayoutTable(), which made loading slow. I checked that the doc from that
bugreport still works, so if very original code was correct in avoiding
the call sometimes, this should be ok too.
Conflicts:
svx/source/table/svdotable.cxx
Change-Id: Ia80f974d4497e5cb04612331527eb87b579ddb76
Reviewed-on: https://gerrit.libreoffice.org/8738
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 9c5e64a..d59c166 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -242,8 +242,20 @@ public:
void connectTableStyle();
void disconnectTableStyle();
virtual bool isInUse();
+private:
+static SdrTableObjImpl* lastLayoutTable;
+static Rectangle lastLayoutRectangle;
+static bool lastLayoutFitWidth;
+static bool lastLayoutFitHeight;
+static WritingMode lastLayoutMode;
};
+SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
+Rectangle SdrTableObjImpl::lastLayoutRectangle;
+bool SdrTableObjImpl::lastLayoutFitWidth;
+bool SdrTableObjImpl::lastLayoutFitHeight;
+WritingMode SdrTableObjImpl::lastLayoutMode;
+
//
-
SdrTableObjImpl::SdrTableObjImpl()
@@ -257,6 +269,8 @@ SdrTableObjImpl::SdrTableObjImpl()
SdrTableObjImpl::~SdrTableObjImpl()
{
+if( lastLayoutTable == this )
+lastLayoutTable = NULL;
}
//
-
@@ -677,8 +691,21 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
{
if( mpLayouter mpTableObj-GetModel() )
{
-TableModelNotifyGuard aGuard( mxTable.get() );
-mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
+// with the same settings, noticeably increasing load time. Skip if
already done.
+WritingMode writingMode = mpTableObj-GetWritingMode();
+if( lastLayoutTable != this || lastLayoutRectangle != rArea
+|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
+|| lastLayoutMode != writingMode )
+{
+lastLayoutTable = this;
+lastLayoutRectangle = rArea;
+lastLayoutFitWidth = bFitWidth;
+lastLayoutFitHeight = bFitHeight;
+lastLayoutMode = writingMode;
+TableModelNotifyGuard aGuard( mxTable.get() );
+mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+}
}
}
___
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/seleng.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 259ec024baf0592fe2d7dfea32ee052f8b5b3d20
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Mar 25 11:55:15 2014 +0100
remove commented code
commented out since it came in with
835219840d42cfb891614db2ed7bf0386293468a
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index f1291dc..fc5e257 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -29,7 +29,6 @@ FunctionSet::~FunctionSet()
inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const
{
-// return !( eSelMode == MULTIPLE_SELECTION bModifierKey1 );
return eSelMode != MULTIPLE_SELECTION || !bModifierKey1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx | 12 +---
basic/source/runtime/methods1.cxx |7 ---
basic/source/runtime/runtime.cxx | 12 +---
basic/source/sbx/sbxdec.cxx |7 +++
4 files changed, 17 insertions(+), 21 deletions(-)
New commits:
commit dd52330db6551c3e96fce5ba17ff823882d158fd
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Mar 25 20:07:48 2014 +0900
Avoid possible resource leaks by boost::scoped_array
Change-Id: I14e1f7ef217eb5e8e9db9f8962af868ab0a4ab81
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0cc3db1..b35d8d6 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -55,6 +55,7 @@
#include com/sun/star/script/XErrorQuery.hpp
#include ooo/vba/XHelperInterface.hpp
#include com/sun/star/bridge/oleautomation/XAutomationObject.hpp
+#include boost/scoped_array.hpp
using namespace comphelper;
using namespace osl;
@@ -445,28 +446,25 @@ RTLFUNC(CurDir)
const int PATH_INCR = 250;
int nSize = PATH_INCR;
-char* pMem;
+boost::scoped_arraychar pMem;
while( true )
{
-pMem = new char[nSize];
+pMem.reset(new char[nSize]);
if( !pMem )
{
StarBASIC::Error( SbERR_NO_MEMORY );
return;
}
-if( getcwd( pMem, nSize-1 ) != NULL )
+if( getcwd( pMem.get(), nSize-1 ) != NULL )
{
-rPar.Get(0)-PutString( OUString::createFromAscii(pMem) );
-delete [] pMem;
+rPar.Get(0)-PutString( OUString::createFromAscii(pMem.get()) );
return;
}
if( errno != ERANGE )
{
StarBASIC::Error( SbERR_INTERNAL_ERROR );
-delete [] pMem;
return;
}
-delete [] pMem;
nSize += PATH_INCR;
};
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 6b52e28..00c8b7d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -55,6 +55,7 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/i18n/LocaleCalendar.hpp
#include com/sun/star/sheet/XFunctionAccess.hpp
+#include boost/scoped_array.hpp
using namespace comphelper;
using namespace com::sun::star::i18n;
@@ -1277,9 +1278,9 @@ void PutGet( SbxArray rPar, sal_Bool bPut )
{
sal_Size nFPos = pStrm-Tell();
short nDims = pArr-GetDims();
-short* pDims = new short[ nDims ];
-bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);
-delete [] pDims;
+boost::scoped_arrayshort pDims(new short[ nDims ]);
+bRet =
lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims.get(),bPut);
+pDims.reset();
if( nBlockLen )
pStrm-Seek( nFPos + nBlockLen );
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 3ee4b93..66026e0 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -66,6 +66,7 @@
#include sbintern.hxx
#include sbunoobj.hxx
#include basic/codecompletecache.hxx
+#include boost/scoped_array.hpp
using com::sun::star::uno::Reference;
@@ -4453,9 +4454,9 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1,
sal_uInt32 nOp2 )
bool bRangeError = false;
// Store dims to use them for copying later
-sal_Int32* pLowerBounds = new sal_Int32[nDims];
-sal_Int32* pUpperBounds = new sal_Int32[nDims];
-sal_Int32* pActualIndices = new sal_Int32[nDims];
+boost::scoped_arraysal_Int32 pLowerBounds(new sal_Int32[nDims]);
+boost::scoped_arraysal_Int32 pUpperBounds(new sal_Int32[nDims]);
+boost::scoped_arraysal_Int32 pActualIndices(new sal_Int32[nDims]);
if( nDimsOld != nDimsNew )
{
bRangeError = true;
@@ -4488,11 +4489,8 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1,
sal_uInt32 nOp2 )
// (It would be faster to work on the flat internal data array of
an
// SbyArray but this solution is clearer and easier)
implCopyDimArray_DCREATE( pArray, pOldArray, nDims - 1,
-0, pActualIndices, pLowerBounds, pUpperBounds );
+ 0, pActualIndices.get(),
pLowerBounds.get(), pUpperBounds.get() );
}
-delete [] pUpperBounds;
-delete [] pLowerBounds;
-delete [] pActualIndices;
refRedimpArray = NULL;
}
}
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 276b788..c9fd347 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -23,7 +23,7 @@
#include sbxconv.hxx
#include com/sun/star/bridge/oleautomation/Decimal.hpp
-
+#include boost/scoped_array.hpp
// Implementation SbxDecimal
SbxDecimal::SbxDecimal( void )
@@ -206,7 +206,7 @@ bool SbxDecimal::setString( OUString*
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDEXLib.cxx | 17 -
vcl/unx/kde4/VCLKDEApplication.hxx |8
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Mar 25 12:20:16 2014 +0100
prevent KDE/Qt from interfering with the session manager
I occassionally get lockups in IceProcessMessages() called from QtCore,
I'm actually not exactly sure why, as theoretically two connections
from one app shouldn't be a problem, but since LO does its own
session handling, there's no need to the KDE/Qt code to be involved,
so prevent it from connecting to the session manager altogether.
Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 820d39a..e4900a7 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -166,8 +166,23 @@ void KDEXLib::Init()
KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+// LO does its own session management, so prevent KDE/Qt from interfering
+// (QApplication::disableSessionManagement(false) wouldn't quite do,
+// since that still actually connects to the session manager, it just
+// won't save the application data on session shutdown).
+char* session_manager = NULL;
+if( getenv( SESSION_MANAGER ) != NULL )
+{
+session_manager = strdup( getenv( SESSION_MANAGER ));
+unsetenv( SESSION_MANAGER );
+}
m_pApplication = new VCLKDEApplication();
-kapp-disableSessionManagement();
+if( session_manager != NULL )
+{
+setenv( SESSION_MANAGER, session_manager, 1 );
+free( session_manager );
+}
+
KApplication::setQuitOnLastWindowClosed(false);
#if KDE_HAVE_GLIB
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx
b/vcl/unx/kde4/VCLKDEApplication.hxx
index 412ee34..4ce0b2c 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -21,22 +21,14 @@
#define Region QtXRegion
-#include QSessionManager
-
#include kapplication.h
#undef Region
-/* #i59042# override KApplications method for session management
- * since it will interfere badly with our own.
- */
class VCLKDEApplication : public KApplication
{
public:
VCLKDEApplication();
-
-virtual void commitData(QSessionManager) {};
-
virtual bool x11EventFilter(XEvent* event);
};
___
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/options/treeopt.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b53ba68b6b4a070ec56d02aaa6f649ec9482 Author: Andreas Mantke ma...@gmx.de Date: Sun Mar 23 22:02:02 2014 +0100 More vertical space for the options dialog The vertical space of the options dialog is to small for the new security page in German translation. The last entry is not visible and the button could not be reached. Solution: I added more vertical space to ROW_3 which is the postion of the separation line. I added the hight of a button and of the line. This fixes the issue with missing space for the last entry in section especially for the German translation. Change-Id: Icacfd4587d605e56438f3d7207ce5d257f313072 Reviewed-on: https://gerrit.libreoffice.org/8735 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 2986640..aa502a4 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -51,7 +51,7 @@ #define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) #define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) -#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) +#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y+RSC_CD_PUSHBUTTON_HEIGHT+RSC_CD_FIXEDLINE_HEIGHT) #define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT) #define ROW_5 (ROW_4+RSC_CD_PUSHBUTTON_HEIGHT) #define ROW_6 (ROW_5+RSC_SP_DLG_INNERBORDER_BOTTOM) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||53473 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/ctrl.hxx |2 ++
include/vcl/outdev.hxx | 16
include/vcl/virdev.hxx |2 ++
include/vcl/window.hxx |4 +++-
vcl/source/control/ctrl.cxx | 10 ++
vcl/source/gdi/outdev.cxx| 17 -
vcl/source/gdi/virdev.cxx| 34 --
vcl/source/window/window.cxx | 19 ++-
8 files changed, 43 insertions(+), 61 deletions(-)
New commits:
commit 977aae0cdec71577cbdc74baea228a5f267e7fd8
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Mar 23 18:51:13 2014 +1100
fdo#74702 Moved EnableRTL() logic to specific classes where appropriate
OutputDevice::EnableRTL() is a bit of a mess. It uses a runtime
variable to see if it is using a VirtualDevice, and it uses a
dynamic_cast to see if the object is a Window or a Control!
I have made it virtual and moved the knowledge of class specific
functionality from OutputDevice to VirtualDevice, Window and Control
as needed. OutputDevice::EnableRTL() functionality is then called.
Also: small formatting change to outdev.hxx, also included a note
that WindowImpl is a pimpl in window.hxx.
Change-Id: I44b66601c4457fb2e0bbc1014fb7acf8f6942f80
Reviewed-on: https://gerrit.libreoffice.org/8721
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 3487970..6c00e46 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -129,6 +129,8 @@ public:
explicitControl( Window* pParent, const ResId );
virtual ~Control();
+virtual voidEnableRTL ( bool bEnable = true );
+
virtual voidGetFocus();
virtual voidLoseFocus();
virtual boolNotify( NotifyEvent rNEvt );
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index eb4d0ba..c86a8ac 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1141,25 +1141,25 @@ public:
BitmapExGetBitmapEx( const Point rSrcPt, const Size
rSize ) const;
voidEnableMapMode( bool bEnable = true );
-boolIsMapModeEnabled() const { return mbMap; }
+boolIsMapModeEnabled() const { return mbMap; }
// Enabling/disabling RTL only makes sense for OutputDevices that use a
mirroring SalGraphisLayout
-voidEnableRTL( bool bEnable = true);
-boolIsRTLEnabled() const { return mbEnableRTL; }
+virtual voidEnableRTL( bool bEnable = true);
+boolIsRTLEnabled() const { return mbEnableRTL; }
voidSetConnectMetaFile( GDIMetaFile* pMtf );
GDIMetaFile*GetConnectMetaFile() const { return
mpMetaFile; }
voidEnableOutput( bool bEnable = true );
-boolIsOutputEnabled() const { return mbOutput; }
-boolIsDeviceOutput() const { return mbDevOutput; }
-boolIsDeviceOutputNecessary() const { return (mbOutput
mbDevOutput); }
-boolIsOutputNecessary() const { return ((mbOutput
mbDevOutput) || (mpMetaFile != NULL)); }
+boolIsOutputEnabled() const { return mbOutput; }
+boolIsDeviceOutput() const { return mbDevOutput; }
+boolIsDeviceOutputNecessary() const { return
(mbOutput mbDevOutput); }
+boolIsOutputNecessary() const { return ((mbOutput
mbDevOutput) || (mpMetaFile != NULL)); }
voidSetClipRegion();
voidSetClipRegion( const Region rRegion );
Region GetClipRegion() const;
-boolIsClipRegion() const { return mbClipRegion; }
+boolIsClipRegion() const { return mbClipRegion; }
Region GetActiveClipRegion() const;
voidMoveClipRegion( long nHorzMove, long nVertMove
);
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 72cc3fe..145179b 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -113,6 +113,8 @@ public:
virtual ~VirtualDevice();
+voidEnableRTL( bool bEnable = true );
+
boolSetOutputSizePixel( const Size rNewSize, bool bErase
= true );
boolSetOutputSizePixelScaleOffsetAndBuffer( const Size
rNewSize, const Fraction rScale, const Point rNewOffset, const
basebmp::RawMemorySharedArray pBuffer );
boolSetOutputSize( const Size rNewSize, bool bErase =
true )
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5bf0e8d..3a3851c 100644
---
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||60533 -- 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
Extension in Java
Hello, i need one basic extension (Hello Wold) developed in java, for study. I Conferencia Científica Internacional UCIENCIA 2014 en la UCI del 24 al 26 de abril de 2014, La Habana, Cuba. Ver http://uciencia.uci.cu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Please test KDE4 with Gerrit patches for LO 4.2 - no updates until June.
Hi everybody, I just ported my latest KDE4 patches from master for 4.2 review. This should bring the KDE4 VCL backend to the same base as master. AFAIK current 4.2 KDE4 is broken and I didn't have any time to really test the patches on 4.2 and actually too few time for master tests too. And I'll be on holiday for the next nine weeks (until June) with just sporadic Internet and definitly no time and no machine to do any LO KDE4 bugfixing. So I hope someone is interested in the KDE4 stuff can actually test the patches on LO 4.2. The patchset includes a patch to disable native KDE4 dialogs, if the VCL detects a Qt4 bug (https://codereview.qt-project.org/#change,80528) Kubuntu currently has a patched Qt4 in proposed. People without the Qt4 patch won't get native file pickers, but as originally suggested in IRC it's implemented as a runtime check in the VCL backend and as a configure warning. Patching your Qt4 should bring them back without recompiling LO. Gerrit patches, which are also in private/jmux/libreoffice-4-2+kde4: https://gerrit.libreoffice.org/8702 https://gerrit.libreoffice.org/8703 https://gerrit.libreoffice.org/8704 https://gerrit.libreoffice.org/8705 https://gerrit.libreoffice.org/8706 https://gerrit.libreoffice.org/8707 https://gerrit.libreoffice.org/8708 https://gerrit.libreoffice.org/8709 https://gerrit.libreoffice.org/8710 Regards, Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Issue with libhyphen
Dear Bert, It seems for me, that your hyphenation patterns haven't been processed by the substrings.pl script of libhyphen distribution. Could you check it? Thanks for your bug report, Best regards, László 2014-03-24 14:44 GMT+01:00 Bert Frees bertfr...@gmail.com: Dear László and others, We think we may have found a bug in libhyphen. It could be that it is just a limitation of the algorithm, but anyway it's an issue for us. The problem is that some patterns in a dictionary are ignored in some cases, namely when the match string of that pattern is a part of the match string of another pattern, and more specifically when it's not just a prefix. Let me clarify that with an example. When a dictionary consists of these two patterns, the word `foobar' is not hyphenated because the first pattern is ignored: oo1b foob The second, longer pattern doesn't even have to match, as the second example shows (the first pattern is still ignored): oo1b foobz I have a patch that solves part of the problem: https://github.com/bertfrees/libhyphen-nar/blob/adc2b74a19469e4dc93777fcdb82e36e566a0472/src/patches/bug.patch With this patch the given examples will be handled correctly, but in other situations it will still fail, such as here: oo1b foobaz Have I indeed found a bug here, and does my patch make sense, or am I just expecting too much and are we hitting the limits of the algorithm? Thanks for considering, Bert Frees ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx|6 +++---
include/vcl/virdev.hxx|3 +++
vcl/source/gdi/outdev.cxx | 13 +
vcl/source/gdi/virdev.cxx | 29 +
4 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 03568b2e2405fc44435b95720f3680ab1daea836
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Mar 23 19:27:45 2014 +1100
fdo#74702 Move GetBitCount() and GetAlphaBitCount into correct classes
GetBitCount() works differently for VirtualDevices. GetAlphaBitCount()
is really only used by VirtualDevice, so moved functionality from
OutputDevice to VirtualDevice.
Change-Id: Ic00e32f1fa385542bcce8c9475f0ea5eb9a077f9
Reviewed-on: https://gerrit.libreoffice.org/8722
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c86a8ac..fbeae4b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1409,16 +1409,16 @@ public:
sal_Int32*
pKashidaPosDropped // invalid kashida positions (out)
) const;
-sal_uInt16 GetBitCount() const;
+virtual sal_uInt16 GetBitCount() const;
-boolGetTextIsRTL( const OUString, sal_Int32 nIndex,
sal_Int32 nLen ) const;
+boolGetTextIsRTL( const OUString, sal_Int32
nIndex, sal_Int32 nLen ) const;
/** Query the existence and depth of the alpha channel
@return 0, if no alpha channel available, and the bit depth of
the alpha channel otherwise.
*/
-sal_uInt16 GetAlphaBitCount() const;
+virtual sal_uInt16 GetAlphaBitCount() const;
sal_uLong GetColorCount() const;
voidPush( sal_uInt16 nFlags = PUSH_ALL );
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 145179b..e5e5c54 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -134,6 +134,9 @@ public:
voidSetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32
i_nDPIY );
+sal_uInt16 GetBitCount() const;
+sal_uInt16 GetAlphaBitCount() const;
+
private:
SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX,
sal_Int32 i_nDPIY );
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 385ac40..2b7a088 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2249,11 +2249,7 @@ void OutputDevice::SetSettings( const AllSettings
rSettings )
sal_uInt16 OutputDevice::GetBitCount() const
{
-
-if ( meOutDevType == OUTDEV_VIRDEV )
-return ((VirtualDevice*)this)-mnBitCount;
-
-// we need a graphics
+// we need a graphics instance
if ( !mpGraphics )
{
if ( !((OutputDevice*)this)-ImplGetGraphics() )
@@ -2265,13 +2261,6 @@ sal_uInt16 OutputDevice::GetBitCount() const
sal_uInt16 OutputDevice::GetAlphaBitCount() const
{
-
-if ( meOutDevType == OUTDEV_VIRDEV
-mpAlphaVDev != NULL )
-{
-return mpAlphaVDev-GetBitCount();
-}
-
return 0;
}
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index aa3f359..6fc68d2 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -369,6 +369,8 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const
Size rNewSize, bool bEra
return bRet;
}
+
+
// #i32109#: Fill opaque areas correctly (without relying on
// fill/linecolor state)
void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle rRect )
@@ -383,6 +385,8 @@ void VirtualDevice::ImplFillOpaqueRectangle( const
Rectangle rRect )
Pop();
}
+
+
bool VirtualDevice::ImplSetOutputSizePixel( const Size rNewSize, bool bErase,
const basebmp::RawMemorySharedArray pBuffer )
{
if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
@@ -418,18 +422,6 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size
rNewSize, bool bErase, c
return false;
}
-void VirtualDevice::EnableRTL( bool bEnable )
-{
-// virdevs default to not mirroring, they will only be set to mirroring
-// under rare circumstances in the UI, eg the valueset control
-// because each virdev has its own SalGraphics we can safely switch the
SalGraphics here
-// ...hopefully
-if( ImplGetGraphics() )
-mpGraphics-SetLayout( bEnable ? SAL_LAYOUT_BIDI_RTL : 0 );
-
-OutputDevice::EnableRTL(bEnable);
-}
-
bool VirtualDevice::SetOutputSizePixel( const Size rNewSize, bool bErase )
{
return ImplSetOutputSizePixel( rNewSize, bErase,
basebmp::RawMemorySharedArray() );
@@ -527,6 +519,19 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode
i_eRefDevMode, sal_Int32
mpFontCache = new ImplFontCache();
}
+sal_uInt16 VirtualDevice::GetBitCount() const
+{
+
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev2.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 514d33fa3a409681be93bed3fb33f940a5549d88
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Mar 23 20:26:09 2014 +1100
fdo#74702 DrawTransformedBitmapEx simplified
Removed bPrinter check from DrawTransformedBitmapEx, also removes
meOutDevType.
Change-Id: I5fd09efc4f3467702ab9671dc45da1a9c0e3f927
Reviewed-on: https://gerrit.libreoffice.org/8723
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 29f1702..4d2c764 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -798,7 +798,6 @@ void OutputDevice::DrawTransformedBitmapEx(
const bool bInvert(ROP_INVERT == meRasterOp);
const bool bBitmapChangedColor(mnDrawMode (DRAWMODE_BLACKBITMAP |
DRAWMODE_WHITEBITMAP | DRAWMODE_GRAYBITMAP | DRAWMODE_GHOSTEDBITMAP));
const bool bMetafile(mpMetaFile);
-const bool bPrinter(OUTDEV_PRINTER == meOutDevType);
bool bDone(false);
const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() *
rTransformation);
const bool bTryDirectPaint(!bInvert !bBitmapChangedColor !bMetafile
);
@@ -835,7 +834,7 @@ void OutputDevice::DrawTransformedBitmapEx(
const double fOrigAreaScaled(bSheared || bRotated ? fOrigArea * 1.44 :
fOrigArea);
double fMaximumArea(std::min(450.0, std::max(100.0,
fOrigAreaScaled)));
-if(!bMetafile !bPrinter)
+if(!bMetafile)
{
if ( !TransformReduceBitmapExTargetRange( aFullTransform,
aVisibleRange, fMaximumArea ) )
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c44911b351be7bf1045265e3f54828569695617 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Mar 25 12:32:07 2014 +0100 Updated core Project: translations 21e558dcc192c8c337a72297356102efdf99910e diff --git a/translations b/translations index e5b2b1e..21e558d 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e5b2b1eac635a5197f1bb471252b8f2c5ea53ef3 +Subproject commit 21e558dcc192c8c337a72297356102efdf99910e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 16 commits - filter/source framework/source lingucomponent/source lotuswordpro/source oox/source scaddins/source svl/source sw/source toolkit/source writerfilter/source
filter/source/msfilter/svdfppt.cxx| 29 --
framework/source/uiconfiguration/windowstateconfiguration.cxx |2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx |3 -
lotuswordpro/source/filter/lwpgrfobj.cxx |2
oox/source/ole/olehelper.cxx |2
scaddins/source/analysis/analysishelper.cxx |2
svl/source/numbers/zformat.cxx|1
sw/source/core/docnode/node.cxx |1
sw/source/core/txtnode/ndtxt.cxx |6 +-
sw/source/core/uibase/index/toxmgr.cxx| 14
sw/source/core/undo/rolbck.cxx|2
sw/source/core/unocore/unodraw.cxx|2
toolkit/source/awt/vclxwindow.cxx |8 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2
14 files changed, 15 insertions(+), 61 deletions(-)
New commits:
commit b88434d67bf0304e3077130763226ebe42093be5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 12:12:37 2014 +
Resolves: rhbz#1077780 crash on loading .docx
Change-Id: I92670b9c46a2c745ba47c6dcc1b4dd672942cf59
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index aa0896a..79c1847 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -636,6 +636,8 @@ void
lcl_MoveBorderPropertiesToFrame(uno::Sequencebeans::PropertyValue rFrame
{
try
{
+if (!xStartTextRange.is()) //rhbz#1077780
+return;
uno::Referencetext::XTextCursor xRangeCursor =
xStartTextRange-getText()-createTextCursorByRange( xStartTextRange );
xRangeCursor-gotoRange( xEndTextRange, true );
commit dd139fa3e49991c06e08133d6f3afd62ce894052
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 11:18:09 2014 +
coverity#735446 Logically dead code
Change-Id: I6615145e2529193cbe72f4e5d326832a5b8864d0
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index fac3ec4..2d1bdd5 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -511,7 +511,7 @@ bool MSConvertOCXControls::importControlFromStream(
::oox::BinaryInputStream rI
bool bOneOfHtmlControls = false;
if ( rStrmClassId.toAsciiUpperCase().equalsAscii( HTML_GUID_SELECT )
|| rStrmClassId.toAsciiUpperCase().equalsAscii( HTML_GUID_TEXTBOX ) )
-bOneOfHtmlControls = false;
+bOneOfHtmlControls = true;
if ( bOneOfHtmlControls )
{
commit 1cc0bdd037f75eb0294c81b31ac32509577b80e2
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 10:44:01 2014 +
coverity#735439 Logically dead code
Change-Id: Id475c10effc81386a08337128be270f715daef52
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index b0b9972..300d0f3 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -404,7 +404,6 @@ Sequence Reference
::com::sun::star::linguistic2::XMeaning SAL_CALL Thes
{
OUString sTerm(pe-psyns[i],strlen(pe-psyns[i]),eEnc );
sal_Int32 catpos = sTerm.indexOf('(');
-sal_Int32 catpos2 = 0;
OUString catst;
OUString catst2;
if (catpos 2)
@@ -427,8 +426,6 @@ Sequence Reference
::com::sun::star::linguistic2::XMeaning SAL_CALL Thes
sTerm = seq[0];
}
}
-if (catpos2)
-sTerm = catst2 + sTerm;
sal_uInt16 ct1 = capitalType(sTerm, pCC);
if (CAPTYPE_MIXED == ct1)
commit 6137b5f72f5ec491ea6bd6631a65484fa24d2973
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 10:42:51 2014 +
coverity#735432 Logically dead code
Change-Id: I6bbbe539d28aefcad04ccae48f2518e78f15b240
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 089ae8a..d92da70 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2851,35 +2851,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
aEscherObjListHd.SeekToEndOfRecord( rStCtrl );
}
-/* There are a lot of Shapes which are dependent to
- the current background color */
-if ( rSlidePersist.ePageKind == PPT_SLIDEPAGE )
-{
-
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/thesaurus/libnth/nthesimp.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit f883832c93f78559fa5e1ba5d6d4dd2681595680
Author: Tor Lillqvist t...@collabora.com
Date: Tue Mar 25 14:43:05 2014 +0200
WaE: unused variable 'catst2' [loplugin:unusedvariablecheck]
Change-Id: Iaeff659796b17ffe5e102b75045c90913f12b615
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 300d0f3..8db3f29 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -405,7 +405,6 @@ Sequence Reference
::com::sun::star::linguistic2::XMeaning SAL_CALL Thes
OUString sTerm(pe-psyns[i],strlen(pe-psyns[i]),eEnc );
sal_Int32 catpos = sTerm.indexOf('(');
OUString catst;
-OUString catst2;
if (catpos 2)
{
// remove category name for affixation and casing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Extension in Java
Hello Adriam, This one is a little bit more than a Hello World, but I'm sure it can help you learn a lot of things. https://github.com/cbosdo/coooder/ Feel free to ask questions if needed. -- Cedric On Mon, 2014-03-24 at 16:44 -0400, Adriam Delgado Rivero wrote: Hello, i need one basic extension (Hello Wold) developed in java, for study. I Conferencia Científica Internacional UCIENCIA 2014 en la UCI del 24 al 26 de abril de 2014, La Habana, Cuba. Ver http://uciencia.uci.cu ___ 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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 76470, which changed state. Bug 76470 Summary: out_of_range_exception when inserting/deleting rows with absolute reference https://bugs.freedesktop.org/show_bug.cgi?id=76470 What|Removed |Added Status|ASSIGNED|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
Re: Bunch of error messages related to gio_content.cxx
Hi Stephan, On Tuesday, 2014-03-25 09:35:26 +0100, Stephan Bergmann wrote: There is no configuration item /org.openoffice.Office.Calc/Formula/Syntax/StringConversion, but http://cgit.freedesktop.org/libreoffice/core/commit/?id=c52f3ea0eb327343b1945290c43d3b66f546dfe9 user selectable string conversion models, related fdo#37132 fdo#74622 looks like it assumes there is and added Syntax/StringConversion to ScFormulaCfg::GetPropertyNames (sc/source/core/tool/formulaopt.cxx). Eike, can you clarify? Yup, I forgot to add the configuration item, will do. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp_pNoaOjsf7.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - configure.ac download.lst external/apache-commons external/jfreereport reportbuilder/java RepositoryExternal.mk swext/Extension_wiki-publisher.mk
RepositoryExternal.mk| 12 +- configure.ac | 12 +- download.lst |6 ++--- external/apache-commons/ExternalPackage_apache_commons_logging.mk|2 - external/apache-commons/ExternalProject_apache_commons_httpclient.mk |4 +-- external/jfreereport/ExternalProject_jfreereport_flow_engine.mk |2 - external/jfreereport/ExternalProject_jfreereport_liblayout.mk|2 - reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf|2 - swext/Extension_wiki-publisher.mk|6 ++--- 9 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 1731f6e692bb0a07a2bca4b1b190163f209d2b9e Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 09:52:39 2014 + bump apache-commons-lang to 3.3.1 Change-Id: Ibae9d3d143e111c0bb60de76deb085a3ccb010c9 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 705088f..0a70e26 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3171,7 +3171,7 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ $(eval $(call gb_Helper_register_jars,OXT,\ commons-codec-1.9 \ commons-httpclient-3.1 \ - commons-lang-2.4 \ + commons-lang3-3.3.1.jar \ )) define gb_Jar__use_commons-codec @@ -3192,7 +3192,7 @@ endef define gb_Jar__use_commons-lang $(call gb_Jar_use_external_project,$(1),apache_commons_lang) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar,commons-lang-2.4.jar) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.jar,commons-lang3-3.3.1.jar) endef define gb_ExternalProject__use_commons-lang $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) diff --git a/configure.ac b/configure.ac index 68f1370..07b2d24 100644 --- a/configure.ac +++ b/configure.ac @@ -10606,8 +10606,8 @@ if test $ENABLE_MEDIAWIKI = TRUE -o $ENABLE_REPORTBUILDER = TRUE; then fi if test -z $COMMONS_LANG_JAR; then -AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar, -[ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ], +AC_CHECK_FILE(/usr/share/java/commons-lang3-3.3.1-src.tar.gz, +[ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.1-src.tar.gz ], [ AC_CHECK_FILE(/usr/share/java/commons-lang.jar, [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ], diff --git a/download.lst b/download.lst index 81a2533..733f4c7 100644 --- a/download.lst +++ b/download.lst @@ -39,7 +39,7 @@ export SERF_TARBALL := serf-1.2.1.tar.bz2 export APACHE_COMMONS_CODEC_TARBALL := 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz +export APACHE_COMMONS_LANG_TARBALL := 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index e0d8946..efc0113 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_la $(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.9.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar)) -$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar)) +$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang3-3.3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.3.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar)) endif $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))) commit 3dad9b1019bebcc6db63a424afa146e007f768d2
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a9/4568a3ffd2c87c3caf819b8f9d52d0fc42d709
a9/4568a3ffd2c87c3caf819b8f9d52d0fc42d709 |1 + 1 file changed, 1 insertion(+) New commits: commit da110a763bc00cee06ab6b79ac1b5bdc3e10ca5e Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:09:13 2014 + Notes added by 'git notes add' diff --git a/a9/4568a3ffd2c87c3caf819b8f9d52d0fc42d709 b/a9/4568a3ffd2c87c3caf819b8f9d52d0fc42d709 new file mode 100644 index 000..2289fc7 --- /dev/null +++ b/a9/4568a3ffd2c87c3caf819b8f9d52d0fc42d709 @@ -0,0 +1 @@ +prefer: 2b15c85a8cd83e71ca344fa90357f845aaf29f1b ___ 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' - f1/2f59f6ac8234b61684fbd05b433b16cc1a74e8
f1/2f59f6ac8234b61684fbd05b433b16cc1a74e8 |1 + 1 file changed, 1 insertion(+) New commits: commit 17e863b2b8a96f2d47e522680e0aaeb3877c Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:09:33 2014 + Notes added by 'git notes add' diff --git a/f1/2f59f6ac8234b61684fbd05b433b16cc1a74e8 b/f1/2f59f6ac8234b61684fbd05b433b16cc1a74e8 new file mode 100644 index 000..2289fc7 --- /dev/null +++ b/f1/2f59f6ac8234b61684fbd05b433b16cc1a74e8 @@ -0,0 +1 @@ +prefer: 2b15c85a8cd83e71ca344fa90357f845aaf29f1b ___ 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' - a3/99c2557be52fb70425cbe78c01b20d1a0122e5
a3/99c2557be52fb70425cbe78c01b20d1a0122e5 |1 + 1 file changed, 1 insertion(+) New commits: commit 4001dcd86d0118e7e1e9ee6a65ce9fdb31e1ab05 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:09:48 2014 + Notes added by 'git notes add' diff --git a/a3/99c2557be52fb70425cbe78c01b20d1a0122e5 b/a3/99c2557be52fb70425cbe78c01b20d1a0122e5 new file mode 100644 index 000..2289fc7 --- /dev/null +++ b/a3/99c2557be52fb70425cbe78c01b20d1a0122e5 @@ -0,0 +1 @@ +prefer: 2b15c85a8cd83e71ca344fa90357f845aaf29f1b ___ 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' - c2/a49f654e386fecafb89cd2b758892f250f6290
c2/a49f654e386fecafb89cd2b758892f250f6290 |1 + 1 file changed, 1 insertion(+) New commits: commit 81580765a1e56755439ed2c3af8ee93f09b28dc2 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:10:35 2014 + Notes added by 'git notes add' diff --git a/c2/a49f654e386fecafb89cd2b758892f250f6290 b/c2/a49f654e386fecafb89cd2b758892f250f6290 new file mode 100644 index 000..d53e249 --- /dev/null +++ b/c2/a49f654e386fecafb89cd2b758892f250f6290 @@ -0,0 +1 @@ +prefer: 3dad9b1019bebcc6db63a424afa146e007f768d2 ___ 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' - 90/6514f137a0e253d6f9593f694f0f7b83143d04
90/6514f137a0e253d6f9593f694f0f7b83143d04 |1 + 1 file changed, 1 insertion(+) New commits: commit 5dfcb1178fa67348cc4d83cb2c4b0d79cba8f8e4 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:10:03 2014 + Notes added by 'git notes add' diff --git a/90/6514f137a0e253d6f9593f694f0f7b83143d04 b/90/6514f137a0e253d6f9593f694f0f7b83143d04 new file mode 100644 index 000..2289fc7 --- /dev/null +++ b/90/6514f137a0e253d6f9593f694f0f7b83143d04 @@ -0,0 +1 @@ +prefer: 2b15c85a8cd83e71ca344fa90357f845aaf29f1b ___ 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' - dc/f788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389
dc/f788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389 |1 + 1 file changed, 1 insertion(+) New commits: commit 980d294d41c3a11e45f3e512d3bb36fd8dcdee5c Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 13:10:57 2014 + Notes added by 'git notes add' diff --git a/dc/f788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389 b/dc/f788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389 new file mode 100644 index 000..bcbf710 --- /dev/null +++ b/dc/f788b8bbfb1e5bbc3fd7f3d3dabd3d0113f389 @@ -0,0 +1 @@ +prefer: 1731f6e692bb0a07a2bca4b1b190163f209d2b9e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 28 +++ 1 file changed, 28 insertions(+) New commits: commit bc43fc2fb27eab02a949832626ce1a9dc380ee6b Author: Eike Rathke er...@redhat.com Date: Tue Mar 25 14:20:37 2014 +0100 added Formula/Syntax/StringConversion config item, fdo#37132 related Change-Id: I349ee1a708acfcf087680b6b07b80fb2ce911c4d diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index a45aaa3..8feb9e9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1442,6 +1442,34 @@ /info valuefalse/value /prop +prop oor:name=StringConversion oor:type=xs:int + !-- UIHints: Tools - Options - Spreadsheet - Formula -- + info +descHow to treat text when encountered as operand in an arithmetic operation or as argument to a function that expects a number instead./desc + /info + constraints +enumeration oor:value=0 + info +descGenerate #VALUE! error/desc + /info +/enumeration +enumeration oor:value=1 + info +descTreat as zero/desc + /info +/enumeration +enumeration oor:value=2 + info +descConvert only unambiguous/desc + /info +/enumeration +enumeration oor:value=3 + info +descConvert also locale dependent/desc + /info +/enumeration + /constraints +/prop /group group oor:name=Load info ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bunch of error messages related to gio_content.cxx
Hi, On Tuesday, 2014-03-25 13:37:59 +0100, Eike Rathke wrote: There is no configuration item /org.openoffice.Office.Calc/Formula/Syntax/StringConversion Yup, I forgot to add the configuration item, will do. http://cgit.freedesktop.org/libreoffice/core/commit/?id=bc43fc2fb27eab02a949832626ce1a9dc380ee6b should solve that. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp69_FisdvNK.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.3.2'
Tag 'libreoffice-4.2.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-03-25 15:07 -0700 Tag libreoffice-4.2.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTMY2LAAoJEPQ0oe+v7q6j6G4P/A1eLyEKvUxFe8dN3pqwoQep ZfgXkDfJzIuw39iUZlAJUrwmi7EHqKOkEhIZQLcOpgmnZVKcc6vKTvzsrZwcDHGN HBIOlZI0GB9rk4UqorVU/vydZXz3fLbnfEttjHkUGH+6yP9g9P0bCvrjPmWwNEBI Lo2JukIw/dgZQjxR8HWG3X6yBjVy1T9V/Tg8dT9UJEzAhRmlFuzSrLs5B/zNxhYA DODg7FPukDrj6QGlyb/XcwlkL56IwevOlzsHuTWgXjE1eekGQuZv4bFiYkEWD2nM NTQWcz23zc3uLWMdeJ3FbCyUIxsIqg/t/5NysikEh2oYMaxQhm9M+8eUuDRJsJUt S/5i3CQv0SdLelgAJCbWktz2Pm7YX9I7fqGDWoZTKXUz6yPsgNJrhKP6f+DYjyv5 boCQJlHsR9w09brg9GyrzzVisPY39CM+5O5CoLp/NVXcKA0kADZ7/fTL1NzJfqec s+nwQteMoOyBn8X8yTuHaHiYj9bjv1QlKyIni41y3wNhfoL2mqt4HQTvNfk3jwpd OMMGHqSeOWKBXWuVi82hC8+Acm8pxm+XjWGFQexBlif0VYR8pXUhgQDfz0GHAFAj JEmAlpUxncF/LA1zA52lcj5tbKfbTqNg/jJrOJ9wsej6kBxSUnbA6IbP/zqpFGNy /PdWltm61OFUNwNpN6oA =kVbB -END PGP SIGNATURE- Changes since cp-4.2-branch-point-81: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9f6d918760823c814c4e553c00b308167863ddf9 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Mar 25 15:08:45 2014 +0100 bump version to 4.2.3.2.0+ Change-Id: Ia5f0fabce4a2d0fd5e3c2d772e96f8eb51029231 diff --git a/configure.ac b/configure.ac index 886f899..1d91d04 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.3.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.3.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.3.2'
Tag 'libreoffice-4.2.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-03-25 15:07 -0700 Tag libreoffice-4.2.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTMY2EAAoJEPQ0oe+v7q6jg+kP/3TirhsPzBsss86L3jp9BSll tpeFEnbJziewCMQsz5PRXkOJA4nA7c/R+SPu5LnzcjC4r8gXieQouHhLP/RdPRur jVvbRS78fkm0EsM3CED4SeTw5fU5+ivenvS0So6M/TZB07BCYmI3MFxNDqcA0hFe 51DARzayA3wQAjP9hEGtHGBiFuBBF+5tgq7aYt/UQ5Nl+JKh+ipK1UXhKin/oxlv yNvbMVRSSDDTnxOYTCUwGwM9MQKwRjtkuvWfKHGhXClbyOW1aRyGET1v9cI03prf m/gFHE75599NhE5Za7rCfxS8AkPGqphTtgkF0TJZ1H2J0bp8acKtu+pHeconoZjK UUMCqIXNpk/CA02weupKkNXNkfMHIFejGGe53BwRY+wb5+r1SdOMU6W5dix1hqUK cgCu4BegNz7cIwUdouGJUb2ARQWkNa6GxdOHPdgvITBnIDDoSu+fb7soTYI/GAWH BrgWdk1P4+Kr2bkiwrpNrABtJnB+WaRs5N3PDDpUebScBkAkAcxVfUpcZuIWDWk3 UGZlC8Ix2KVSHM8o7Gdf5wku8yrMhUUla68h4DkG5cfxSs9zUna4PqaYm3PGiLNB nvucrrPYO2Hm2HPkHuXzByBAa/4/e8Jr8mT8/T2t6dRhiAvW1IdIMFC21jtZzLOF ZCZ6YfJfY/0tWX0WpnHt =3R6D -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.3.2'
Tag 'libreoffice-4.2.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-03-25 15:07 -0700 Tag libreoffice-4.2.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTMY2HAAoJEPQ0oe+v7q6jC+8P+gN5WQVtx7twmeba6EzOLwXT QnA7x5GBOjVKJ66dwmC8cdRHXOy4zUMwPvbn3u6dz5lE4jqfJULN9/lwpuISU5nd TQ2zxnLKr5S4t/o51s/osdhQ1Ns2EdX7ukNhXk3YuU5AiOPYyzoNnJQ6ThP6SSuO xPlIbR8hQL1LHosY+7JSRqsqW6nPsjff5K0Htd16nP/S8f1I6LUJpBMGGRFELhG5 XOcwIhSr/qABCLWzjDaZtG61nlCIFleDV5X7eunNpy92Q8XzOv+JYIpnM9f7KN2Y z15Z5qJOinlbmwisyqUdBp2FoD0FoEV057CCwyvcrw+NYlyS+ZscLLApBtjye3Nc hqfKjojiOqIlKmMTOzkU97z8Br3GfJOpAS1Ow0lXPoNNaajjrpvm5WAlfVH8a+WY KIhAZ2/r9S7bRKDvojbd6R0S3GPDiPirs378YAXZZWfRokkTkfzw1Fp/Sdtm3Vje CR0CBHoJWj/q/opya1LHujMusaBoJYdyxgPdzXGu+iRIzyYcPoeYeXCPBYpD9kGZ ntXp2a3nm/2s0Q6RqyK7NdJvMdzHhQ0OepG7+xx1N03Wd10pw2nYFjKT+7JbEUZ7 ArFECsejxgD7Kn+3GbWhYU8EkVki6C/7+XnykxRJw/5dbUI7LxUpkiIQVaO1/6vo OX87+RghsBYVZI3Wocv/ =kGej -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.3.2'
Tag 'libreoffice-4.2.3.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-03-25 15:06 -0700 Tag libreoffice-4.2.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTMY1/AAoJEPQ0oe+v7q6jpAYQAIswOl535euhp1bMYh90Liar Ps6vvUIxHlNdFOq2AovZWVsqiIkBwmCQkmF94U76AMKStBRK+feJaprnsam2jUfO xhOjMdmCHwk/zpEcCMHQa2bb1Lh94hxYbv2yoyacCpshIpWGp0G9LPnkffZLOkko 0QUY3xdeyshkb/8DyROTrS7qlkmIs1QV2UPlZJS5aaS5RG7adF+32SXfNFJ6TxXF pCqdj7fEgG92KHPOV9IMqTP5DKkXdFYw+8WEyHvj2JJoTwtJoW4sh4tp1gaEIu4c nBs00DXdBZN6+MkF8rXI1W7DxjL0ZvRaUH9mXEtkB7kbMtOJOrVFaQwgILu/DmX6 6uB+OS/e+w3ll5fvRwkUOnIyWtI4Ar+I9rRhbj5o5LVhAmRT6khJM98tdpMKTaas CElOek72wv0KtPqlBDWWFTWda0PFWCU0XSk429y9egg8WUJoohtuu6q0eeMcwBzT KvSqqqcPxFWSRCNgs40xae3xoyyKT7A8fLFYNx+dseFbhNH9Rtw7CQNwFXjxEnZQ yH1HaMM8sv2sDf9VXxgvawS0DosFU2yLcJMwOFjICHWrWfD0ISupeiRKXGIrILur X4QFLKlDw9mTterfvbcjWn7AlF2YUYVrxuHQvBCcS0VK1NSHV/1HZxOQA1BoEiJF u1wZIIxP5Kmb10A0Qdh7 =yv/h -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/virdev.hxx|2 +-
vcl/source/gdi/virdev.cxx | 12
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit d4071188b8572441fd9c2b592e44a5ebfd1f1430
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Wed Mar 26 00:10:58 2014 +1100
Fix to commit 03568b2e2405fc44435b95720f3680ab1daea836
During a rebase I accidentally removed the VirtualDevice::EnableRTL().
Also taking the opportunity to make the function virtual in window.hxx.
Change-Id: Ic239d8dc131dfcc6b049c30d2fad4d2d12059059
Reviewed-on: https://gerrit.libreoffice.org/8745
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index e5e5c54..f413e48 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -113,7 +113,7 @@ public:
virtual ~VirtualDevice();
-voidEnableRTL( bool bEnable = true );
+virtual voidEnableRTL( bool bEnable = true );
boolSetOutputSizePixel( const Size rNewSize, bool bErase
= true );
boolSetOutputSizePixelScaleOffsetAndBuffer( const Size
rNewSize, const Fraction rScale, const Point rNewOffset, const
basebmp::RawMemorySharedArray pBuffer );
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 6fc68d2..8dcc804 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -422,6 +422,18 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size
rNewSize, bool bErase, c
return false;
}
+void VirtualDevice::EnableRTL( bool bEnable )
+{
+// virdevs default to not mirroring, they will only be set to mirroring
+// under rare circumstances in the UI, eg the valueset control
+// because each virdev has its own SalGraphics we can safely switch the
SalGraphics here
+// ...hopefully
+if( ImplGetGraphics() )
+mpGraphics-SetLayout( bEnable ? SAL_LAYOUT_BIDI_RTL : 0 );
+
+OutputDevice::EnableRTL(bEnable);
+}
+
bool VirtualDevice::SetOutputSizePixel( const Size rNewSize, bool bErase )
{
return ImplSetOutputSizePixel( rNewSize, bErase,
basebmp::RawMemorySharedArray() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/uiview/view2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6811caf91a63c597a533aac7ffe7ef33e0509e1c
Author: Tor Lillqvist t...@collabora.com
Date: Tue Mar 25 16:13:25 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool' [loplugin]
Change-Id: I5850e62b5d8dc25f58ac098fb7ec6a987e96c040
diff --git a/sw/source/core/uibase/uiview/view2.cxx
b/sw/source/core/uibase/uiview/view2.cxx
index 52212a3..1fcf58a 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -748,7 +748,7 @@ void SwView::Execute(SfxRequest rReq)
nVersion = ((const SfxInt16Item *)pItem)-GetValue();
m_pViewImpl-SetParam( nVersion );
}
-if( SFX_ITEM_SET == pArgs-GetItemState(
SID_NO_ACCEPT_DIALOG, sal_False, pItem ))
+if( SFX_ITEM_SET == pArgs-GetItemState(
SID_NO_ACCEPT_DIALOG, false, pItem ))
{
bNoAcceptDialog = ((const SfxBoolItem
*)pItem)-GetValue();
}
___
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/gbuild.help.txt | 68 +- 1 file changed, 35 insertions(+), 33 deletions(-) New commits: commit 78d7ea21f7c289be47df93fdb975dbccebc583c0 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Wed Mar 26 01:17:46 2014 +1100 Update make helpfile Corrected typo, included the option dump-deps-png because that is awesome and available and not in this helpfile! :-) Change-Id: If8dd8b9c4dc9938c65499ae5d6dfdd7bf830e94d Reviewed-on: https://gerrit.libreoffice.org/8747 Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com Tested-by: Chris Sherlock chris.sherloc...@gmail.com diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 67cdda3..a4396f1 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -36,6 +36,8 @@ AVAILABLE TARGETS cleanremove all generated files debugrun starts the INSTDIR instance and allows tests to be run against it + dump-deps-pngcreates dependency diagrams in PNG format +NOTE: needs graphviz to work module build the named module module.check run unittests of the named module module.clean clean the named module @@ -44,43 +46,43 @@ AVAILABLE TARGETS source cmd execute the command contained in the variable cmd= in a shell with config_host.mk or config_build.mk -environement set. (see gb_SIDE) +environment set. (see gb_SIDE) target build gbuild target (such as Library_vbaswobj or CppunitTest_sw_macros_test) target.clean clean gbuild target class_target for all targets and for the following classes: - o AllLangResTarget - o AllLangZip - o CliLibrary - o CliNativeLibrary - o CliUnoApi - o Configuration - o CppunitTest - o CustomTarget - o Dictionary - o Executable - o Extension - o ExternalPackage - o ExternalProject - o Gallery - o Helper - o InstallModule - o InstallScript - o InternalUnoApi - o Jar - o JunitTest - o Library - o Package - o Pagein - o PythonTest_pytests - o Pyuno - o Rdb - o StaticLibrary - o UI - o UnoApi - o UnpackedTarball - o WinResTarget - o Zip + o AllLangResTarget + o AllLangZip + o CliLibrary + o CliNativeLibrary + o CliUnoApi + o Configuration + o CppunitTest + o CustomTarget + o Dictionary + o Executable + o Extension + o ExternalPackage + o ExternalProject + o Gallery + o Helper + o InstallModule + o InstallScript + o InternalUnoApi + o Jar + o JunitTest + o Library + o Package + o Pagein + o PythonTest_pytests + o Pyuno + o Rdb + o StaticLibrary + o UI + o UnoApi + o UnpackedTarball + o WinResTarget + o Zip INTERACTIVE VARIABLES: DEBUG / debug If not empty, build as with --enable-debug. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk|1
sw/inc/dbui.hrc |1
sw/inc/helpid.h |1
sw/source/ui/dbui/mmmergepage.cxx | 52 ++
sw/source/ui/dbui/mmmergepage.hrc | 35
sw/source/ui/dbui/mmmergepage.hxx | 21 +-
sw/source/ui/dbui/mmmergepage.src | 98
sw/uiconfig/swriter/ui/mmmergepage.ui | 263 ++
9 files changed, 294 insertions(+), 179 deletions(-)
New commits:
commit 76ada5696d114bc90cf285fafec41b1d21696692
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 14:06:11 2014 +
convert mail merge page to .ui
Change-Id: I13e23a2e5c19370b0a82c24bc96b532debf9c160
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 001c39e..2842cf1 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/mailmergewizard.src \
sw/source/ui/dbui/mmaddressblockpage.src \
sw/source/ui/dbui/mmgreetingspage.src \
-sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
sw/source/ui/dbui/selectdbtabledialog.src \
sw/source/ui/dialog/dialog.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index e06de32..00bbcdb 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/mmaddressblockpage \
sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
+ sw/uiconfig/swriter/ui/mmmergepage \
sw/uiconfig/swriter/ui/mmoutputtypepage \
sw/uiconfig/swriter/ui/mmpreparepage \
sw/uiconfig/swriter/ui/mmselectpage \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 2800901..5760a68 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -27,7 +27,6 @@
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
#define DLG_MM_DOCSELECT_PAGE (RC_DBUI_BEGIN + 4)
#define DLG_MM_OUTPUTTYPE_PAGE (RC_DBUI_BEGIN + 5)
-#define DLG_MM_MERGE_PAGE (RC_DBUI_BEGIN + 9)
#define DLG_MM_OUTPUT_PAGE (RC_DBUI_BEGIN + 10)
#define DLG_MM_ADDRESSLISTDIALOG(RC_DBUI_BEGIN + 11)
#define DLG_MM_SELECTDBTABLEDDIALOG (RC_DBUI_BEGIN + 12)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8eebb15..8ad928d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -364,7 +364,6 @@
#define HID_PRINT_AS_MERGE
SW_HID_PRINT_AS_MERGE
#define HID_MODULE_TOOLBOX
SW_HID_MODULE_TOOLBOX
-#define HID_MM_MERGEPAGE
SW_HID_MM_MERGEPAGE
#define HID_MM_OUTPUTPAGE
SW_HID_MM_OUTPUTPAGE
#define HID_MM_SELECTDBTABLEDDIALOG
SW_HID_MM_SELECTDBTABLEDDIALOG
#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
diff --git a/sw/source/ui/dbui/mmmergepage.cxx
b/sw/source/ui/dbui/mmmergepage.cxx
index a54be84..a888cfe 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -23,41 +23,33 @@
#include swtypes.hxx
#include view.hxx
#include dbui.hrc
-#include mmmergepage.hrc
#include svl/srchitem.hxx
#include sfx2/dispatch.hxx
#include svl/eitem.hxx
#include swabstdlg.hxx
-SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
-svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
-m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
-m_aEditFI(this, SW_RES( FI_EDIT )),
-m_aEditPB(this, SW_RES( PB_EDIT )),
-m_aFindFL(this, SW_RES( FL_FIND )),
-m_aFineFT(this, SW_RES( FT_FIND )),
-m_aFindED(this, SW_RES( ED_FIND )),
-m_aFindPB(this, SW_RES( PB_FIND )),
-m_aWholeWordsCB(this, SW_RES( CB_WHOLEWORDS)),
-m_aBackwardsCB(this, SW_RES( CB_BACKWARDS )),
-m_aMatchCaseCB(this, SW_RES( CB_MATCHCASE )),
-m_pWizard(_pParent)
+SwMailMergeMergePage::SwMailMergeMergePage(SwMailMergeWizard* _pParent)
+: svt::OWizardPage(_pParent, MMMergePage,
+modules/swriter/ui/mmmergepage.ui)
+, m_pWizard(_pParent)
{
-FreeResource();
-OUString sTemp(m_aEditFI.GetText());
-sTemp = sTemp.replaceFirst(%1, m_aEditPB.GetText());
-m_aEditFI.SetText(sTemp);
-m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage,
EditDocumentHdl_Impl));
-m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl ));
+get(m_pEditFI, helplabel);
+get(m_pEditPB, edit);
+get(m_pFindPB, find);
+get(m_pWholeWordsCB, wholewords);
+get(m_pBackwardsCB, backwards);
+get(m_pMatchCaseCB, matchcase);
+get(m_pFindED, entry);
+OUString sTemp(m_pEditFI-GetText());
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a27906233ea9b97fae848f0006c644f72c4c6f27 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 16:11:34 2014 + Updated core Project: help 2b799e21a07d93f7b997bb1f3fa85e8cffb19356 diff --git a/helpcontent2 b/helpcontent2 index 2dad754..2b799e2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2dad7542c215024cd26ae42030e01ab772f2f9d5 +Subproject commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/swriter/01/mailmerge07.xhp | 13 +++-- 2 files changed, 7 insertions(+), 13 deletions(-) New commits: commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356 Author: Caolán McNamara caol...@redhat.com Date: Tue Mar 25 16:11:34 2014 + update help ids for mail merge wizard page .ui conversion Change-Id: Icb1525679914ef214ed5eccf451accc6e2885e76 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6542891..ed967fb 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2305,7 +2305,6 @@ HID_MM_HEADER_8,55043, HID_MM_HEADER_9,55044, HID_MM_MAILBODY,54982, HID_MM_MAILSTATUS_TLB,54988, -HID_MM_MERGEPAGE,54960, HID_MM_NEXT_PAGE,55016, HID_MM_OUTPUTPAGE,54961, HID_MM_PREV_PAGE,55017, @@ -6332,9 +6331,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940, sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938, sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961, sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279, -sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601, -sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602, -sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600, sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186, sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196, sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858, @@ -6366,7 +6362,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977, sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969, sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960, -sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND,898287622, sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052, sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, @@ -6466,8 +6461,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016, -sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179, -sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND,898290183, sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593, sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS,898306583, sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW,898306586, diff --git a/source/text/swriter/01/mailmerge07.xhp b/source/text/swriter/01/mailmerge07.xhp index 3294ac4..55d594f 100644 --- a/source/text/swriter/01/mailmerge07.xhp +++ b/source/text/swriter/01/mailmerge07.xhp @@ -32,26 +32,27 @@ /meta body section id=personalize +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/MMMergePage id=bm_id664083 localize=false/ paragraph role=heading id=par_idN10543 xml-lang=en-US level=1 l10n=NEWlink href=text/swriter/01/mailmerge07.xhpMail Merge Wizard - Personalize Document/link/paragraph paragraph role=paragraph id=par_idN10553 xml-lang=en-US l10n=NEWEdit documents for each recipient./paragraph /section paragraph role=paragraph id=par_idN10556 xml-lang=en-US l10n=NEWThe Mail Merge Wizard creates a single merged document with page breaks between each recipient. When you reach this page of the wizard, the names and the addresses of the recipients are contained in the document./paragraph -bookmark xml-lang=en-US branch=hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT id=bm_id664082 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/edit id=bm_id664082 localize=false/ paragraph role=heading id=par_idN10559 xml-lang=en-US level=2 l10n=NEWEdit individual document/paragraph paragraph role=paragraph id=par_idN1055D xml-lang=en-US l10n=CHGahelp hid=.Minimizes the wizard so that you can edit the mail merge document for a single recipient./ahelp After you made your changes, click the emphReturn to Mail Merge Wizard/emph button./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND id=bm_id2794885 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/entry id=bm_id2794885 localize=false/ paragraph role=heading id=par_idN105FA xml-lang=en-US level=2 l10n=NEWSearch for/paragraph paragraph role=paragraph id=par_idN105FE xml-lang=en-US l10n=NEWahelp hid=.Enter the text that you want to search for in the merged document, for example, the name of a recipient./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND id=bm_id2486342 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/find id=bm_id2486342 localize=false/ paragraph role=heading id=par_idN10564 xml-lang=en-US level=2 l10n=NEWFind/paragraph paragraph role=paragraph id=par_idN10568 xml-lang=en-US l10n=NEWahelp hid=.Click to start the search./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS id=bm_id823999 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmmergepage/wholewords id=bm_id823999
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx | 13
sc/qa/unit/ucalc.hxx |2 +
sc/qa/unit/ucalc_formula.cxx | 62 +++
sc/source/core/data/documen3.cxx | 10 ++
sc/source/core/tool/token.cxx| 26
5 files changed, 113 insertions(+)
New commits:
commit 8582db191b5c88c72e5b16c89a024f897a95a6f1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Mar 25 12:38:48 2014 -0400
fdo#76402: Handle range reference expansion in named ranges.
Change-Id: I8314260fc7588f0a0230ab63cc600fa887a8479d
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 75f8bc0..7947827 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2939,6 +2939,19 @@ bool adjustDoubleRefInName(
ScComplexRefData rRef, const sc::RefUpdateContext rCxt, const ScAddress
rPos )
{
bool bRefChanged = false;
+if (rCxt.mnRowDelta 0 rCxt.mrDoc.IsExpandRefs()
!rRef.Ref1.IsRowRel() !rRef.Ref2.IsRowRel())
+{
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+return true;
+}
+}
if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
bRefChanged = true;
@@ -2994,6 +3007,19 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
}
+else if (rCxt.mnRowDelta 0 rCxt.mrDoc.IsExpandRefs())
+{
+// Check if we could expand range reference by the bottom
+// edge. For named expressions, we only expand absolute
+// references.
+if (!rRef.Ref1.IsRowRel() !rRef.Ref2.IsRowRel()
aAbs.aEnd.Row()+1 == rCxt.maRange.aStart.Row())
+{
+// Expand by the bottom edge.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+aRes.mbReferenceModified = true;
+}
+
+}
}
break;
default:
commit a603ddf9adef4373940936f785e918a8c0ea560b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Mar 25 10:52:48 2014 -0400
fdo#76402: Write unit test for this first.
Change-Id: Ib4fccb0e29d4a21a211de4af2cdeaf956f9b9cc6
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index becca93..5b8579b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -514,6 +514,19 @@ public:
SC_DLLPUBLIC ScRangeName* GetRangeName() const;
void SetRangeName(SCTAB nTab, ScRangeName* pNew);
void SetRangeName( ScRangeName* pNewRangeName );
+
+/**
+ * Insert a new named expression to the global scope.
+ *
+ * @param rName name for the expression.
+ * @param rPos base position.
+ * @param rExpr formula expression to be associated with the name. The
+ * current grammer is used to compile this expression.
+ *
+ * @return true if inserted successfully, false otherwise.
+ */
+bool InsertNewRangeName( const OUString rName, const ScAddress rPos,
const OUString rExpr );
+
SCTAB GetMaxTableNumber() { return
static_castSCTAB(maTabs.size()) - 1; }
voidSetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber =
nNumber; }
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 39b40d1..7c1c67c 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -121,6 +121,7 @@ public:
void testFormulaRefUpdateMove();
void testFormulaRefUpdateMoveUndo();
void testFormulaRefUpdateNamedExpression();
+void testFormulaRefUpdateNamedExpressionExpandRef();
void testMultipleOperations();
void testFuncCOLUMN();
void testFuncCOUNT();
@@ -366,6 +367,7 @@ public:
CPPUNIT_TEST(testFormulaRefUpdateMove);
CPPUNIT_TEST(testFormulaRefUpdateMoveUndo);
CPPUNIT_TEST(testFormulaRefUpdateNamedExpression);
+CPPUNIT_TEST(testFormulaRefUpdateNamedExpressionExpandRef);
CPPUNIT_TEST(testMultipleOperations);
CPPUNIT_TEST(testFuncCOLUMN);
CPPUNIT_TEST(testFuncCOUNT);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index a03ba89..718ece7 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1818,6 +1818,68 @@ void Test::testFormulaRefUpdateNamedExpression()
m_pDoc-DeleteTab(0);
}
+void Test::testFormulaRefUpdateNamedExpressionExpandRef()
+{
+m_pDoc-InsertTab(0, Test);
+m_pDoc-SetExpandRefs(true); // turn on automatic range expansion.
+
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 3cd22c2e025fba734ea2213b679e524de3e17a79 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Mar 25 12:52:08 2014 -0400 Extra blank line. Change-Id: I6ee460dabfe1962d4ad1eb22f29d924a5e854a82 diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 7947827..f1982bd 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -3018,7 +3018,6 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName( rRef.Ref2.IncRow(rCxt.mnRowDelta); aRes.mbReferenceModified = true; } - } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - include/svx sc/source sdext/source sd/source svl/unx sw/qa
include/svx/galmisc.hxx | 10 +++--
sc/source/ui/docshell/docsh8.cxx | 33 --
sc/source/ui/view/output2.cxx| 40 ---
sc/source/ui/view/viewfunc.cxx |6 ---
sd/source/core/drawdoc3.cxx | 12 +++---
sd/source/ui/view/sdruler.cxx|7 ++--
sdext/source/pdfimport/pdfparse/pdfentries.cxx |2 -
sdext/source/pdfimport/tree/drawtreevisiting.cxx |4 +-
svl/unx/source/svdde/ddedummy.cxx|1
sw/qa/extras/inc/swmodeltestbase.hxx |1
10 files changed, 22 insertions(+), 94 deletions(-)
New commits:
commit 729f40f0359bcaa311c7d0067c84e7755286d261
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 14:02:35 2014 +
coverity#738830 Uninitialized pointer field
Change-Id: I82b0c24957761573e0870b11b7b1ddb3553119c4
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 66bed37..dc1943f 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -73,9 +73,10 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId,
SfxItemState, const SfxPoolIt
Ruler::Ruler( DrawViewShell rViewSh, ::Window* pParent, ::sd::Window* pWin,
sal_uInt16 nRulerFlags, SfxBindings rBindings, WinBits nWinStyle)
-: SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle)
-, pSdWin(pWin)
-, pDrViewShell(rViewSh)
+: SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle)
+, pSdView(NULL)
+, pSdWin(pWin)
+, pDrViewShell(rViewSh)
{
rBindings.EnterRegistrations();
pCtrlItem = new RulerCtrlItem(SID_RULER_NULL_OFFSET, *this, rBindings);
commit 80450fe68f193c69a49bdd0f9b40dac8f1b9f407
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 14:01:13 2014 +
coverity#738856 Uninitialized pointer field
Change-Id: I3dec3b5bed90b63f8869e0f28c970cec93d040c8
diff --git a/svl/unx/source/svdde/ddedummy.cxx
b/svl/unx/source/svdde/ddedummy.cxx
index 1fca271..de726e7 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -147,6 +147,7 @@ DdePoke::DdePoke( DdeConnection rConnection, const
OUString rString, const Dde
DdeTopic::DdeTopic( const OUString )
+: pName(NULL)
{
}
commit 361000e7b670c78ee9009d101c25ac3618e36243
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 14:00:19 2014 +
coverity#738867 Uninitialized pointer field
Change-Id: I14e7a499d994d5a93ca1c6263a5c52e3c6b14fb6
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index b9bf2ac..5d08606 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -41,10 +41,12 @@ struct ExchangeData
DateaThemeChangeDate;
TimeaThemeChangeTime;
-ExchangeData() :
-aThemeChangeDate( Date::EMPTY ),
-aThemeChangeTime( Time::EMPTY )
-{}
+ExchangeData()
+: pTheme(NULL)
+, aThemeChangeDate( Date::EMPTY )
+, aThemeChangeTime( Time::EMPTY )
+{
+}
};
enum SgaObjKind
commit 138d02c6c6e588903b151a8ba5d93c03fae3f75e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 13:58:28 2014 +
coverity#982474 Unchecked dynamic_cast
Change-Id: I67f495755502b034b8a09d8b6d61ede45f2d91e1
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index f460800..043debb 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -216,6 +216,7 @@ private:
void calcLayout()
{
SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument
*(mxComponent.get());
+CPPUNIT_ASSERT(pTxtDoc);
SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc();
pDoc-GetCurrentViewShell()-CalcLayout();
}
commit 7fce0e3fe7b6de17c896bcd60cf054e4721bce67
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 25 13:57:25 2014 +
coverity#982469 Unchecked dynamic_cast
Change-Id: I6fa95fbd64f69cca1837b57f9c632f0bdbaec1d0
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index bd8e618..626480d 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -707,7 +707,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element
rParent)
}
bool bPara = strspn(ParagraphElement, typeid(rParent).name());
ParagraphElement* pPara =
dynamic_castParagraphElement*(rParent);
-if (bPara isComplex)
+if (bPara pPara isComplex)
pPara-bRtl = true;
if( pNext )
{
@@ -737,7 +737,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element
rParent)
if (nType ==
::com::sun::star::i18n::ScriptType::COMPLEX)
isComplex = true;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/firebird
external/firebird/firebird-macosx.patch.1 |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 6bdd4e3334b226c3ba7c4a0ca756abf5e49a0fa5 Author: Tor Lillqvist t...@collabora.com Date: Mon Feb 10 11:22:05 2014 +0200 -fno-weak is unknown in the Clang 3.4 in current Xcode (5.1) (cherry picked from commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc) Signed-off-by: Tor Lillqvist t...@collabora.com Change-Id: I10611e97c17de9c00b818e22ac88ffbb736aaf37 Reviewed-on: https://gerrit.libreoffice.org/8752 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 index adede1c..0ad9bd9 100644 --- a/external/firebird/firebird-macosx.patch.1 +++ b/external/firebird/firebird-macosx.patch.1 @@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix. export DYLD_LIBRARY_PATH MACOSX_DEPLOYMENT_TARGET=10.6 -@@ -27,8 +27,8 @@ +@@ -27,9 +27,9 @@ OS_ServerFiles=inet_server.cpp -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6 +-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall - CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak ++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \ + fbtracemgr ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua
vcl/aqua/source/app/salsys.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6308a43f76169af4eb2b08f4913ddbe766ab534d Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 26 18:00:28 2013 +0200 WaE: format string is not a string literal (potentially insecure) (cherry picked from commit 765cd0ebaabf9cf7948ae1424681de144c7d267e) Signed-off-by: Tor Lillqvist t...@collabora.com Change-Id: I568817c33aa555bc8aef93105e6a00be1d4b501d Reviewed-on: https://gerrit.libreoffice.org/8753 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 3cfcb3c..8058a95 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -155,7 +155,7 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString rTitle, } -int nResult = NSRunAlertPanel( pTitle, pMessage, pDefText, pAltText, pOthText ); +int nResult = NSRunAlertPanel( pTitle, @%@, pDefText, pAltText, pOthText, pMessage ); if( pTitle ) [pTitle release]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua
vcl/aqua/source/gdi/salgdicommon.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit bc176aca405954cf098933297e193058f062836f Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 26 18:02:53 2013 +0200 WaE: unused variable 'aRefreshRect' (cherry picked from commit 80b6f48d5e86c1489d1ae4a20fd5dcf5c324d33f) Signed-off-by: Tor Lillqvist t...@collabora.com Conflicts: vcl/aqua/source/gdi/salgdicommon.cxx Change-Id: I6ecc96a7da2358ff91d4db46b1b07f8e56548f88 Reviewed-on: https://gerrit.libreoffice.org/8754 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index eedf607..babdc5f 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -719,6 +719,8 @@ void AquaSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) CGContextDrawPath( mrContext, kCGPathStroke ); Rectangle aRefreshRect( nX1, nY1, nX2, nY2 ); +(void) aRefreshRect; +// Is a call to RefreshRect( aRefreshRect ) missing here? } void AquaSalGraphics::drawMask( const SalTwoRect rPosAry, const SalBitmap rSalBitmap, SalColor nMaskColor ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua
vcl/aqua/source/window/salframe.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 901d2c4a02d95a45cec84dea14f4792378df435b
Author: Tor Lillqvist t...@collabora.com
Date: Thu Dec 26 18:03:44 2013 +0200
WaE: unused variable 'aRet'
(cherry picked from commit 05fad0744c81a359c5cadb3f5a3c20551677db23)
Signed-off-by: Tor Lillqvist t...@collabora.com
Change-Id: Ieef0fec21504518e49b78cd49aa643eb545c3100
Reviewed-on: https://gerrit.libreoffice.org/8755
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 078fc1d..523fbda 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -700,7 +700,6 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
SalData::ensureThreadAutoreleasePool();
NSArray* pScreens = [NSScreen screens];
-Rectangle aRet;
NSScreen* pScreen = nil;
if( pScreens nScreen [pScreens count] )
{
___
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/accessibility/AccessibleShape.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e5d7a360e68b1725ee28abc5c76db5c4023dce88
Author: Niklas Johansson sleeping.pil...@gmail.com
Date: Tue Mar 25 16:01:50 2014 +0100
Accessibility: Avoid immediate crash in Impress
When Accessibility is active Impress immediately crashes. We need to check
that
mpParent isn't NULL before we try to call it's methods. This has been a
problem since at least commit 7ef4a5bd51c606c70661dd303ebd1eeaec0c3834.
I don't know if it is relevant to bring that back though.
Change-Id: Idaa1f30685205e3a62cec2a60a14791d798391a6
Reviewed-on: https://gerrit.libreoffice.org/8748
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index 61bc65e..579c785 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -402,15 +402,18 @@ uno::ReferenceXAccessibleRelationSet SAL_CALL
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard (maMutex);
+if (mpParent == NULL)
+return uno::ReferenceXAccessibleRelationSet();
+
::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
-//this mxshape is the captioned shape, only for sw
+//this mxshape is the captioned shape
uno::Sequence uno::Reference uno::XInterface aSequence(1);
aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
if(aSequence[0].get())
{
pRelationSet-AddRelation(
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
+ AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
}
return uno::ReferenceXAccessibleRelationSet(pRelationSet);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: No SSL support included in this Python in 4.2 LibreOffice Relise
On Thu, 2014-03-20 at 09:54 +0600, Agapov Ruslan wrote: Hi. I get an error No SSL support included in this Python in 4.2 Libre Office Relise when I test my email settings in Service\Setup\ LibreOffice Writer mail settings\Test settings and check the ssl option in this form. That's a real nuisance. We definitely attempt to build the ssl stuff under windows with external/python3/python-3.3.0-ssl.patch.1 so something has gone wrong with that. So I imagine that the dailies from master also fail the same way? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/tools sfx2/source sw/source tools/source vcl/source
include/tools/debug.hxx| 37 -
include/tools/tools.h |1
sfx2/source/control/bindings.cxx | 53 ---
sfx2/source/control/dispatch.cxx | 11 -
sfx2/source/control/statcach.cxx | 11 -
sw/source/core/uibase/docvw/edtwin.cxx |5
sw/source/core/uibase/uiview/view.cxx |6
sw/source/core/view/viewsh.cxx |5
sw/source/ui/frmdlg/column.cxx |4
tools/source/debug/debug.cxx | 220 -
tools/source/generic/toolsin.cxx |5
vcl/source/app/dbggui.cxx | 21 ---
vcl/source/app/svapp.cxx |1
13 files changed, 5 insertions(+), 375 deletions(-)
New commits:
commit cdb473b00a7d56c43df568708c069fa31a07f0a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 25 18:48:45 2014 +0100
Remove now unused tools/debug.hxx profiling functionality
Change-Id: I13adca8c2f929c8a9226b26ef57b26363dfdf0b3
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index 12b9ad4..5574d0d 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -54,7 +54,6 @@ typedef void (*DbgTestSolarMutexProc)();
#define DBG_TEST_XTOR_REPORT(0x0008)
#define DBG_TEST_XTOR_TRACE (0x0010)
-#define DBG_TEST_PROFILING (0x0100)
#define DBG_TEST_RESOURCE (0x0200)
#define DBG_TEST_DIALOG (0x0400)
#define DBG_TEST_BOLDAPPFONT(0x0800)
@@ -96,7 +95,6 @@ struct DbgDataType
// Dbg prototypes
#define DBG_FUNC_DEBUGSTART 1
#define DBG_FUNC_DEBUGEND 2
-#define DBG_FUNC_GLOBALDEBUGEND 3
#define DBG_FUNC_GETDATA4
#define DBG_FUNC_SAVEDATA 5
#define DBG_FUNC_SETPRINTMSGBOX 6
@@ -121,11 +119,6 @@ inline void DbgDebugEnd()
DbgFunc( DBG_FUNC_DEBUGEND );
}
-inline void DbgGlobalDebugEnd()
-{
-DbgFunc( DBG_FUNC_GLOBALDEBUGEND );
-}
-
inline void DbgSetPrintMsgBox( DbgPrintLine pProc )
{
DbgFunc( DBG_FUNC_SETPRINTMSGBOX, (void*)(long)pProc );
@@ -246,13 +239,6 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uInt16 nOutType,
const sal_Char* pFStr, ..
// Dbg test functions
-#define DBG_PROF_START 1
-#define DBG_PROF_STOP 2
-#define DBG_PROF_CONTINUE 3
-#define DBG_PROF_PAUSE 4
-
-TOOLS_DLLPUBLIC void DbgProf( sal_uInt16 nAction, DbgDataType* );
-
#define DBG_XTOR_CTOR 1
#define DBG_XTOR_DTOR 2
#define DBG_XTOR_CHKTHIS3
@@ -300,19 +286,6 @@ public:
#define DBG_DEBUGSTART()DbgDebugStart()
#define DBG_DEBUGEND() DbgDebugEnd()
-#define DBG_GLOBALDEBUGEND()DbgGlobalDebugEnd()
-
-#define DBG_PROFSTART( aName ) \
-DbgProf( DBG_PROF_START, DBG_FUNC( aName ) )
-
-#define DBG_PROFSTOP( aName ) \
-DbgProf( DBG_PROF_STOP, DBG_FUNC( aName ) )
-
-#define DBG_PROFCONTINUE( aName ) \
-DbgProf( DBG_PROF_CONTINUE, DBG_FUNC( aName ) )
-
-#define DBG_PROFPAUSE( aName ) \
-DbgProf( DBG_PROF_PAUSE, DBG_FUNC( aName ) )
#define DBG_CTOR( aName, fTest )\
DbgXtorObj aDbgXtorObj( DBG_FUNC( aName ), \
@@ -385,17 +358,11 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_DEBUGSTART() ((void)0)
#define DBG_DEBUGEND() ((void)0)
-#define DBG_GLOBALDEBUGEND() ((void)0)
#define DBG_NAME( aName )
#define DBG_NAMEEX( aName )
#define DBG_NAMEEX_VISIBILITY( aName, vis )
-#define DBG_PROFSTART( aName ) ((void)0)
-#define DBG_PROFSTOP( aName ) ((void)0)
-#define DBG_PROFCONTINUE( aName ) ((void)0)
-#define DBG_PROFPAUSE( aName ) ((void)0)
-
#define DBG_CTOR( aName, fTest ) ((void)0)
#define DBG_DTOR( aName, fTest ) ((void)0)
#define DBG_CHKTHIS( aName, fTest ) ((void)0)
diff --git a/include/tools/tools.h b/include/tools/tools.h
index 342a606..bf0eb32 100644
--- a/include/tools/tools.h
+++ b/include/tools/tools.h
@@ -25,7 +25,6 @@
// Methoden, die von VCL gerufen werden muessen
TOOLS_DLLPUBLIC void InitTools();
TOOLS_DLLPUBLIC void DeInitTools();
-TOOLS_DLLPUBLIC void GlobalDeInitTools();
#endif
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 1797ab8..0836459 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -84,18 +84,6 @@ public:
#define DBG_MAXNAME 28
-struct ProfType
-{
-sal_uIntPtr nCount;
-sal_uIntPtr nTime;
-sal_uIntPtr nMinTime;
-sal_uIntPtr nMaxTime;
-sal_uIntPtr nStart;
-sal_uIntPtr nContinueTime;
-sal_uIntPtr nContinueStart;
-sal_CharaName[DBG_MAXNAME+1];
-};
-
struct XtorType
{
sal_uIntPtr nCtorCalls;
@@ -116,7 +104,6 @@ struct DebugData
DbgPrintLinepDbgAbort;
Re: Bunch of error messages related to gio_content.cxx
Hi Stephan, sberg wrote On my different sources (master, 4.2 and 4.1), I noticed these logs: warn:ucb.ucp.gio:5217:1:ucb/source/ucp/gio/gio_content.cxx:378: ignoring GError L'emplacement indiqué n'est pas pris en charge for lt;vnd.sun.star.job:alias=UpdateCheckgt; [...] Those should be harmless; the GIO-based UCP is registered as a catch-all at the UCB, so is used for all URI schemes for which no specific UCP is registered (like file and http). That means it gets all the odd LO-internal URL schemes (like vnd.sun.star.job and macro) which GIO itself cannot handle. Appearance of these warnings would depend on configuration of --enable-gio vs. --enable-gnome-vfs at least. I've got none of them in my autogen.input, perhaps I'm wrong but autogen.sh doesn't complain. sberg wrote ... warn:configmgr:5217:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/julien/compile-libreoffice/libo/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu4k5tkj.tmp/Addons.xcu warn:configmgr:5217:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/julien/compile-libreoffice/libo/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu4k5tkj.tmp/Addons.xcu See lt;http://lists.freedesktop.org/archives/libreoffice/2012-April/030786.htmlgt; Cruft in potentially bundled extensions' Addons.xcu. So if you want those warnings to go away, either configure without explicit --enable-ext-google-docs or nudge Przemysław to fix upstream and/or whomever feels responsible for lt;http://dev-www.libreoffice.org/src/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxtgt; to patch it there. Indeed I've got --enable-ext-google-docs + --enable-dbgutil, I'll try to find someone to ping for this. Thank you Stephan for your detailed explanation. Julien -- View this message in context: http://nabble.documentfoundation.org/Bunch-of-error-messages-related-to-gio-content-cxx-tp4102853p4102939.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Create a button option with code to insert in a dialogue
How I can create a new radio button to insert it into a dialog through code, ie with no add it from the window of the IDE design dialogues LibreOffice .? Usage LibreOffice Basic ¿Cómo puedo crear nuevo botón de opción para insertarlo en un cuadro de diálogo mediante código, es decir, sin adicionarlo desde la ventana de diseño dialogos del IDE de LibreOffice. ? Uso libreOffice Basic .Espero que alguno pueda ayudarme. Gracias I Conferencia Científica Internacional UCIENCIA 2014 en la UCI del 24 al 26 de abril de 2014, La Habana, Cuba. Ver http://uciencia.uci.cu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/data/xls/enhanced-protection.xls |binary
sc/qa/unit/filters-test.cxx | 20
sc/source/core/data/tabprotection.cxx | 27 +++
3 files changed, 47 insertions(+)
New commits:
commit e27cc864be4d18d5bf307c58ebf1c1aa4ef90078
Author: Eike Rathke er...@redhat.com
Date: Tue Mar 25 20:41:52 2014 +0100
added unit test for .xls BIFF enhanced protection
Change-Id: I8f218f8f8ce12525b4c9995567d2864baa610c0b
diff --git a/sc/qa/unit/data/xls/enhanced-protection.xls
b/sc/qa/unit/data/xls/enhanced-protection.xls
new file mode 100644
index 000..00cc6e6
Binary files /dev/null and b/sc/qa/unit/data/xls/enhanced-protection.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 4de62d1..9d049f7 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -31,6 +31,7 @@
#include drwlayer.hxx
#include userdat.hxx
#include formulacell.hxx
+#include tabprotection.hxx
#include svx/svdpage.hxx
@@ -69,6 +70,7 @@ public:
void testSharedFormulaXLS();
void testSharedFormulaXLSX();
void testLegacyCellAnchoredRotatedShape();
+void testEnhancedProtectionXLS();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCVEs);
@@ -82,6 +84,7 @@ public:
CPPUNIT_TEST(testSharedFormulaXLS);
CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
+CPPUNIT_TEST(testEnhancedProtectionXLS);
CPPUNIT_TEST_SUITE_END();
@@ -491,6 +494,23 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
}
}
+void ScFiltersTest::testEnhancedProtectionXLS()
+{
+ScDocShellRef xDocSh = loadDoc(enhanced-protection., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+
+const ScTableProtection* pProt = pDoc-GetTabProtection(0);
+
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 0, 0))); //
locked
+CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 1, 0))); //
editable without password
+CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 2, 0))); //
editable without password
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 3, 0, 0, 3, 0))); //
editable with password foo
+CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 2, 0))); //
union of two different editables
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 1, 0))); //
union of locked and editable
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 3, 0))); //
union of editable and password editable
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( /sc/qa/unit/data )
{
commit 98c6b4149e46eec6aaee5b64f2fa40678589dd4b
Author: Eike Rathke er...@redhat.com
Date: Tue Mar 25 20:39:10 2014 +0100
union of a to be edited range may be distributed over two different records
Change-Id: I1d0047e04394a79134beef35ba0cfe6a8ca1
diff --git a/sc/source/core/data/tabprotection.cxx
b/sc/source/core/data/tabprotection.cxx
index 161cf65..a8aa278 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -434,6 +434,33 @@ bool ScTableProtectionImpl::isBlockEditable( const
ScRange rRange ) const
}
}
+// Ranges may even be distributed over different protection records, for
+// example if they are assigned different names, and can have different
+// passwords. Combine the ones that can be edited.
+/* TODO: once we handle passwords, remember a successful unlock at
+ * ScEnhancedProtection so we can use that here. */
+ScRangeList aRangeList;
+for (::std::vectorScEnhancedProtection::const_iterator
it(maEnhancedProtection.begin()),
+itEnd(maEnhancedProtection.end()); it != itEnd; ++it)
+{
+if ((*it).maSecurityDescriptor.empty() (*it).maRangeList.Is())
+{
+// Ranges are editable if no password is assigned.
+if (!(*it).mnPasswordVerifier)
+{
+const ScRangeList rRanges = *(*it).maRangeList;
+size_t nRanges = rRanges.size();
+for (size_t i=0; i nRanges; ++i)
+{
+aRangeList.Append( *rRanges[i]);
+}
+}
+}
+}
+ScRangeList aResultList( aRangeList.GetIntersectedRange( rRange));
+if (aResultList.size() == 1 *aResultList[0] == rRange)
+return true;
+
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/sfx2 sfx2/sdi sw/source
include/sfx2/sfxsids.hrc |3 ++-
sfx2/sdi/sfx.sdi |5 +
sw/source/ui/uiview/view2.cxx |7 ++-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit b5cd1d6a64e3e98a09076fe0c6fd4b637570f955
Author: Mathias Supp mathias.s...@vector.com
Date: Tue Feb 25 04:04:48 2014 +0100
add parameter to supress dialog
With the new parameter you can now supress the dialog for document
compare in writer.
Change-Id: I984ee75552e5c006332331510df5d437b687903f
Reviewed-on: https://gerrit.libreoffice.org/8739
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index bc26695..c9f4caf 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -264,6 +264,7 @@
#define SID_MAIL_SENDDOCASFORMAT(SID_SFX_START + 1707)
#define SID_MAIL_SENDDOCASMS(SID_SFX_START + 1708)
#define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709)
+#define SID_NO_ACCEPT_DIALOG(SID_SFX_START + 1710)
#define SID_NOAUTOSAVE (SID_SFX_START + 1711)
#define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712)
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
@@ -285,6 +286,7 @@
// SID_SFX_free_START (SID_SFX_START + 1728)
// SID_SFX_free_END(SID_SFX_START + 3999)
+
#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
// FREE, was SID_VIEW_ZOOM_MODE
// FREE, was SID_VIEW_POS_SIZE
@@ -753,7 +755,6 @@
#define SC_VIEW_START (SID_SC_START)
#endif
#define FID_CHG_RECORD (EDIT_MENU_START + 18)
-//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
#define SID_CHG_PROTECT (SC_VIEW_START + 84)
// eof
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 624e990..8f535c9 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1071,7 +1071,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
//--
SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
-(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName
SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions
SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION)
+(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName
SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions
SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION, SfxBoolItem
NoAcceptDialog SID_NO_ACCEPT_DIALOG)
[
/* flags: */
AutoUpdate = FALSE,
@@ -4302,9 +4302,6 @@ SfxObjectItem Open SID_OPENDOC
RecordPerSet;
Asynchron;
-/* status: */
-SlotType = SfxStringItem
-
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index db42f21..5fe1367 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -711,6 +711,7 @@ void SwView::Execute(SfxRequest rReq)
sal_Int16 nVersion = 0;
bool bHasFileName = false;
m_pViewImpl-SetParam( 0 );
+bool bNoAcceptDialog = false;
if( pArgs )
{
@@ -726,6 +727,10 @@ void SwView::Execute(SfxRequest rReq)
nVersion = ((const SfxInt16Item *)pItem)-GetValue();
m_pViewImpl-SetParam( nVersion );
}
+if( SFX_ITEM_SET == pArgs-GetItemState(
SID_NO_ACCEPT_DIALOG, sal_False, pItem ))
+{
+bNoAcceptDialog = ((const SfxBoolItem
*)pItem)-GetValue();
+}
}
m_pViewImpl-InitRequest( rReq );
@@ -735,7 +740,7 @@ void SwView::Execute(SfxRequest rReq)
{
rReq.SetReturnValue( SfxInt32Item( nSlot, nFound ));
-if (nFound 0) // show Redline browser
+if (nFound 0 !bNoAcceptDialog) // Redline-Browser
anzeigen
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame-ShowChildWindow(FN_REDLINE_ACCEPT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/oox oox/source
include/oox/crypto/Standard2007Engine.hxx |5 -
oox/source/crypto/DocumentDecryption.cxx |1 +
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 19f74aed27868105bc67c642dff0c3e1cb7594c2
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 24 18:19:54 2014 +0100
fdo#76222 oox: add support for MSO 2007 SP2 encrypted documents
Change-Id: I8fa586d49437ff5422fc3daa4c81439146e598a0
Reviewed-on: https://gerrit.libreoffice.org/8734
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/oox/crypto/Standard2007Engine.hxx
b/include/oox/crypto/Standard2007Engine.hxx
index 37ae0a0..329d790 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -37,7 +37,10 @@ const sal_uInt32 ENCRYPT_PROVIDER_TYPE_AES = 0x0018;
const sal_uInt32 ENCRYPT_PROVIDER_TYPE_RC4 = 0x0001;
// version of encryption info used in MS Office 2007 (major = 3, minor = 2)
-const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003;
+const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003;
+// version of encryption info used in MS Office 2007 SP2 and older (major = 4,
minor = 2)
+const sal_uInt32 VERSION_INFO_2007_FORMAT_SP2 = 0x00020004;
+
// version of encryption info - agile (major = 4, minor = 4)
const sal_uInt32 VERSION_INFO_AGILE = 0x00040004;
diff --git a/oox/source/crypto/DocumentDecryption.cxx
b/oox/source/crypto/DocumentDecryption.cxx
index 47fa006..28eb79e 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -347,6 +347,7 @@ bool DocumentDecryption::readEncryptionInfo()
switch (aVersion)
{
case VERSION_INFO_2007_FORMAT:
+case VERSION_INFO_2007_FORMAT_SP2:
mCryptoType = STANDARD_2007; // Set encryption info format
bResult = readStandard2007EncryptionInfo( aBinaryInputStream );
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/txtnode/ndtxt.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sun Mar 23 15:00:19 2014 +0100
fdo#74981: cutting nothing should do nothing, should fix field dupes
Change-Id: I8a8c9bfcd0943904384bb12b510a050ef8df9adf
Reviewed-on: https://gerrit.libreoffice.org/8730
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 619e203..2be6fbb9 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1923,6 +1923,8 @@ OUString SwTxtNode::InsertText( const OUString rStr,
const SwIndex rIdx,
void SwTxtNode::CutText( SwTxtNode * const pDest,
const SwIndex rStart, const xub_StrLen nLen )
{
+if(nLen == 0)
+return;
if(pDest)
{
SwIndex aDestStt(pDest, pDest-GetTxt().getLength());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/examples wizards/com
odk/examples/DevelopersGuide/examples.html | 18 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 10 ++--- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 25b1d86643e5e60a3aa79d7ee3bd3e3828dc96b1 Author: Andras Timar andras.ti...@collabora.com Date: Tue Mar 25 21:25:55 2014 +0100 typo: bussiness - business Change-Id: Id8851321571072df8042a08c2bf350891a9dfcc4 diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 6a9a750..1bb5d27 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -745,7 +745,7 @@ for the image shrink component and instantiates it./td title=link to Components/DialogComponent/DialogComponent.odtDialogComponent.odt/a/td td class=cell80Document containing Basic code to instantiate the Dialog Components and a Dialog containing - controls with events bound to methods supported by the + controls with events bound to methods supported by the Dialog Component./td /tr /tbody @@ -2259,7 +2259,7 @@ form controls./a/td title=link to Forms/DataAwareness.javaDataAwareness/a/td td class=cell80This class implements the basic example for a form working on a database. Two tables will be created -and a form (writer document) with a bussiness example will fill its +and a form (writer document) with a business example will fill its fields from these tables./td /tr tr @@ -2805,37 +2805,37 @@ for the Office application./td td class=cell80Description/td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/DialogDocument.java title=link to GUI/DialogDocument.javaDialogDocument/a/td td class=cell80A sample showing how to display an office document in a dialog window./td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/Messagebox.java title=link to GUI/MessageBox.javaMessageBox/a/td td class=cell80A sample showing how to display a simple message box./td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/UnoDialogSample.java title=link to GUI/UnoDialogSample.javaUnoDialogSample/a/td td class=cell80A sample showing how to create various controls in a dialog (fixed text field, currency field, progress bar, fixed line, group box, edit field, time field, date field, pattern field, numeric field, progressbar, check box, radio button, list box, combo box, formatted field, file control, button control, roadmap control)/td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/UnoDialogSample2.java title=link to GUI/UnoDialogSample2.javaUnoDialogSample2/a/td td class=cell80A dialog sample showing how to use a roadmap control./td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/UnoMenu.java title=link to GUI/UnoMenu.javaUnoMenu/a/td td class=cell80A sample showing a top window with some menus./td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/UnoMenu2.java title=link to GUI/UnoMenu2.javaUnoMenu2/a/td td class=cell80A dialog sample showing how to use or work with a context menu./td /tr tr - td class=cell20img src=../../docs/images/bluball.gif/ + td class=cell20img src=../../docs/images/bluball.gif/ a href=./GUI/ImageControlSample.java title=link to GUI/ImageControlSample.javaImageControlSample2/a/td td class=cell80Dialog sample showing how to use an image control./td /tr diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py index 3d29aeb..77f20e4 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
Re: Extension in Java
thanks, Cedric. I developmend one extension in java, when i try to build the extension LibreofficeManageExtension Cannot determine registration class.I cant find the error in my extension. I Conferencia Científica Internacional UCIENCIA 2014 en la UCI del 24 al 26 de abril de 2014, La Habana, Cuba. Ver http://uciencia.uci.cu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit 8bf22e7fe67b3321e2b2dcc8fb98882ef0eef4ca
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Mar 26 00:10:47 2014 +0100
related fdo#74981: add a unittest for kicks
Change-Id: I817948d053640b04dab8aaee85e914757b83cfa1
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 5aef75b..3b7cfcf 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -11,6 +11,7 @@
#include wrtsh.hxx
#include crsskip.hxx
#include shellio.hxx
+#include expfld.hxx
#include UndoManager.hxx
@@ -30,6 +31,7 @@ public:
void testExportRTF();
void testFdo75110();
void testFdo75898();
+void testFdo74981();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -40,6 +42,7 @@ public:
CPPUNIT_TEST(testExportRTF);
CPPUNIT_TEST(testFdo75110);
CPPUNIT_TEST(testFdo75898);
+CPPUNIT_TEST(testFdo74981);
CPPUNIT_TEST_SUITE_END();
private:
@@ -232,6 +235,32 @@ void SwUiWriterTest::testExportRTF()
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf(ccc));
}
+void SwUiWriterTest::testFdo74981()
+{
+// create a document with an input field
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+SwInputField aField((SwInputFieldType*)pWrtShell-GetFldType(0,
RES_INPUTFLD), OUString(foo), OUString(bar), 0, 0);
+pWrtShell-Insert(aField);
+
+// expect hints
+SwNodeIndex aIdx(pDoc-GetNodes().GetEndOfContent(), -1);
+SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
+CPPUNIT_ASSERT(pTxtNode-HasHints());
+
+// go to the begin of the paragraph and split this node
+pWrtShell-Left(CRSR_SKIP_CHARS, false, 100, false);
+pWrtShell-SplitNode();
+
+// expect only the second paragraph to have hints
+aIdx = SwNodeIndex(pDoc-GetNodes().GetEndOfContent(), -1);
+pTxtNode = aIdx.GetNode().GetTxtNode();
+CPPUNIT_ASSERT(pTxtNode-HasHints());
+aIdx--;
+pTxtNode = aIdx.GetNode().GetTxtNode();
+CPPUNIT_ASSERT(!pTxtNode-HasHints());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/tokenarray.hxx |2
sc/qa/unit/ucalc.hxx|2
sc/qa/unit/ucalc_formula.cxx| 80 +
sc/source/core/data/column.cxx | 15 +++-
sc/source/core/data/formulacell.cxx |2
sc/source/core/tool/token.cxx | 135
6 files changed, 190 insertions(+), 46 deletions(-)
New commits:
commit 003a27a14d5cf65fe0b528b6d6015e37a64dbb8e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Mar 25 22:34:18 2014 -0400
fdo#74322: Handle moving of named ranges correctly.
But named ranges are adjusted if and only if the references are absolute.
Change-Id: I6c5287b413884b045f1a798c6c6683aa17863f24
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index eb68997..e8b96cc 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -163,6 +163,8 @@ public:
*/
sc::RefUpdateResult AdjustReferenceInName( const sc::RefUpdateContext
rCxt, const ScAddress rPos );
+sc::RefUpdateResult AdjustReferenceInMovedName( const
sc::RefUpdateContext rCxt, const ScAddress rPos );
+
/**
* Adjust all references on sheet deletion.
*
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 5c196a0..e08766e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2537,8 +2537,21 @@ class UpdateRefOnNonCopy :
std::unary_functionFormulaGroup, void
bRecalcOnMove = aPos != aOldPos;
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnMove(*mpCxt,
aOldPos, aPos);
-if (aRes.mbReferenceModified || bRecalcOnMove)
+
+if (aRes.mbReferenceModified || aRes.mbNameModified || bRecalcOnMove)
{
+sc::AutoCalcSwitch(mpCxt-mrDoc, false);
+
+if (aRes.mbNameModified)
+{
+// We need to re-compile the token array when a range name is
+// modified, to correctly reflect the new references in the
+// name.
+ScCompiler aComp(mpCxt-mrDoc, aPos, *pCode);
+aComp.SetGrammar(mpCxt-mrDoc.GetGrammar());
+aComp.CompileTokenArray();
+}
+
// Perform end-listening, start-listening, and dirtying on all
// formula cells in the group.
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 320a2c2..b4b3ddf 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2833,7 +2833,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
{
// Update cell or range references.
sc::RefUpdateResult aRes = pCode-AdjustReferenceOnMove(rCxt, aOldPos,
aPos);
-bRefModified = aRes.mbReferenceModified;
+bRefModified = aRes.mbReferenceModified || aRes.mbNameModified;
bValChanged = aRes.mbValueChanged;
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f1982bd..e2a0fdb 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2634,6 +2634,19 @@ bool expandRangeByEdge( const sc::RefUpdateContext
rCxt, ScRange rRefRange, co
return false;
}
+bool isNameModified( const sc::UpdatedRangeNames rUpdatedNames, SCTAB
nOldTab, const formula::FormulaToken rToken )
+{
+if (rToken.GetOpCode() != ocName)
+return false;
+
+SCTAB nTab = -1;
+if (!rToken.IsGlobal())
+nTab = nOldTab;
+
+// Check if this named expression has been modified.
+return rUpdatedNames.isNameUpdated(nTab, rToken.GetIndex());
+}
+
}
sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const
sc::RefUpdateContext rCxt, const ScAddress rOldPos )
@@ -2772,17 +2785,8 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
break;
case svIndex:
{
-const formula::FormulaToken* pToken = *p;
-if (pToken-GetOpCode() == ocName)
-{
-SCTAB nTab = -1;
-if (!pToken-IsGlobal())
-nTab = rOldPos.Tab();
-
-// Check if this named expression has been modified.
-if (rCxt.maUpdatedNames.isNameUpdated(nTab,
pToken-GetIndex()))
-aRes.mbNameModified = true;
-}
+if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+aRes.mbNameModified = true;
}
break;
default:
@@ -2837,6 +2841,12 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
rRef.SetRange(aAbs, rNewPos);
}
break;
+case svIndex:
+{
+if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+aRes.mbNameModified = true;
+}
+break;
default:
[Libreoffice-commits] core.git: 10 commits - chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/source icon-themes/galaxy include/xmloff xmloff/source
chart2/Library_chartcontroller.mk|1 chart2/Library_chartcore.mk |3 chart2/source/chartcore.component|4 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx| 11 + chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |4 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx |4 chart2/source/controller/dialogs/Bitmaps.hrc | 11 - chart2/source/controller/dialogs/Bitmaps.src | 11 + chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx| 54 + chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx| 34 +++ chart2/source/controller/dialogs/Strings_ChartTypes.src |8 chart2/source/controller/dialogs/tp_ChartType.cxx| 11 + chart2/source/controller/dialogs/tp_ChartType.hxx|1 chart2/source/inc/Strings.hrc|8 chart2/source/inc/macros.hxx |2 chart2/source/inc/servicenames_charttypes.hxx|5 chart2/source/model/template/ChartTypeManager.cxx| 12 + chart2/source/model/template/ChartTypeTemplate.cxx |1 chart2/source/model/template/ChartTypeTemplate.hxx |4 chart2/source/model/template/GL3DBarChartType.cxx| 55 + chart2/source/model/template/GL3DBarChartType.hxx| 47 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx| 96 ++ chart2/source/model/template/GL3DBarChartTypeTemplate.hxx| 47 chart2/source/tools/DiagramHelper.cxx|2 chart2/source/view/charttypes/AreaChart.cxx |2 chart2/source/view/charttypes/GL3DBarChart.cxx | 29 +++ chart2/source/view/charttypes/GL3DBarChart.hxx | 30 +++ chart2/source/view/charttypes/VSeriesPlotter.cxx | 18 + chart2/source/view/main/PlotterBase.cxx |6 icon-themes/galaxy/chart2/res/gl3dbar_roundrect.png |binary icon-themes/galaxy/chart2/res/typegl3dbar_16.png |binary include/xmloff/xmltoken.hxx |1 xmloff/source/chart/SchXMLTools.cxx |8 xmloff/source/chart/SchXMLTools.hxx |1 xmloff/source/core/xmltoken.cxx |1 35 files changed, 514 insertions(+), 18 deletions(-) New commits: commit 86090ef2fb4ea06f687d9e4474b8bdfda6eb6871 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Mar 25 22:50:02 2014 -0400 Make the new OpenGL chart type a compile time option. And it's disabled for now. Change-Id: I9a513d757960b61e7b2d6009eabf97a75b6c453e diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 0a10bae..3a880ec 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -727,7 +727,9 @@ ChartTypeTabPage::ChartTypeTabPage(Window* pParent m_aChartTypeDialogControllerList.push_back(new StockChartDialogController() ); } m_aChartTypeDialogControllerList.push_back(new CombiColumnLineChartDialogController() ); +#if ENABLE_GL3D_BARCHART m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController()); +#endif ::std::vector ChartTypeDialogController* ::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); const ::std::vector ChartTypeDialogController* ::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index daf66c4..21e5911 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -30,6 +30,8 @@ typeid( ex ).name() , Message: \ ex.Message ) +#define ENABLE_GL3D_BARCHART 0 + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 44fc32edcddc7f290e3e5162be9a80917c499ade Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Mar 24 22:20:02 2014 -0400 Properly import and export the new chart type to and from ODF. Change-Id: I38e9813c6eb853dfb92b1537cea0b9ad97473b57 diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index dea17aa..c7eb4ef 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -91,6 +91,7 @@ enum eServiceType
[Libreoffice-commits] core.git: chart2/source
chart2/source/model/template/ChartTypeTemplate.cxx|1 +
chart2/source/model/template/ChartTypeTemplate.hxx|3 ++-
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx |5 +++--
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx |7 ---
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 975bbf29dfda6296b9f89958fe8c27af372150e7
Author: Tor Lillqvist t...@collabora.com
Date: Wed Mar 26 07:46:30 2014 +0200
Error: exception specification of overriding function is more lax than base
Change-Id: Iffcc2084e005b27653964ddc6e965744be370a16
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 6cc13bc..39b57c3 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -179,6 +179,7 @@ uno::Reference XDiagram SAL_CALL
ChartTypeTemplate::createDiagramByDataSource
}
sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories()
+throw (::css::uno::RuntimeException, ::std::exception)
{
return sal_True;
}
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx
b/chart2/source/model/template/ChartTypeTemplate.hxx
index 5f551b0..43a26b0 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -92,7 +92,8 @@ protected:
const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue aArguments )
throw (::com::sun::star::uno::RuntimeException, std::exception);
/// denotes if the chart needs categories at the first scale
-virtual sal_Bool SAL_CALL supportsCategories();
+virtual sal_Bool SAL_CALL supportsCategories()
+throw (::css::uno::RuntimeException, ::std::exception);
virtual void SAL_CALL changeDiagram(
const ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDiagram xDiagram )
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index c55..da5b8c1 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -49,8 +49,8 @@ uno::Referencechart2::XChartType
GL3DBarChartTypeTemplate::getChartTypeForInde
}
uno::Referencechart2::XChartType
-GL3DBarChartTypeTemplate::getChartTypeForNewSeries(
-const uno::Sequenceuno::Referencechart2::XChartType xOldChartTypes )
+GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const
uno::Sequenceuno::Referencechart2::XChartType xOldChartTypes )
+throw (::css::uno::RuntimeException, ::std::exception)
{
uno::Referencechart2::XChartType xResult;
@@ -77,6 +77,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries(
}
sal_Bool GL3DBarChartTypeTemplate::supportsCategories()
+throw (::css::uno::RuntimeException, ::std::exception)
{
return false;
}
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index 56aa220..4f4a0ce 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -34,10 +34,11 @@ public:
// XChartTypeTemplate
virtual css::uno::Referencecss::chart2::XChartType SAL_CALL
-getChartTypeForNewSeries(
-const
css::uno::Sequencecss::uno::Referencecss::chart2::XChartType
xOldChartTypes );
+getChartTypeForNewSeries( const
css::uno::Sequencecss::uno::Referencecss::chart2::XChartType
xOldChartTypes )
+throw (::css::uno::RuntimeException, ::std::exception);
-virtual sal_Bool SAL_CALL supportsCategories();
+virtual sal_Bool SAL_CALL supportsCategories()
+throw (::css::uno::RuntimeException, ::std::exception);
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 69461] SLIDESHOW: Inserted Movie files show a white screen for about one frame at the start
https://bugs.freedesktop.org/show_bug.cgi?id=69461 --- Comment #21 from NoWorries sbc_hates_s...@yahoo.com.au --- I am not sure what is meant by VLC Integration with LO Impress. I did remove all packages that related to VLC and tried to see if that removed the flash. It made no difference and the flash was still present. BTW VLC does not give any flash before the start of a video. Also, Avidemux shows no white frame before the start of a video as does LO Impress. If you need further proof of this problem, Sunday before last, I used my Laptop for Projection at a Church that I attend. The service was recorded and I could cut out the section where the problem is evident in the recording. -- 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 65606] Paste special not available
https://bugs.freedesktop.org/show_bug.cgi?id=65606 --- Comment #6 from sogart...@yahoo.com --- A little off topic. I have always thought graying out an action in a user interface is a bad idea. It is better to have the option available and if it can not be performed, it should give a message why. More than once I have just sat there and wonder why this option is disabled with absolutely no clue from the application. In that case probably this bug would have been easier to fix. -- 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 49853] EDITING: Attempting paste into find bar with Edit:Paste (or Cmd-V on OS X) pastes into document
https://bugs.freedesktop.org/show_bug.cgi?id=49853 nrarbeed...@dunflimblag.mailexpire.com changed: What|Removed |Added CC||nrarbeed...@dunflimblag.mai ||lexpire.com --- Comment #74 from nrarbeed...@dunflimblag.mailexpire.com --- Affects me too, LibreOffice 4.2.1.1 build ID d7dbbd7842e6a58b0f521599204e827654e1fb8b Mac OS X 10.9 Mavericks -- 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 72727] Chart: Label on X axis are lost when copying from Calc to Writer, Impress and Draw
https://bugs.freedesktop.org/show_bug.cgi?id=72727 Andras Timar tima...@gmail.com changed: What|Removed |Added CC||lio...@mamane.lu, ||tima...@gmail.com --- Comment #5 from Andras Timar tima...@gmail.com --- b090cbdf82e0827234caf5969124f6631311ef35 is the first bad commit commit b090cbdf82e0827234caf5969124f6631311ef35 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Aug 30 18:00:21 2013 +0200 fdo#68663 don't blindly force categories when there are none -- 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 69461] SLIDESHOW: Inserted Movie files show a white screen for about one frame at the start
https://bugs.freedesktop.org/show_bug.cgi?id=69461 --- Comment #22 from Alex Teichman alex.teichm...@gmail.com --- Hi, I just want to say that I really care about this issue too and have added what I can to the bounty opened by NoWorries. I've got an upcoming PhD defense that would be greatly improved by a fix... -- 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 72727] Chart: Label on X axis are lost when copying from Calc to Writer, Impress and Draw
https://bugs.freedesktop.org/show_bug.cgi?id=72727 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added CC||mst...@redhat.com --- Comment #6 from Lionel Elie Mamane lio...@mamane.lu --- As a point of additional data, this commit was discussed in thread starting at http://lists.freedesktop.org/archives/libreoffice/2013-August/08.html -- 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 48582] Numbering of headings not reliable
https://bugs.freedesktop.org/show_bug.cgi?id=48582 --- Comment #9 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- Sorry, I don't have that ott at hand, and you are right, for convenience I reused one document to create similar documents, and I was not able to reproduce with a more current version than the one originally reported against. So let us assume the problem is fixed in the meantime. If it re-appears, I'll reopen. -- 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 48582] Numbering of headings not reliable
https://bugs.freedesktop.org/show_bug.cgi?id=48582 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #10 from sophie gautier.sop...@gmail.com --- Hi Ulrich, Thanks for your feedback. I think your document get corrupted over time, may be when clearing it, you removed some formatting without noticing. For that sort of document, try to use an .ott, this way you make sure that you don't touch the structure of your document and start always with a clean one. Closing for now as worksforme - Sophie -- 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 76549] Other: Date shown with wrong day using different format
https://bugs.freedesktop.org/show_bug.cgi?id=76549 fsoltr...@libero.it changed: What|Removed |Added Status|RESOLVED|UNCONFIRMED Resolution|NOTABUG |--- --- Comment #2 from fsoltr...@libero.it --- I'm reopening this as I'm still not convinced this is a correct behaviour. I was aware that the issue is caused by some kind of accumulation of rounding error, but the problem in my opinion is in the way the date is rounded according the different format. Does it make sense to round a date/time in a different way if it also shows the time? In my opinion not. The day of a date should stay the same even if I am not showing the time. In effect I also think it doesn't make sense to round a date (at least not by default). This behaviour also silently break compatibility with excel. In fact I came across the problem trying to understand why I got inconsistent results while migrating an old xls file. -- 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 63087] Detective Trace Precedents or Trace Dependents pointing to a different tab does not provide reference cell
https://bugs.freedesktop.org/show_bug.cgi?id=63087 Jorendc jore...@libreoffice.org changed: What|Removed |Added Blocks|60270 | -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on|63087 | --- Comment #153 from Jorendc jore...@libreoffice.org --- (In reply to comment #152) Removed bug 63087 - was an enhancement request that does not belong on the list. done :) -- You are receiving this mail because: You are on the CC list for the bug. 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 76296] FILEOPEN: Upside Down ? at beginning when open MathML file
https://bugs.freedesktop.org/show_bug.cgi?id=76296 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|REOPENED|NEW -- 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 76561] EDITING: loimpress crashes when creating new presentation
https://bugs.freedesktop.org/show_bug.cgi?id=76561 Foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Foss f...@openmailbox.org --- Is this bug still valid / reproducible with the latest LO release? Currently 4.2.2: http://www.libreoffice.org/download/libreoffice-fresh/ Please also try resetting your user profile and let us know if that helps: https://wiki.documentfoundation.org/UserProfile Should this be still reproducible for you with the latest LO release please set this bug back to UNCONFIRMED. Should this issue be solved set it to WORKSFORME. Setting to NEEDINFO until more detail is provided. -- 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 76561] EDITING: loimpress crashes when creating new presentation
https://bugs.freedesktop.org/show_bug.cgi?id=76561 Foss f...@openmailbox.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #2 from Foss f...@openmailbox.org --- Actually worksforme since both 4.1.4.2 and 4.2.0.1 do work fine in Ubuntu 13.10 -- 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 76576] Fatal hang (50% CPU) when selecting line with keyboard - must kill soffice.bin to recover
https://bugs.freedesktop.org/show_bug.cgi?id=76576 Foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #6 from Foss f...@openmailbox.org --- NoRepro:4.2.2.1:OSX What windows is this? Could you try with 4.2.2.1? http://www.libreoffice.org/download/libreoffice-fresh/ Please also try resetting your user profile and let us know if that helps: https://wiki.documentfoundation.org/UserProfile Should this be still reproducible for you with the latest LO release please set this bug back to UNCONFIRMED. Should this issue be solved set it to WORKSFORME. Setting to NEEDINFO until more detail is provided. -- 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 76583] New: Floating table information is not preserved in RT file.
https://bugs.freedesktop.org/show_bug.cgi?id=76583 Priority: medium Bug ID: 76583 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Floating table information is not preserved in RT file. Severity: normal Classification: Unclassified OS: All Reporter: umesh.ka...@synerzip.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 96347 -- https://bugs.freedesktop.org/attachment.cgi?id=96347action=edit File has two tables one of which is floating. Issue Simulation: --- 1) Open the file in LO 2) Save as docx 3) Open the file in MSO Expected Behavior: --- The round-tripped file should be visually same as that of the original i.e all the information should be preserved. Observed Behavior: --- The floating table information is not preserved, due to which the tables in RT files appear to be merged. -- 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 68954] FILEOPEN: (CRASH?) FREEZE when trying to open particular odt file
https://bugs.freedesktop.org/show_bug.cgi?id=68954 --- Comment #15 from Hans-Gerhard Weinreich hg.weinre...@gmail.com --- The original freeze issue indeed seems to be fixed in master now: Cannot reproduce it anymore with build: aeab0183e86fe011d32058864c02b2de4da32dc9 TinderBox: Win-x86@39, Branch:master, Time: 2014-03-24_05:49:26 This is actually the first time that I see this document opened within LO. This was impossible before with any version. Julien: I was able to reproduce the scrolling-induced error by hectically scrolling up and down with the mouse wheel and cursor keys. I'm on Windows 7 and am getting the following popup error: --- Assertion failed! Program (...)\LibreOfficeDev 4\program\swlo.dll File: C:\cygwin\home\tinderbox\master\include\rtl\ustring.hxx Line 421 Expression: index = 0 static_castsal_uInt32(index) static_castsal_uInt32(getLength()) --- and if I click on Ignore: --- Assertion failed! Program (...)\LibreOfficeDev 4\URE\bin\sal3.dll File: C:\cygwin\home\tinderbox\master\sal\rtl\strtmpl.cxx Line: 1231 Expression: false --- If I click Ignore often enough LO doesn't even crash and I can proceed (until the error comes up again). Choosing Abort (obviously) or Retry crashes LO. -- 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 76576] Fatal hang (50% CPU) when selecting line with keyboard - must kill soffice.bin to recover
https://bugs.freedesktop.org/show_bug.cgi?id=76576 Foss f...@openmailbox.org changed: What|Removed |Added Severity|critical|normal -- 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 76333] Crashes on startup within com.apple.CoreText TCollection::CopyMatchingFontDescriptors
https://bugs.freedesktop.org/show_bug.cgi?id=76333 --- Comment #6 from Foss f...@openmailbox.org --- Hi, well which fonts are used in the file you are seeing the crash with? I've not seen such a crash yet on OSX 10.9.2. You are on a rather old 10.6.8. Also note new LO versions (64 bit) only run on OSX 10.8 and higher. Maybe there's some conflict between 64bit / 32 bit java and LO? Did you try LO 4.2.2.1 and see how that behaves? -- 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
