[Libreoffice-commits] core.git: 4 commits - vcl/opengl vcl/source
vcl/opengl/gdiimpl.cxx | 107 -
vcl/source/opengl/OpenGLHelper.cxx |6 +-
2 files changed, 64 insertions(+), 49 deletions(-)
New commits:
commit f7f0486376adbabf3ea66bfd8a7b692c335ec3c8
Author: Tomaž Vajngerl
Date: Fri Jul 3 14:38:24 2015 +0900
tdf#88831 fix inverted textures when OpenGL is enabled
GLX returns a wrong value if the y coords are inverted. Most other
programs don't even ask for this (gnome-shell for example) and just
assumes "true" (and this works because most relevant X servers work
like this). We make this more robust and assume true only if the
returned value is GLX_DONT_CARE (-1).
Change-Id: I4800b3364fd00f5f4a8f5a459472bfa8d97827ba
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 5663ccb..3ed6bdd 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -539,7 +539,11 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display*
pDisplay, bool& bInverted
}
glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_Y_INVERTED_EXT,
&nValue );
-bInverted = nValue == True;
+
+// Looks like that X sends GLX_DONT_CARE but this usually means "true"
for most
+// of the X implementations. Investigation on internet pointed that
this could be
+// safely "true" all the time (for example gnome-shell always assumes
"true").
+bInverted = nValue == True || nValue == int(GLX_DONT_CARE);
break;
}
commit 149e62670ed01f33612e841c8d17b6bd416e2d88
Author: Tomaž Vajngerl
Date: Tue Jun 30 18:07:41 2015 +0900
opengl: draw rectangle lines with only one glDrawArrays call
Change-Id: I33e065fe6c084d0bed04ee99c447004fe573278a
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 2526cde..f56dd4a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1195,13 +1195,24 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY,
long nWidth, long nHeigh
if( UseSolid( mnLineColor ) )
{
-const long nX1( nX );
-const long nY1( nY );
-const long nX2( nX + nWidth );
-const long nY2( nY + nHeight );
-const SalPoint aPoints[] = { { nX1, nY1 }, { nX2, nY1 },
- { nX2, nY2 }, { nX1, nY2 } };
-DrawLines( 4, aPoints, true ); // No need for AA.
+GLfloat fX1 = OPENGL_COORD_X(nX);
+GLfloat fY1 = OPENGL_COORD_Y(nY);
+GLfloat fX2 = OPENGL_COORD_X(nX + nWidth);
+GLfloat fY2 = OPENGL_COORD_Y(nY + nHeight);
+
+GLfloat pPoints[16];
+
+pPoints[0] = fX1;
+pPoints[1] = fY1;
+pPoints[2] = fX2;
+pPoints[3] = fY1;
+pPoints[4] = fX2;
+pPoints[5] = fY2;
+pPoints[6] = fX1;
+pPoints[7] = fY2;
+
+mpProgram->SetVertices(pPoints);
+glDrawArrays(GL_LINE_LOOP, 0, 4);
}
PostDraw();
commit 33d32a78943d19b0d06821ad1a06054f633f60fc
Author: Tomaž Vajngerl
Date: Tue Jun 30 18:03:34 2015 +0900
opengl: use common macro for conversion of coordinates
add macro OPENGL_COORD_X and OPENGL_COORD_Y to convert (normalize)
to opengl coordinates that need to be in between -1.0f, 1.0f.
Change-Id: Ide5c53e80fd9140d32883d44e6112b83a01fd111
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index e2512b6..2526cde 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,6 +36,9 @@
#include
+#define OPENGL_COORD_X(x) GLfloat((2.0 * double(x)) / GetWidth() - 1.0)
+#define OPENGL_COORD_Y(y) GLfloat(1.0 - (2.0 * double(y)) / GetHeight())
+
OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent,
SalGeometryProvider *pProvider)
: mpContext(0)
, mrParent(rParent)
@@ -450,8 +453,8 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
{
GLfloat pPoint[2];
-pPoint[0] = 2 * nX / GetWidth() - 1.0f;
-pPoint[1] = 1.0f - 2 * nY / GetHeight();
+pPoint[0] = OPENGL_COORD_X(nX);
+pPoint[1] = OPENGL_COORD_Y(nY);
mpProgram->SetVertices( pPoint );
glDrawArrays( GL_POINTS, 0, 1 );
@@ -463,10 +466,10 @@ void OpenGLSalGraphicsImpl::DrawLine( double nX1, double
nY1, double nX2, double
{
GLfloat pPoints[4];
-pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
-pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
-pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
-pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+pPoints[0] = OPENGL_COORD_X(nX1);
+pPoints[1] = OPENGL_COORD_Y(nY1);
+pPoints[2] = OPENGL_COORD_X(nX2);
+pPoints[3] = OPENGL_COORD_Y(nY2);
mpProgram->SetVertices( pPoints );
glDrawArrays( GL_LINES, 0, 2 );
@@ -483,10 +486,10 @@ void OpenGLSalGraphicsImpl::DrawLineAA( double nX1,
double nY1, double nX2, doub
{ // Horizontal/vertical, no need for AA, both points have normal color.
GLfloat pPoints[4];
-pPoints[0] = (2
[GSoC] Improved Error Checking - Weekly Report 5
Progress:- Pushed subformula check in formula wizard- Added more unit tests for unit feature (range conversion)- Checkbox and config option to toggle unit verification Goals:- Continue work on unit feature- Add subformula evaluation in formula wizard___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/icons/tango/lc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/tango/lc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/tango/lc_arrowshapes.down-arrow.png |binary librelogo/source/icons/tango/lc_arrowshapes.up-arrow.png |binary librelogo/source/icons/tango/lc_basicstop.png |binary librelogo/source/icons/tango/lc_editglossary.png |binary librelogo/source/icons/tango/lc_navigationbarleft.png |binary librelogo/source/icons/tango/lc_newdoc.png |binary librelogo/source/icons/tango/lc_runbasic.png |binary librelogo/source/icons/tango/sc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/tango/sc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/tango/sc_arrowshapes.down-arrow.png |binary librelogo/source/icons/tango/sc_arrowshapes.up-arrow.png |binary librelogo/source/icons/tango/sc_basicstop.png |binary librelogo/source/icons/tango/sc_editglossary.png |binary librelogo/source/icons/tango/sc_navigationbarleft.png |binary librelogo/source/icons/tango/sc_newdoc.png |binary librelogo/source/icons/tango/sc_runbasic.png |binary 18 files changed New commits: commit 9583020ae4d20c1cccbe5157f51512cbb5c5d494 Author: Adolfo Jayme Barrientos Date: Thu Jul 2 20:26:36 2015 -0500 Related: tdf#92287 Add LibreLogo Tango icons for future use Change-Id: I8d1767c64fcdf68084590c7faf869700e7b6ddf3 diff --git a/librelogo/source/icons/tango/lc_arrowshapes.circular-arrow.png b/librelogo/source/icons/tango/lc_arrowshapes.circular-arrow.png new file mode 100644 index 000..6de9c52 Binary files /dev/null and b/librelogo/source/icons/tango/lc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/tango/lc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/tango/lc_arrowshapes.circular-leftarrow.png new file mode 100644 index 000..6305b12 Binary files /dev/null and b/librelogo/source/icons/tango/lc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/tango/lc_arrowshapes.down-arrow.png b/librelogo/source/icons/tango/lc_arrowshapes.down-arrow.png new file mode 100644 index 000..fe21983 Binary files /dev/null and b/librelogo/source/icons/tango/lc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/tango/lc_arrowshapes.up-arrow.png b/librelogo/source/icons/tango/lc_arrowshapes.up-arrow.png new file mode 100644 index 000..5bba710 Binary files /dev/null and b/librelogo/source/icons/tango/lc_arrowshapes.up-arrow.png differ diff --git a/librelogo/source/icons/tango/lc_basicstop.png b/librelogo/source/icons/tango/lc_basicstop.png new file mode 100644 index 000..12c34fe Binary files /dev/null and b/librelogo/source/icons/tango/lc_basicstop.png differ diff --git a/librelogo/source/icons/tango/lc_editglossary.png b/librelogo/source/icons/tango/lc_editglossary.png new file mode 100644 index 000..635fb13 Binary files /dev/null and b/librelogo/source/icons/tango/lc_editglossary.png differ diff --git a/librelogo/source/icons/tango/lc_navigationbarleft.png b/librelogo/source/icons/tango/lc_navigationbarleft.png new file mode 100644 index 000..b43e4b3 Binary files /dev/null and b/librelogo/source/icons/tango/lc_navigationbarleft.png differ diff --git a/librelogo/source/icons/tango/lc_newdoc.png b/librelogo/source/icons/tango/lc_newdoc.png new file mode 100644 index 000..85651cb Binary files /dev/null and b/librelogo/source/icons/tango/lc_newdoc.png differ diff --git a/librelogo/source/icons/tango/lc_runbasic.png b/librelogo/source/icons/tango/lc_runbasic.png new file mode 100644 index 000..b7f6df0 Binary files /dev/null and b/librelogo/source/icons/tango/lc_runbasic.png differ diff --git a/librelogo/source/icons/tango/sc_arrowshapes.circular-arrow.png b/librelogo/source/icons/tango/sc_arrowshapes.circular-arrow.png new file mode 100644 index 000..bf3b741 Binary files /dev/null and b/librelogo/source/icons/tango/sc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/tango/sc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/tango/sc_arrowshapes.circular-leftarrow.png new file mode 100644 index 000..1c90e6c Binary files /dev/null and b/librelogo/source/icons/tango/sc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/tango/sc_arrowshapes.down-arrow.png b/librelogo/source/icons/tango/sc_arrowshapes.down-arrow.png new file mode 100644 index 000..4a3a3c3 Binary files /dev/null and b/librelogo/source/icons/tango/sc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/tango/sc_arrowshapes.up-arrow.png b/librelogo/source/icons/tango/sc_arrowshapes.up-arrow.png new file mode 100644 index 000..363fe66
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_fillcolor.png |binary icon-themes/sifr/cmd/lc_insertbookmark.png |binary icon-themes/sifr/cmd/sc_fillcolor.png |binary icon-themes/sifr/cmd/sc_insertbookmark.png |binary 4 files changed New commits: commit 8b788891796ff0571f779cdbe8ce809c35c42754 Author: Matthias Freund Date: Thu Jul 2 23:08:57 2015 +0200 tdf#75256 Sifr - Adding new fillcolor icon and modified insertbookmark I took the insertbookmark icon from the gnome symbolic set and tweaked it a bit and it is now flat instead of pseudo 3d. Change-Id: Id29f3c15515def2f461d8ea45aca427594f290bc Reviewed-on: https://gerrit.libreoffice.org/16717 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/sifr/cmd/lc_fillcolor.png b/icon-themes/sifr/cmd/lc_fillcolor.png new file mode 100644 index 000..ce0e536 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_fillcolor.png differ diff --git a/icon-themes/sifr/cmd/lc_insertbookmark.png b/icon-themes/sifr/cmd/lc_insertbookmark.png index 6bb2f34..8c43273 100644 Binary files a/icon-themes/sifr/cmd/lc_insertbookmark.png and b/icon-themes/sifr/cmd/lc_insertbookmark.png differ diff --git a/icon-themes/sifr/cmd/sc_fillcolor.png b/icon-themes/sifr/cmd/sc_fillcolor.png new file mode 100644 index 000..3ffe778 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_fillcolor.png differ diff --git a/icon-themes/sifr/cmd/sc_insertbookmark.png b/icon-themes/sifr/cmd/sc_insertbookmark.png new file mode 100644 index 000..9165f1c Binary files /dev/null and b/icon-themes/sifr/cmd/sc_insertbookmark.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 90794] Fix the Linux HiDPI start screen
https://bugs.documentfoundation.org/show_bug.cgi?id=90794 Keith Curtis changed: What|Removed |Added Whiteboard||EasyHack ||DifficultyInteresting ||SkillCpp TopicUI --- Comment #3 from Keith Curtis --- This is also a problem on Windows, but that involves different code, and a different OS to build and test. A new person might not have all that. If someone can build on Linux and Windows, they would be a good candidate to fix both. The Windows change is probably easier. -- 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
[Bug 90792] Enable toolbar code to load HiDPI bitmaps
https://bugs.documentfoundation.org/show_bug.cgi?id=90792 Keith Curtis changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 Whiteboard||EasyHack ||DifficultyInteresting ||SkillCpp TopicUI -- 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
[Bug 90793] Fix the HiDPI wave underline character property
https://bugs.documentfoundation.org/show_bug.cgi?id=90793 Keith Curtis changed: What|Removed |Added Whiteboard||EasyHack ||DifficultyInteresting ||SkillCpp TopicUI -- 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
[Bug 90795] Fix the hyperlink dialog box for HiDPI
https://bugs.documentfoundation.org/show_bug.cgi?id=90795 Keith Curtis changed: What|Removed |Added Whiteboard||EasyHack ||DifficultyInteresting ||SkillCpp TopicUI -- 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
Minutes of the Design Hangout: 2015-07-01
* Present: Heiko, Jay, Marek, Mattias, Kendy, Steve * UI changes integrated the last week: + Many new and updated Breeze, Galaxy and Sifr icons (Andreas) + Sifr improvements (Matthias) + Improve chart formatting toolbar (Jay) + Better linting of .ui files (Rosemary) + Darker background for master view (Bubli) + Move away accidental tango_testing icons (Andreas) + Hide master slide button in the toolbar (Jay) + Minor fixes to the reorganized menus (Jay) + Improved sidebar selection analyser for Calc and Draw/Impress (Rishab) + New colors for the startcenter (Kendy) * LibreOffice Conference + September 23-25, 2015, Aarhus, Denmark + http://conference.libreoffice.org/2015/call-for-papers/ + would be great to have you all there :-) - please submit a paper! * Icon Updates / Issues (Jay) + Breeze icons appearing in Sifr navigator (Jay) https://bugs.documentfoundation.org/show_bug.cgi?id=91379 screenshot 4.4 vs 5.0 - https://vm150.documentfoundation.org/attachment.cgi?id=115723 + found, commented in the bug (Kendy) + Icons to push into 5.0 if not already pushed (Jay) http://cgit.freedesktop.org/libreoffice/core/commit/?id=ff06895b3e3a664c2238e358c02ae5b755e2ce06 + https://gerrit.libreoffice.org/#/c/16635/ seems not to be in libreoffice-5-0 + cherry-picked that as https://gerrit.libreoffice.org/#/c/1/ + Limit to making changes to icons in 5.0 (Jay) https://gerrit.libreoffice.org/#/c/16542/ Adolfo and Norbert have diffferent opinion on this + the problem is that the tango_testing icons shouldn't have been there in the first place (Jay) + change is in a theme that is not default on any platform (Kendy) + not affecting any documentation etc. + and are fixes - improves at least the fallback for now + Andreas woring on the real Sifr icons there - to be pushed later + in general - for large changes that affect very visible areas, they need to be synced with ESC / triple-reviewed + but for normal / small fixes, the usual rules apply (1 review is enough until the last RC) + Tango (Alex/Adolfo/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing + Sifr (Papamatti/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing + Papamatti has pushed new icons (Jay) + Andreas will create new chart icons (Jay) + Breeze (Andreas/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing + Andreas has pushed some changes (Jay) + Extra-Large (32x32) Icons for large resolutions + Status - https://docs.google.com/document/d/1mPqD2gGsMkfVCI6ByUd2XYX1NJm26hcGjRVe6gcCSEU/edit?usp=sharing * Templates Competition (Jay) + Wiki page setup https://wiki.documentfoundation.org/Design/Whiteboards/Templates_for_LibreOffice_5.0 + 5 templates submitted so far + 1st round of review the next meeting, please check beforehand :-) * LibreOffice 5.0 splash + start center + about box new theme (Kendy) + vote is ongoing in the Visual Identity group + results will be tomorrow, then finalized for the next RC + implementation of the new colors for the start center ongoing (Kendy) + https://bugs.documentfoundation.org/show_bug.cgi?id=90452#c45 * UI Guidelines (Heiko) + https://docs.google.com/document/d/1hSYOFoG6jnj2G0zWDbUYkrGZoj7YCSI9j3onkTZ65bU/edit + have written the sidebar discussion + some replies on that (Heiko) + discussion of the replios (Heiko/Jay) + accepted / commented the changes + will publish tomorrow (Heiko) + next steps: dialogs * Next Friday's design session (Jay) + Friday session this week + dialogs are next + 1:00pm CEST / 11:00 UTC + List of possible future topics + https://docs.google.com/document/d/1XiJauFHrSmM5LsaV0AlglhfUh8D1IxAg8qistP0KAQA/edit?usp=sharing + Steve wants the sidebar "configuration menu" icon gone: "it's useless confusing, thus user unfriendly, creates frustration and clutters the UI." https://bugs.documentfoundation.org/show_bug.cgi?id=91824 * Changing the gradient toolbars to single color on Mac (Jay) + https://bugs.documentfoundation.org/show_bug.cgi?id=92359 https://vm150.documentfoundation.org/attachment.cgi?id=116924 + hard to do it without a physical access to a mac :-( (Kendy) + https://imgur.com/U8Gfqi6,lXXO7sb,P9bGLkv (steve) + Office 2016 - http://core0.staticworld.net/images/article/2015/03/excel-10057170
Re: Adding Languages to Writer's Character, Font Menu
On Wed, 24 Jun 2015 23:40:10 +0200 Michael Stahl wrote: > On 24.06.2015 23:26, toki wrote: > > That is part of the reason why I think the whole Western/CJKV/CTL > > split should be thrown out, and replaced with language/writing > > system, supplemented by locale data. > that's a great idea in theory, unfortunately it would throw out any > hope of compatibility with Microsoft Office as well How does one achieve compatibility with per script font-selection as shown in http://blogs.msdn.com/b/officeinteroperability/archive/2013/04/22/office-open-xml-themes-schemes-and-fonts.aspx ? For that matter, how does the current scheme square with a style having separate fonts for ASCII and other Latin characters - the *four*-way split ASCII / 'High ANSI' / Complex Script / East Asian? Richard. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - pyuno/Package_python_shell.mk
pyuno/Package_python_shell.mk |4 1 file changed, 4 insertions(+) New commits: commit 8627fc9c64146beded06be9fbf44a81ad785a364 Author: Andras Timar Date: Thu Jul 2 16:26:50 2015 +0200 put python starter shell script to Resources folder of OS X app Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830 diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index e8c3fa6..f75cda3 100644 --- a/pyuno/Package_python_shell.mk +++ b/pyuno/Package_python_shell.mk @@ -9,6 +9,10 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell))) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh)) +else $(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh)) +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 4 commits - include/unotools sc/source svtools/source svx/source sw/source unotools/source
include/unotools/securityoptions.hxx |2
sc/source/filter/xml/xmlimprt.cxx | 10 ++
sc/source/ui/docshell/docsh4.cxx | 18 +++-
svtools/source/java/javainteractionhandler.cxx|2
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 21 +++-
sw/source/core/doc/docnew.cxx | 10 ++
sw/source/core/uibase/app/docsh.cxx |6 +
sw/source/filter/xml/xmlimp.cxx | 78 +-
unotools/source/config/securityoptions.cxx|8 +
9 files changed, 104 insertions(+), 51 deletions(-)
New commits:
commit c1c3c282be11bb383bd3d5401bf9397f18add48a
Author: Stephan Bergmann
Date: Tue Jun 23 08:26:36 2015 +0200
LinkUpdateMode is a global setting
(cherry picked from commit 77cc71476bae2b3655102e2c29d36af40a393201)
Conflicts:
sw/source/core/doc/DocumentLinksAdministrationManager.cxx
sw/source/filter/xml/xmlimp.cxx
Change-Id: Ida1257337c6e0916f2228fe053d9c9f085183af6
Reviewed-on: https://gerrit.libreoffice.org/16422
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/include/unotools/securityoptions.hxx
b/include/unotools/securityoptions.hxx
index 3bd8807..77e4720 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -186,6 +186,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions
: public utl::detail
*/
bool isTrustedLocationUri(OUString const & uri) const;
+bool isTrustedLocationUriForUpdatingLinks(OUString const & uri) const;
+
::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors
( ) const;
voidSetTrustedAuthors
( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors);
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index a3fb7d5..bf1beeb 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2630,6 +2630,9 @@ void ScXMLImport::SetConfigurationSettings(const
uno::Sequence aFilteredProps(
+aConfigProps.getLength());
+sal_Int32 nFilteredPropsLen = 0;
for (sal_Int32 i = nCount - 1; i >= 0; --i)
{
if (aConfigProps[i].Name == sCTName)
@@ -2664,11 +2667,16 @@ void ScXMLImport::SetConfigurationSettings(const
uno::SequencesetPropertyValue(
aConfigProps[i].Name, aConfigProps[i].Value );
}
}
+if (aConfigProps[i].Name != "LinkUpdateMode")
+{
+aFilteredProps[nFilteredPropsLen++] = aConfigProps[i];
+}
}
+aFilteredProps.realloc(nFilteredPropsLen);
uno::Reference xInterface =
xMultiServiceFactory->createInstance("com.sun.star.comp.SpreadsheetSettings");
uno::Reference xProperties(xInterface,
uno::UNO_QUERY);
if (xProperties.is())
-SvXMLUnitConverter::convertPropertySet(xProperties,
aConfigProps);
+SvXMLUnitConverter::convertPropertySet(xProperties,
aFilteredProps);
}
}
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 13855e6..3961186 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -48,6 +48,7 @@ using namespace ::com::sun::star;
#include
#include
#include
+#include
#include
#include "docuno.hxx"
@@ -423,12 +424,23 @@ void ScDocShell::Execute( SfxRequest& rReq )
if (nCanUpdate ==
com::sun::star::document::UpdateDocMode::NO_UPDATE)
nSet = LM_NEVER;
-else if (nCanUpdate ==
com::sun::star::document::UpdateDocMode::QUIET_UPDATE &&
-nSet == LM_ON_DEMAND)
-nSet = LM_NEVER;
else if (nCanUpdate ==
com::sun::star::document::UpdateDocMode::FULL_UPDATE)
nSet = LM_ALWAYS;
+if (nSet == LM_ALWAYS
+&& !(SvtSecurityOptions()
+ .isTrustedLocationUriForUpdatingLinks(
+ GetMedium() == nullptr
+ ? OUString() : GetMedium()->GetName(
+{
+nSet = LM_ON_DEMAND;
+}
+if (nCanUpdate == css::document::UpdateDocMode::QUIET_UPDATE
+&& nSet == LM_ON_DEMAND)
+{
+nSet = LM_NEVER;
+}
+
if(nSet==LM_ON_DEMAND)
{
QueryBox aBox( GetActiveDialogParent(), WinBits(WB_YES_NO
| WB_DEF_YES),
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index d42dd9f..86447aa 100644
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter.cxx | 48 +
1 file changed, 48 insertions(+)
New commits:
commit f8db2d7533785b89a149e7879d7a3c1909d41e6b
Author: Varun
Date: Thu Jul 2 16:06:41 2015 +0530
Add test for tdf#90808 duplicate CrossRefBookmarks
Change-Id: I4aad0cbb07c07cfcb80bccbbd55d9a26fae88f73
Reviewed-on: https://gerrit.libreoffice.org/16689
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0339860..6138ed2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -54,6 +54,7 @@
#include "com/sun/star/util/SearchAlgorithms.hpp"
#include "com/sun/star/i18n/TransliterationModulesExtra.hpp"
#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/text/XParagraphCursor.hpp"
#include
static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
@@ -101,6 +102,7 @@ public:
void testTdf69282();
void testTdf69282WithMirror();
void testSearchWithTransliterate();
+void testTdf90808();
void testTdf75137();
void testTdf83798();
void testTableBackgroundColor();
@@ -150,6 +152,7 @@ public:
CPPUNIT_TEST(testTdf69282);
CPPUNIT_TEST(testTdf69282WithMirror);
CPPUNIT_TEST(testSearchWithTransliterate);
+CPPUNIT_TEST(testTdf90808);
CPPUNIT_TEST(testTdf75137);
CPPUNIT_TEST(testTdf83798);
CPPUNIT_TEST(testTableBackgroundColor);
@@ -1180,6 +1183,51 @@ void SwUiWriterTest::testSearchWithTransliterate()
CPPUNIT_ASSERT_EQUAL(1,(int)case2);
}
+void SwUiWriterTest::testTdf90808()
+{
+createDoc();
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference xTextRange(xTextDocument->getText(),
uno::UNO_QUERY);
+uno::Reference xText(xTextRange->getText(), uno::UNO_QUERY);
+uno::Reference xCrsr(xText->createTextCursor(),
uno::UNO_QUERY);
+//inserting text into document so that the paragraph is not empty
+xText->setString(OUString("Hello World!"));
+uno::Reference xFact(mxComponent,
uno::UNO_QUERY);
+//creating bookmark 1
+uno::Reference
type1bookmark1(xFact->createInstance("com.sun.star.text.Bookmark"),
uno::UNO_QUERY);
+uno::Reference xName1(type1bookmark1, uno::UNO_QUERY);
+xName1->setName("__RefHeading__1");
+//moving cursor to the starting of paragraph
+xCrsr->gotoStartOfParagraph(false);
+//inserting the bookmark in paragraph
+xText->insertTextContent(xCrsr, type1bookmark1, true);
+//creating bookmark 2
+uno::Reference
type1bookmark2(xFact->createInstance("com.sun.star.text.Bookmark"),
uno::UNO_QUERY);
+uno::Reference xName2(type1bookmark2, uno::UNO_QUERY);
+xName2->setName("__RefHeading__2");
+//inserting the bookmark in same paragraph, at the end
+//only one bookmark of this type is allowed in each paragraph an exception
of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the
other bookmark in same paragraph
+xCrsr->gotoEndOfParagraph(true);
+CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, type1bookmark2,
true), com::sun::star::lang::IllegalArgumentException);
+//now testing for __RefNumPara__
+//creating bookmark 1
+uno::Reference
type2bookmark1(xFact->createInstance("com.sun.star.text.Bookmark"),
uno::UNO_QUERY);
+uno::Reference xName3(type2bookmark1, uno::UNO_QUERY);
+xName3->setName("__RefNumPara__1");
+//moving cursor to the starting of paragraph
+xCrsr->gotoStartOfParagraph(false);
+//inserting the bookmark in paragraph
+xText->insertTextContent(xCrsr, type2bookmark1, true);
+//creating bookmark 2
+uno::Reference
type2bookmark2(xFact->createInstance("com.sun.star.text.Bookmark"),
uno::UNO_QUERY);
+uno::Reference xName4(type2bookmark2, uno::UNO_QUERY);
+xName4->setName("__RefNumPara__2");
+//inserting the bookmark in same paragraph, at the end
+//only one bookmark of this type is allowed in each paragraph an exception
of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the
other bookmark in same paragraph
+xCrsr->gotoEndOfParagraph(true);
+CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, type2bookmark2,
true), com::sun::star::lang::IllegalArgumentException);
+}
+
void SwUiWriterTest::testTdf75137()
{
SwDoc* pDoc = createDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source vcl/unx
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 12 ++--
vcl/unx/gtk/window/gtksalframe.cxx | 12 ++--
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 6f4c31eb757cd19311b23ce06fdbbe9268f9cd16
Author: Justin Luth
Date: Wed Jul 1 07:20:53 2015 +0300
tdf#91641 adjust cursor when deleting preceding characters
IMDeleteSurrounding is used by input methods to take multiple
keystrokes and convert them into a special character. Then the
composing keystrokes are removed.
Before this fix, the cursor placement was not adjusted,
so the special character was inserted in the wrong position
and if 3+ keystrokes were involved, the wrong characters were deleted.
Also fixes "editLine should have focus on accessibleText init."
The first time an accessibleEdit is created, it didnt recognize any
focused text when editing in the "Input Line".
Change-Id: Ib2608c46bba1c84bb49aa29619a004c125a3bf98
Reviewed-on: https://gerrit.libreoffice.org/16637
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 0020a70..9910499 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -372,13 +372,21 @@ void ScAccessibleEditObject::CreateTextHelper()
::std::unique_ptr< SvxEditSource > pEditSource (new
ScAccessibilityEditSource(std::move(pAccessibleTextData)));
mpTextHelper = new
::accessibility::AccessibleTextHelper(std::move(pEditSource));
mpTextHelper->SetEventSource(this);
-mpTextHelper->SetFocus(mbHasFocus);
+
+const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
+if ( pInputHdl && pInputHdl->IsEditMode() )
+{
+mpTextHelper->SetFocus(true);
+}
+else
+{
+mpTextHelper->SetFocus(mbHasFocus);
+}
// #i54814# activate cell in edit mode
if( meObjectType == CellInEditMode )
{
// do not activate cell object, if top edit line is active
-const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
if( pInputHdl && !pInputHdl->IsTopMode() )
{
SdrHint aHint( HINT_BEGEDIT );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 9a2397b..6421c0c 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -4462,7 +4462,7 @@ gboolean
GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
uno::Reference xText =
lcl_GetxText(pFocusWin);
if (xText.is())
{
-sal_uInt32 nPosition = xText->getCaretPosition();
+sal_Int32 nPosition = xText->getCaretPosition();
OUString sAllText = xText->getText();
OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
OUString sCursorText(sAllText.copy(0, nPosition));
@@ -4484,7 +4484,7 @@ gboolean
GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
uno::Reference xText =
lcl_GetxText(pFocusWin);
if (xText.is())
{
-sal_uInt32 nPosition = xText->getCaretPosition();
+sal_Int32 nPosition = xText->getCaretPosition();
// #i111768# range checking
sal_Int32 nDeletePos = nPosition + offset;
sal_Int32 nDeleteEnd = nDeletePos + nchars;
@@ -4496,6 +4496,14 @@ gboolean
GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
nDeleteEnd = xText->getCharacterCount();
xText->deleteText(nDeletePos, nDeleteEnd);
+//tdf91641 adjust cursor if deleted chars shift it forward (normal
case)
+if (nDeletePos < nPosition)
+{
+if (nDeleteEnd <= nPosition)
+xText->setCaretPosition( nPosition-(nDeleteEnd-nDeletePos) );
+else
+xText->setCaretPosition( nDeletePos );
+}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |3 +++
sc/source/ui/inc/checklistmenu.hxx |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 50b93a183bcdd9981a740a92cd5cc6be77be1973
Author: Michael Meeks
Date: Wed Jul 1 17:46:05 2015 +0100
tdf#92262 - fixup shared_ptr -> VclPtr issue.
Change-Id: Ia0b22e62001cff4a63ea197b77aebb1759f73122
Reviewed-on: https://gerrit.libreoffice.org/16664
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/16684
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index bbbed33..b4dc71b 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -100,6 +100,8 @@ ScMenuFloatingWindow::~ScMenuFloatingWindow()
void ScMenuFloatingWindow::dispose()
{
EndPopupMode();
+for (auto i = maMenuItems.begin(); i != maMenuItems.end(); ++i)
+i->mpSubMenuWin.disposeAndClear();
mpParentMenu.clear();
PopupMenuFloatingWindow::dispose();
}
@@ -919,6 +921,7 @@ void ScCheckListMenuWindow::dispose()
maBtnUnselectSingle.disposeAndClear();
maBtnOk.disposeAndClear();
maBtnCancel.disposeAndClear();
+maTabStopCtrls.clear();
ScMenuFloatingWindow::dispose();
}
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 26732c9..f4e714a 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -147,8 +147,8 @@ private:
struct MenuItemData
{
OUString maText;
-boolmbEnabled:1;
-boolmbSeparator:1;
+bool mbEnabled:1;
+bool mbSeparator:1;
::boost::shared_ptr mpAction;
VclPtr mpSubMenuWin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dbaccess/source svtools/source
dbaccess/source/ui/querydesign/TableWindowAccess.cxx |4 ++--
dbaccess/source/ui/relationdesign/RelationDesignView.cxx |2 +-
svtools/source/contnr/treelistbox.cxx|3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 88b06253359dfa91242757ceb39d7276786a0587
Author: Michael Meeks
Date: Wed Jul 1 21:22:34 2015 +0100
tdf#92434 - A series of hideous knock-on dbaccess crasher fixes.
Focus events during dispose, unfortunate incoming a11y events, etc.
Change-Id: Iee296b767839904f5f330786891bc2513ca06c0c
Reviewed-on: https://gerrit.libreoffice.org/16672
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/16686
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 82580fc..eb1941a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -105,7 +105,7 @@ namespace dbaui
{
::osl::MutexGuard aGuard( m_aMutex );
Reference< XAccessible > aRet;
-if(m_pTable)
+if(m_pTable && !m_pTable->IsDisposed())
{
switch(i)
{
@@ -151,7 +151,7 @@ namespace dbaui
{
::osl::MutexGuard aGuard( m_aMutex );
Reference< XAccessible > aRet;
-if( m_pTable )
+if(m_pTable && !m_pTable->IsDisposed())
{
Point aPoint(_aPoint.X,_aPoint.Y);
Rectangle aRect(m_pTable->GetDesktopRectPixel());
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 72e75de..5e7f370 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -69,7 +69,7 @@ bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
bool nDone = false;
if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
{
-if(!m_pTableView->HasChildPathFocus())
+if(m_pTableView && !m_pTableView->HasChildPathFocus())
{
m_pTableView->GrabTabWinFocus();
nDone = true;
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index 8346639..c418956 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -444,7 +444,8 @@ VCL_BUILDER_DECL_FACTORY(SvTreeListBox)
void SvTreeListBox::Clear()
{
-pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared()
+if (pModel)
+pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared()
}
void SvTreeListBox::EnableEntryMnemonics( bool _bEnable )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dbaccess/source
dbaccess/source/ui/querydesign/JoinTableView.cxx | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit f5721a9de60f614519be383fec2c97b2dd19b289
Author: Michael Meeks
Date: Wed Jul 1 19:03:55 2015 +0100
tdf#92434 - fix iteration, and remember to disposeAndClear.
Change-Id: Id9c7b33689ea51a18394a96acbb9c08d67992942
Reviewed-on: https://gerrit.libreoffice.org/16671
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/16685
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 571067e..7beabaf 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -246,7 +246,7 @@ sal_uLong OJoinTableView::GetTabWinCount()
return m_aTableMap.size();
}
-bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,bool _bDelete )
+bool OJoinTableView::RemoveConnection( OTableConnection* _pConn, bool _bDelete
)
{
DeselectConn(_pConn);
@@ -255,8 +255,12 @@ bool OJoinTableView::RemoveConnection( OTableConnection*
_pConn,bool _bDelete )
m_pView->getController().removeConnectionData( _pConn->GetData() );
-m_vTableConnection.erase(
-
::std::find(m_vTableConnection.begin(),m_vTableConnection.end(),_pConn) );
+auto it =
::std::find(m_vTableConnection.begin(),m_vTableConnection.end(),_pConn);
+if (it != m_vTableConnection.end())
+{
+it->disposeAndClear();
+m_vTableConnection.erase( it );
+}
modified();
if ( m_pAccessible )
@@ -983,10 +987,13 @@ void OJoinTableView::ClearAll()
HideTabWins();
// and the same with the Connections
-auto aIter = m_vTableConnection.begin();
-auto aEnd = m_vTableConnection.end();
-for(;aIter != aEnd;++aIter)
-RemoveConnection( *aIter ,true);
+while(true)
+{
+auto aIter = m_vTableConnection.begin();
+if (aIter == m_vTableConnection.end())
+break;
+RemoveConnection(*aIter, true);
+}
m_vTableConnection.clear();
m_pLastFocusTabWin = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/app/i18n_ic.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 897694d2bd499a42bf8df2cffa8fee4fb1841917
Author: Andrea Gelmini
Date: Wed Jul 1 14:52:53 2015 +0200
Translation from Latin
"Noli me tangere" literally means "don't touch me"
Change-Id: I7804030703ab78b3dd8899e6479005eaaffae554
Reviewed-on: https://gerrit.libreoffice.org/16704
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index c96b5ad..875be09 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -412,7 +412,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
void
SalI18N_InputContext::HandleDestroyIM()
{
-maContext = 0; // noli me tangere
+maContext = 0; // don't change
mbUseable = False;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present + Sophie, Lionel, Thorsten, Stephan, Kendy, Andras, Miklos, Robinson, Christian, Norbert, Bjoern, Muthu, Noel, Michael S, Michael M * Completed Action Items: + mail projects list wrt. 5.0 branding with un-ignorable subject (Kendy) + drop regression / tendering ideas into the wiki & poke authors (Michael) [ each needs a v. rough cost / estimate ] + dig out documentation on compiling SDK examples -> odk/README (Stephan) [ in the README: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c30d8bbb8a0b3682160252ee065befabf613a7b ] + poke GSOC student(s) to encourage them to be on IRC (Thorsten) [ mostly are there ] + file conference papers [!] (All) + http://conference.libreoffice.org/2015/call-for-papers/ + Regressions : why, what, extermination (Michael) + 10x minute how-to-write-a-Clang-plugin-for-beginners (Stephan) + C++-14 (Stephan) + and another one. + Coverity / Import / Export crashers (Caolan) + GTK3 Port (Caolan) * Pending Action Items: + file conference papers [!] (All) + please submit abstracts: + http://conference.libreoffice.org/2015/call-for-papers/ + Android editing (Miklos/Tomaz) + Rendercontext foo (Kendy) + some beginner oriented stuff & website infra (Cloph) + Release Engineering / freeze overview (Bjoern) + From extensions to core: how ti works (Bjoern) + Ace of Base (Lionel) + Calc somethings (Eike) + ODF / TC bits (Andras) + test win64 / thunderbird / mork integration (Robinson) [ issues with testing, being unable to connect no SDBC driver was found for the url sdbc://thunderbird ... AI: Sophie writing a MozTap test-case ] + re-arrange the help XML for the menu changes (Jay) [ still pending - now finished impress & will begin on this AI: encourage help fixing (Kendy)] + snapshot & check-in help authoring extension to dev-tools (Kendy) [ still not yet ] + UserAgent - drop bundled-languages (Michael) + UserAgent - produce a patch for review (Michael) + review ongoing pootle maintenance funding arrangements (Floeff) * Release Engineering update (Christian) + many of the bugs reported & discussed on lists fixed. + 4.4.4 status + 4.4.5 - July 6th next deadline - Mon/Tues. + 5.0.0 - RC3 lots better next week: Thur/Fri. + Major bugs + Java not working without the old VS2010 MSVC runtime (Cloph on it) + https://bugs.documentfoundation.org/show_bug.cgi?id=92483 + presenter console - not visible on any platform (Cloph+Michael) + https://bugs.documentfoundation.org/show_bug.cgi?id=91574 + menus disappearing -> some loop, fixed on master not -5-0 + Miklos to back-port. + non-common a11y code-paths from gtk3 on master in base fixed (Michael) + PDF export Mac (Norbert) + the DX-array bits don't work; so PDF appears not to be justified + fairly visible / annoying; fixed it 9k patches ago, forward porting that fix makes that break again + want it in before RC3 + https://bugs.documentfoundation.org/show_bug.cgi?id=88941 + 5.0 branch just needs a single extra review until RC3 + heavy-duty tripple-review process & branch: Jul 6th - 2nd week July. + Late Feature Status (Michael) + LibreOfficeKit / Online tweaks (Kendy) + nothing affecting the core. + OpenGL / double-buffer RenderContext (Michael) + steady stream of fixes left/right. + OpenGL by default not achievable for 5.0.0 + propose re-visit @ ESC for 5.0.1 for some H/W on Windows. + gtk3+ (Caolan) + gtk3 won't affect anything TDF ships for 5.0 + Win64 + JRE issue, cloph found a fix. + 5.0 splash / startcenter graphics / about dialog (Kendy?) + pushed changes implementing new (grey) color scheme to master. + pending review in gerrit. + implemented universally; colors can be changed back. + all configurable in the user-profile. + green is one setting away. + Graphics itself: + mostly finalized the splash. + do marketing know (Bjoern) + yes (Kendy) + https://bugs.documentfoundation.org/show_bug.cgi?id=90452#c45 **+ expect to push this past the UI freeze ** + will be in the next RC3 ... AI: + view 4x gerrit patches (Bjoern) + https://gerrit.libreoffice.org/#/c/16622/
Update firebird to version 2.5.4
Gerrit created , please review https://gerrit.libreoffice.org/16703 Tested on osx 10.10 , win 10 , ubuntu 14.04 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC15] Chained Text in Draw - A screencast of current prototype
Short blog post and link to Youtube video here: http://gsoc15-draw.logdown.com/posts/283339-text-chaining-in-draw-results-at-midterm Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/uiview/view2.cxx | 53 ++
1 file changed, 53 insertions(+)
New commits:
commit 7ea10bbd898f31565e5cdfb2612b1e8b22ed3809
Author: Andras Timar
Date: Thu Jun 11 00:01:38 2015 +0200
tdf#91613 restore functionality of clicking to .uno:Size status bar element
... in Writer.
This (partially) reverts commit ebabf6d1fa648d62dd63529e9fe64dcb631caee8.
I did not see the point to open Fields dialog by default, but other uses
are fully valid.
Reviewed-on: https://gerrit.libreoffice.org/16221
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit a2716e53c140b09d886591a3d6611ee8f166e417)
Change-Id: Ia06803fbb956266fb40c53f51099f9a32ddd6548
Reviewed-on: https://gerrit.libreoffice.org/16693
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 9c98971..7cf5b7c 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1483,6 +1483,26 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
rSet.DisableItem( SID_ATTR_ZOOMSLIDER );
}
break;
+case SID_ATTR_POSITION:
+case SID_ATTR_SIZE:
+{
+if( !rShell.IsFrmSelected() && !rShell.IsObjSelected() )
+SwBaseShell::_SetFrmMode( FLY_DRAG_END );
+else
+{
+FlyMode eFrameMode = SwBaseShell::GetFrmMode();
+if ( eFrameMode == FLY_DRAG_START || eFrameMode ==
FLY_DRAG )
+{
+if ( nWhich == SID_ATTR_POSITION )
+rSet.Put( SfxPointItem( SID_ATTR_POSITION,
+
rShell.GetAnchorObjDiff()));
+else
+rSet.Put( SvxSizeItem( SID_ATTR_SIZE,
+ rShell.GetObjSize()));
+}
+}
+}
+break;
case SID_TABLE_CELL:
if( rShell.IsFrmSelected() || rShell.IsObjSelected() )
@@ -1774,6 +1794,39 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
}
break;
+case SID_ATTR_SIZE:
+{
+sal_uInt16 nId = 0;
+if( rSh.IsCrsrInTbl() )
+nId = FN_FORMAT_TABLE_DLG;
+else if( rSh.GetCurTOX() )
+nId = FN_INSERT_MULTI_TOX;
+else if( rSh.GetCurrSection() )
+nId = FN_EDIT_REGION;
+else
+{
+const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCrsrPos();
+if( pNumRule ) // cursor in numbering
+{
+if( pNumRule->IsAutoRule() )
+nId = FN_NUMBER_BULLETS;
+else
+{
+// start dialog of the painter
+nId = 0;
+}
+}
+else if( rSh.IsFrmSelected() )
+nId = FN_FORMAT_FRAME_DLG;
+else if( rSh.IsObjSelected() )
+nId = SID_ATTR_TRANSFORM;
+}
+if( nId )
+GetViewFrame()->GetDispatcher()->Execute(nId,
+SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
+}
+break;
+
case FN_STAT_SELMODE:
{
if ( pArgs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2
include/sfx2/dinfdlg.hxx | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
New commits:
commit a912d1f017895898ade559ea02fdb378021cd9ee
Author: Michael Meeks
Date: Wed Jul 1 18:42:44 2015 +0100
tdf#92355 - use ScopedVclPtr as a replacement for in-line widgets.
Change-Id: Iccabcf6df662c0c4814a4c4f20d690778799e049
Reviewed-on: https://gerrit.libreoffice.org/16683
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 3bb88d9..eb589bd 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -391,24 +391,23 @@ public:
struct CustomPropertyLine
{
-VclPtr m_aNameBox;
-VclPtr m_aTypeBox;
-VclPtr m_aValueEdit;
-VclPtr m_aDateField;
-VclPtr m_aTimeField;
-const OUStringm_sDurationFormat;
-VclPtr m_aDurationField;
-VclPtrm_aEditButton;
-VclPtr m_aYesNoButton;
-VclPtr m_aRemoveButton;
+ScopedVclPtr m_aNameBox;
+ScopedVclPtr m_aTypeBox;
+ScopedVclPtr m_aValueEdit;
+ScopedVclPtr m_aDateField;
+ScopedVclPtr m_aTimeField;
+const OUString m_sDurationFormat;
+ScopedVclPtr m_aDurationField;
+ScopedVclPtrm_aEditButton;
+ScopedVclPtr m_aYesNoButton;
+ScopedVclPtr m_aRemoveButton;
boolm_bIsDate;
boolm_bIsRemoved;
boolm_bTypeLostFocus;
CustomPropertyLine( vcl::Window* pParent );
-
-voidSetRemoved();
+void SetRemoved();
};
// class CustomPropertiesWindow --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/inc sw/source
sw/inc/unobaseclass.hxx |4 ++
sw/source/core/unocore/unochart.cxx |4 +-
sw/source/core/unocore/unoobj2.cxx | 40
sw/source/core/unocore/unosect.cxx |2 +
sw/source/core/unocore/unotbl.cxx | 59 ++--
sw/source/uibase/uno/unotxvw.cxx|2 -
6 files changed, 73 insertions(+), 38 deletions(-)
New commits:
commit d97f2ae363f26a6bfaa6da854d2c6721043114f8
Author: Michael Stahl
Date: Tue Jun 30 13:09:32 2015 +0200
sw: avoid layout recursion when loading documents with charts...
... that have a Writer table as data source, such as ooo38798-1.sxw.
The problem is that during layouting, the SwWrtShell::CalcAndSetScale()
wants to call setVisualAreaSize() on the embedded chart object.
This switches the state of the object to RUNNING, which loads it from
the file, and during that the ODF filter calls into SwChartDataProvider
and that uses a UnoActionRemoveContext; unfortunately that ends all
pending Actions, so we get a recursive layout action.
Apparently the UnoActionRemoveContext is required to call
SwUnoTableCrsr::MakeBoxSels() for old-style tables, which need layout
frames for selection?!?
Try to avoid the problem by disabling UnoActionRemoveContext in case a
new-style table will be selected, which can be done without layout.
(cherry picked from commit b6cefd5e8b5086619e591385a0d7a6ffcd9783b9)
Conflicts:
sw/source/core/unocore/unochart.cxx
sw/source/core/unocore/unotbl.cxx
Change-Id: I097991ffb2e78ddf011db7575f7bb63ae8aa7005
Reviewed-on: https://gerrit.libreoffice.org/16617
Reviewed-by: Björn Michaelsen
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index a4f8abd..0b12f25 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -29,6 +29,7 @@
class SfxPoolItem;
class SwClient;
class SwDoc;
+class SwUnoTableCrsr;
typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XServiceInfo
@@ -70,6 +71,8 @@ class UnoActionContext
/*
interrupt Actions for a little while
+FIXME: this is a vile abomination that may cause recursive layout actions!
+C'thulhu fhtagn.
*/
class UnoActionRemoveContext
{
@@ -78,6 +81,7 @@ class UnoActionRemoveContext
public:
UnoActionRemoveContext(SwDoc *const pDoc);
+UnoActionRemoveContext(SwUnoTableCrsr const& rCursor);
~UnoActionRemoveContext();
};
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index 82e1d3c..e1d979b 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -407,8 +407,6 @@ static void GetFormatAndCreateCursorFromRangeRep(
pTable ? pTable->GetTableBox( aStartCell, true ) :
0;
if(pTLBox)
{
-// The Actions need to be removed here
-UnoActionRemoveContext aRemoveContext(pTableFormat->GetDoc());
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
@@ -427,6 +425,8 @@ static void GetFormatAndCreateCursorFromRangeRep(
pUnoCrsr->Move( fnMoveForward, fnGoNode );
SwUnoTableCrsr* pCrsr =
dynamic_cast(pUnoCrsr);
+// HACK: remove pending actions for old style tables
+UnoActionRemoveContext aRemoveContext(*pCrsr);
pCrsr->MakeBoxSels();
if (ppUnoCrsr)
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 82d79d0..1ba755f 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -265,22 +265,50 @@ UnoActionContext::~UnoActionContext()
}
}
-UnoActionRemoveContext::UnoActionRemoveContext(SwDoc *const pDoc)
-: m_pDoc(pDoc)
+static void lcl_RemoveImpl(SwDoc *const pDoc)
{
-SwRootFrm *const pRootFrm =
m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+assert(pDoc);
+SwRootFrm *const pRootFrm =
pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
if (pRootFrm)
{
pRootFrm->UnoRemoveAllActions();
}
}
+UnoActionRemoveContext::UnoActionRemoveContext(SwDoc *const pDoc)
+: m_pDoc(pDoc)
+{
+lcl_RemoveImpl(m_pDoc);
+}
+
+static SwDoc * lcl_IsNewStyleTable(SwUnoTableCrsr const& rCursor)
+{
+SwTableNode *const pTableNode = rCursor.GetNode().FindTableNode();
+return (pTableNode && !pTableNode->GetTable().IsNewModel())
+? rCursor.GetDoc()
+: nullptr;
+}
+
+UnoActionRemoveContext::UnoActionRemoveContext(SwUnoTableCrsr const& rCursor)
+: m_pDoc(lcl_IsNewStyleTable(rCursor))
+{
+// this insanity is only necessary for old-style tables
+// because SwRootFrm::MakeTableCrsrs() creates the table cur
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/app/docsh.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit de43a2fd64085c6887c66fede95ee9cdf0e431d4
Author: Julien Nabet
Date: Sun Jun 28 12:43:19 2015 +0200
tdf#92386: Writer crashes in print preview if document in 2 windows
2 changes for the 2 following bts
First bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116883
Second bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116888
Reviewed-on: https://gerrit.libreoffice.org/16557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit cb813b392d1f59ad8927b87e899d8a33d1db2504)
Change-Id: I92ed3b7305bb5b714532f2dcffd615a8337db8b6
Reviewed-on: https://gerrit.libreoffice.org/16618
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1879e7e..eb680fa 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1270,11 +1270,17 @@ const ::sfx2::IXmlIdRegistry*
SwDocShell::GetXmlIdRegistry() const
bool SwDocShell::IsChangeRecording() const
{
+if (!mpWrtShell)
+return false;
+
return (mpWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
}
bool SwDocShell::HasChangeRecordProtection() const
{
+if (!mpWrtShell)
+return false;
+
return
mpWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ea228fdffd17b87e398216625213a691fcb34825 Author: Caolán McNamara Date: Thu Jul 2 16:40:21 2015 +0100 fix a11y crash seen on moving chart wizard dialog Change-Id: Ic3ba292e28fe12d7dcc2c2e67aeea48a4c8aaac2 (cherry picked from commit b161552bd9f7d6b6de9752e4f0e7d6f65bbcf42e) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index a4e94cc..4cec468 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -813,8 +813,9 @@ uno::Reference< XAccessible > ScChildrenShapes::GetSelected(sal_Int32 nSelectedC std::vector < uno::Reference < drawing::XShape > > aShapes; FillShapes(aShapes); -if(aShapes.size()<=0) +if (nSelectedChildIndex < 0 || static_cast(nSelectedChildIndex) >= aShapes.size()) return xAccessible; + SortedShapes::iterator aItr; if (FindShape(aShapes[nSelectedChildIndex], aItr)) xAccessible = Get(aItr - maZOrderedShapes.begin()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b161552bd9f7d6b6de9752e4f0e7d6f65bbcf42e Author: Caolán McNamara Date: Thu Jul 2 16:40:21 2015 +0100 fix a11y crash seen on moving chart wizard dialog Change-Id: Ic3ba292e28fe12d7dcc2c2e67aeea48a4c8aaac2 diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 02c1b24..39e0e44 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -813,8 +813,9 @@ uno::Reference< XAccessible > ScChildrenShapes::GetSelected(sal_Int32 nSelectedC std::vector < uno::Reference < drawing::XShape > > aShapes; FillShapes(aShapes); -if(aShapes.size()<=0) +if (nSelectedChildIndex < 0 || static_cast(nSelectedChildIndex) >= aShapes.size()) return xAccessible; + SortedShapes::iterator aItr; if (FindShape(aShapes[nSelectedChildIndex], aItr)) xAccessible = Get(aItr - maZOrderedShapes.begin()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source
vcl/source/control/ilstbox.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit a8ddd3b0280baa1b770f439fbbca9ff073faa16b
Author: Caolán McNamara
Date: Thu Jul 2 16:21:26 2015 +0100
Resolves: tdf#92467 crashes with empty history list on pressing down
regression from some 16->32 bit listbox limit changing
Change-Id: I045eeef935afed4154fe11bfd11916c2d6a722e9
(cherry picked from commit c51d5706205cd0282c07d778ffac5f265c3eaf5f)
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 98655e6..2c8bab9 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1613,8 +1613,9 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent&
rKEvt )
)
{
DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti,
"ImplListBox: Selecting same Entry" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
bool bCurPosChange = (mnCurrentPos != nSelect);
mnCurrentPos = nSelect;
if(SelectEntries( nSelect, eLET, bShift, bCtrl, bCurPosChange))
@@ -1674,8 +1675,9 @@ void ImplListBoxWindow::SelectEntry(
vcl::StringEntryIdentifier _entry )
// normalize
OSL_ENSURE( nSelect < mpEntryList->GetEntryCount(),
"ImplListBoxWindow::SelectEntry: how that?" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
// make visible
ShowProminentEntry( nSelect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/control/ilstbox.cxx | 10 ++
vcl/source/fontsubset/sft.cxx |3 +++
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit c51d5706205cd0282c07d778ffac5f265c3eaf5f
Author: Caolán McNamara
Date: Thu Jul 2 16:21:26 2015 +0100
Resolves: tdf#92467 crashes with empty history list on pressing down
regression from some 16->32 bit listbox limit changing
Change-Id: I045eeef935afed4154fe11bfd11916c2d6a722e9
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index a0ff872..fde4faa 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1613,8 +1613,9 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent&
rKEvt )
)
{
DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti,
"ImplListBox: Selecting same Entry" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
bool bCurPosChange = (mnCurrentPos != nSelect);
mnCurrentPos = nSelect;
if(SelectEntries( nSelect, eLET, bShift, bCtrl, bCurPosChange))
@@ -1674,8 +1675,9 @@ void ImplListBoxWindow::SelectEntry(
vcl::StringEntryIdentifier _entry )
// normalize
OSL_ENSURE( nSelect < mpEntryList->GetEntryCount(),
"ImplListBoxWindow::SelectEntry: how that?" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
// make visible
ShowProminentEntry( nSelect );
commit cd5fd80ebfa91e6546a10bc5e84f588ad8762add
Author: Caolán McNamara
Date: Thu Jul 2 14:34:36 2015 +0100
coverity#1213369 Untrusted value as argument
Change-Id: Ie929aee9c78a89d9ebed15cc59d33d7f2fdb3fad
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index ede244c..999a697 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1721,6 +1721,9 @@ static int doOpenTTFont( sal_uInt32 facenum,
TrueTypeFont* t )
for( i = 0; i <= (int)t->nglyphs; ++i )
t->goffsets[i] = indexfmt ? GetUInt32(table, i << 2, 1) :
(sal_uInt32)GetUInt16(table, i << 1, 1) << 1;
} else if( getTable(t, O_CFF) ) { /* PS-OpenType */
+int k = getTableSize(t, O_CFF); /* set a limit here, presumably much
lower than the table size, but establishes some sort of physical bound */
+if( k < (int)t->nglyphs )
+t->nglyphs = k;
t->goffsets = static_cast(calloc(1+t->nglyphs,
sizeof(sal_uInt32)));
/* TODO: implement to get subsetting */
assert(t->goffsets != 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/source sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
sw/source/ui/app/mn.src |6
+++---
sw/uiconfig/swriter/ui/tocdialog.ui |4 ++--
sw/uiconfig/swriter/ui/tocindexpage.ui |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 838f00c9ba998b1e44422462a684096fd073a186
Author: Olivier Hallot
Date: Thu Jul 2 09:28:39 2015 -0300
Table is actually Table of Contents
Make it also more clear for translators
Change-Id: I602ffb17e80c7078be19498d33b609fa3d980902
Reviewed-on: https://gerrit.libreoffice.org/16695
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index d85988e..f9a866e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -112,7 +112,7 @@
- ~Indexes and Tables...
+ ~Indexes and Tables of Contents...
1
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 18ed720..355bbab 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -214,19 +214,19 @@
{ \
Identifier = FN_UPDATE_CUR_TOX ;\
HelpId = CMD_FN_UPDATE_CUR_TOX ;
\
-Text [ en-US ] = "~Update Index or Table";
\
+Text [ en-US ] = "~Update Index or Table of Contents"; \
}; \
MenuItem\
{ \
Identifier = FN_EDIT_CURRENT_TOX; \
HelpId = CMD_FN_EDIT_CURRENT_TOX;
\
-Text [ en-US ] = "~Edit Index or Table";
\
+Text [ en-US ] = "~Edit Index or Table of Contents";
\
}; \
MenuItem\
{ \
Identifier = FN_REMOVE_CUR_TOX; \
HelpId = CMD_FN_REMOVE_CUR_TOX;
\
-Text [ en-US ] = "Delete Index or Table";
\
+Text [ en-US ] = "Delete Index or Table of Contents";
\
}; \
SEPARATOR ;
diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui
b/sw/uiconfig/swriter/ui/tocdialog.ui
index adac993..3d6c2eb 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -5,7 +5,7 @@
False
6
-Insert Index/Table
+Insert Index or Table of
Contents
False
dialog
@@ -134,7 +134,7 @@
True
False
-Index/Table
+Index or Table
of Contents
False
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui
b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 8badc32..59056608 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -297,7 +297,7 @@
True
False
-Create
Index/Table
+Create Index or Table of
Contents
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a2efbb7172a00692d4b8c3f326d93aa42036584 Author: Andrea Gelmini Date: Wed Jul 1 00:13:57 2015 +0200 Fix PostgreSQL function name Change-Id: Ic089540c07c7fe7c85705fc3513411a7e2571a12 Reviewed-on: https://gerrit.libreoffice.org/16640 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 5c4a29b..41c9558 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -384,7 +384,7 @@ OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeEx "convert_to," "decode," "encode," -"foramt," +"format," "initcap," "left," "length," ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/components.cxx | 52 +---
1 file changed, 23 insertions(+), 29 deletions(-)
New commits:
commit 824adeee90e9bb0d3398cdf04b5bb5c96afdd021
Author: Stephan Bergmann
Date: Wed Jul 1 16:19:27 2015 +0200
Minor clean up
Change-Id: I7be5bf1319ac927ffb746d47f9e0d596284e2283
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5c585ec..dc0c4be 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-
#include
#include
@@ -38,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -64,7 +63,8 @@
#include "xcdparser.hxx"
#include "xcuparser.hxx"
#include "xcsparser.hxx"
-#ifdef WNT
+
+#if defined WNT
#include "winreg.hxx"
#endif
@@ -490,16 +490,15 @@ Components::Components(
}
OUString type(conf.copy(i, c - i));
OUString url(conf.copy(c + 1, n - c - 1));
-if ( type == "xcsxcu" ) {
+if (type == "xcsxcu") {
sal_uInt32 nStartTime = osl_getGlobalTimer();
parseXcsXcuLayer(layer, url);
SAL_INFO("configmgr", "parseXcsXcuLayer() took " <<
(osl_getGlobalTimer() - nStartTime) << " ms");
layer += 2; //TODO: overflow
-} else if ( type == "bundledext" )
-{
+} else if (type == "bundledext") {
parseXcsXcuIniLayer(layer, url, false);
layer += 2; //TODO: overflow
-} else if ( type == "sharedext" ) {
+} else if (type == "sharedext") {
if (sharedExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
"CONFIGURATION_LAYERS: multiple \"sharedext\" layers");
@@ -507,7 +506,7 @@ Components::Components(
sharedExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
-} else if ( type == "userext" ) {
+} else if (type == "userext") {
if (userExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
"CONFIGURATION_LAYERS: multiple \"userext\" layers");
@@ -515,40 +514,35 @@ Components::Components(
userExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
-} else if ( type == "module" ) {
+} else if (type == "module") {
parseModuleLayer(layer, url);
++layer; //TODO: overflow
-} else if ( type == "res" ) {
+} else if (type == "res") {
sal_uInt32 nStartTime = osl_getGlobalTimer();
parseResLayer(layer, url);
SAL_INFO("configmgr", "parseResLayer() took " <<
(osl_getGlobalTimer() - nStartTime) << " ms");
++layer; //TODO: overflow
-} else if ( type == "user" ) {
-if (url.isEmpty()) {
-throw css::uno::RuntimeException(
-"CONFIGURATION_LAYERS: empty \"user\" URL");
-}
-modificationFileUrl_ = url;
-parseModificationLayer(url);
-}
-#ifdef WNT
-else if ( type == "winreg" )
-{
+#if defined WNT
+} else if (type == "winreg") {
if (!url.isEmpty()) {
-SAL_WARN(
-"configmgr",
-"winreg URL is not empty, URL handling is not implemented
for winreg");
+throw css::uno::RuntimeException(
+"CONFIGURATION_LAYERS: non-empty \"winreg\" URL");
}
OUString aTempFileURL;
-if ( dumpWindowsRegistry(&aTempFileURL) )
-{
+if (dumpWindowsRegistry(&aTempFileURL)) {
parseFileLeniently(&parseXcuFile, aTempFileURL, layer, 0, 0,
0);
-layer++;
osl::File::remove(aTempFileURL);
}
-}
+++layer; //TODO: overflow
#endif
-else {
+} else if (type == "user") {
+if (url.isEmpty()) {
+throw css::uno::RuntimeException(
+"CONFIGURATION_LAYERS: empty \"user\" URL");
+}
+modificationFileUrl_ = url;
+parseModificationLayer(url);
+} else {
throw css::uno::RuntimeException(
"CONFIGURATION_LAYERS: unknown layer type \"" + type + "\"");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source
instsetoo_native/CustomTarget_setup.mk |2 +-
scp2/source/ooo/common_brand.scp |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 94032236ba65c00ba29498a0dded42fa2f60b198
Author: Stephan Bergmann
Date: Thu Jul 2 15:27:26 2015 +0200
Move winreg layer past res layer, and also include it in instdir/ instset
* Looks more logical to keep share/registry/'s xcscxu and res layers
together.
* Lets the winreg code actually get executed by developers using the
instdir/
instset. (Though it doesn't enable it during in-build tests, which
typically
use their own CONFIGURATION_LAYERS settings.)
Change-Id: I49dd3a16773047f7d4dc372c60a58ada1970970a
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index b020e96..4217424 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -48,7 +48,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
- && echo
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry
bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
\
+ && echo
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry $(if $(filter
WNT,$(OS)),winreg: )bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
\
&& echo
'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
&& echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):TMP_EXTENSIONS}' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2e967c7..e79dab7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1123,7 +1123,7 @@ ProfileItem
gid_Brand_Profileitem_Fundamental_Configuration_Layers
Section = "Bootstrap";
Key = "CONFIGURATION_LAYERS";
#if defined WNT
-Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg:
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap)
":UserInstallation}/user/registrymodifications.xcu";
+Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg:
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBacken
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-2' - loolwsd/LOOLSession.cpp
loolwsd/LOOLSession.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit aec0c5fdaa2d2e51c2f01a3b12d2c77375ec5898
Author: Tor Lillqvist
Date: Thu Jul 2 16:26:09 2015 +0300
Add a FIXME, found by looking, no time to investigate
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index d151a7f..30af0e3 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -607,6 +607,7 @@ void MasterProcessSession::dispatchChild()
sendTextFrame("error: cmd=load kind=internal");
// We did not use the child session after all
+// FIXME: Why do we do the same thing both here and then when we
catch the IOException that we throw, a dozen line below?
lock.lock();
_availableChildSessions.insert(childSession);
std::cout << Util::logPrefix() << "_availableChildSessions size="
<< _availableChildSessions.size() << std::endl;
@@ -623,6 +624,7 @@ void MasterProcessSession::dispatchChild()
Application::instance().logger().error(Util::logPrefix() + "Copying
failed: " + exc.message());
sendTextFrame("error: cmd=load kind=failed");
+// FIXME: See above FIXME
lock.lock();
_availableChildSessions.insert(childSession);
std::cout << Util::logPrefix() << "_availableChildSessions size=" <<
_availableChildSessions.size() << std::endl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp
loolwsd/LOOLSession.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit f4da368a52a842e9224c58fa0953eddbf6b037a1
Author: Tor Lillqvist
Date: Thu Jul 2 16:26:09 2015 +0300
Add a FIXME, found by looking, no time to investigate
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index a568569..df0a698 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -613,6 +613,7 @@ void MasterProcessSession::dispatchChild()
sendTextFrame("error: cmd=load kind=internal");
// We did not use the child session after all
+// FIXME: Why do we do the same thing both here and then when we
catch the IOException that we throw, a dozen line below?
lock.lock();
_availableChildSessions.insert(childSession);
std::cout << Util::logPrefix() << "_availableChildSessions size="
<< _availableChildSessions.size() << std::endl;
@@ -629,6 +630,7 @@ void MasterProcessSession::dispatchChild()
Application::instance().logger().error(Util::logPrefix() + "Copying
failed: " + exc.message());
sendTextFrame("error: cmd=load kind=failed");
+// FIXME: See above FIXME
lock.lock();
_availableChildSessions.insert(childSession);
std::cout << Util::logPrefix() << "_availableChildSessions size=" <<
_availableChildSessions.size() << std::endl;
___
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/layout/fly.cxx |7 +++
sw/source/core/layout/pagechg.cxx | 12 +++-
sw/source/core/layout/ssfrm.cxx |1 +
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit cd173f7718422b254ed4ec6548c7c913409d0c36
Author: Caolán McNamara
Date: Thu Jul 2 14:10:17 2015 +0100
crashtest: don't crash on layout of ooo70429-[1|2]
Invalid read of size 8
at 0x2DF1B82A: SwFlowFrm::HasFollow() const (flowfrm.hxx:163)
by 0x2E3F80BF: CalcContent(SwLayoutFrm*, bool, bool) (fly.cxx:1652)
by 0x2E49A960: SwSectionFrm::_CheckClipping(bool, bool)
(sectfrm.cxx:1037)
Address 0x20c1f978 is 248 bytes inside a block of size 288 free'd
by 0x2E497284: SwSectionFrm::~SwSectionFrm() (sectfrm.cxx:153)
by 0x2E4B0D1C: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:390)
by 0x2E4B1485: SwLayoutFrm::DestroyImpl() (ssfrm.cxx:499)
by 0x2E4B0CD3: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:388)
by 0x2E4B1485: SwLayoutFrm::DestroyImpl() (ssfrm.cxx:499)
by 0x2E454CC6: SwPageFrm::DestroyImpl() (pagechg.cxx:270)
by 0x2E4B0CD3: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:388)
by 0x2E458237: SwFrm::InsertPage(SwPageFrm*, bool) (pagechg.cxx:1226)
by 0x2E49CD8B: SwFrm::GetNextSctLeaf(MakePageType) (sectfrm.cxx:1564)
by 0x2E3EB912: SwFrm::GetLeaf(MakePageType, bool) (flowfrm.cxx:785)
by 0x2E3EE83E: SwFlowFrm::MoveFwd(bool, bool, bool) (flowfrm.cxx:1840)
by 0x2E3D7CF0: SwContentFrm::MakeAll(OutputDevice*) (calcmove.cxx:1171)
by 0x2E3D2E8B: SwFrm::PrepareMake(OutputDevice*) (calcmove.cxx:277)
by 0x2E4CE31C: SwFrm::Calc(OutputDevice*) const (trvlfrm.cxx:1798)
by 0x2E56E174: SwTextFrm::CalcFollow(int) (frmform.cxx:282)
by 0x2E56F718: SwTextFrm::_AdjustFollow(SwTextFormatter&, int, int,
unsigned char) (frmform.cxx:590)
by 0x2E5716D3: SwTextFrm::FormatAdjust(SwTextFormatter&,
WidowsAndOrphans&, int, bool) (frmform.cxx:1110)
by 0x2E570A6E: SwTextFrm::CalcPreps() (frmform.cxx:892)
by 0x2E574163: SwTextFrm::Format(OutputDevice*, SwBorderAttrs const*)
(frmform.cxx:1767)
by 0x2E3D8E4F: SwContentFrm::MakeAll(OutputDevice*) (calcmove.cxx:1337)
by 0x2E3D319F: SwFrm::PrepareMake(OutputDevice*) (calcmove.cxx:340)
by 0x2E4CE31C: SwFrm::Calc(OutputDevice*) const (trvlfrm.cxx:1798)
by 0x2E3F77B7: CalcContent(SwLayoutFrm*, bool, bool) (fly.cxx:1466)
by 0x2E49A960: SwSectionFrm::_CheckClipping(bool, bool)
(sectfrm.cxx:1037)
Change-Id: I089981eda62bff63782338b5210b78f69b6d5f0b
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index a52f82f..ecd4251 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1463,8 +1463,15 @@ void CalcContent( SwLayoutFrm *pLay,
if ( bNoCalcFollow && pFrm->IsTextFrm() )
static_cast(pFrm)->ForbidFollowFormat();
+const bool bDeleteForbidden(pSect && pSect->IsDeleteForbidden());
+if (pSect)
+pSect->ForbidDelete();
+
pFrm->Calc(pRenderContext);
+if (!bDeleteForbidden)
+pSect->AllowDelete();
+
// OD 14.03.2003 #i11760# - reset control flag for follow format.
if ( pFrm->IsTextFrm() )
{
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index a91cef3..2976db7 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1151,6 +1151,16 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool
bNotifyFields, SwPageFrm** p
#endif
}
+namespace
+{
+bool isDeleteForbidden(const SwPageFrm *pDel)
+{
+const SwLayoutFrm* pBody = pDel->FindBodyCont();
+const SwFrm* pBodyContent = pBody ? pBody->Lower() : NULL;
+return pBodyContent && pBodyContent->IsDeleteForbidden();
+}
+}
+
SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFootnote )
{
SwRootFrm *pRoot = static_cast(pPrevPage->GetUpper());
@@ -1216,7 +1226,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool
bFootnote )
pPage->PreparePage( bFootnote );
// If the sibling has no body text, destroy it as long as it is no
footnote page.
if ( pSibling && !pSibling->IsFootnotePage() &&
- !pSibling->FindFirstBodyContent() )
+ !pSibling->FindFirstBodyContent() && !isDeleteForbidden(pSibling) )
{
SwPageFrm *pDel = pSibling;
pSibling = static_cast(pSibling->GetNext());
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index a29b09e..4d21ba2 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -374,6 +374,7 @@ void SwFrm::DestroyImpl()
SwFrm::~SwFrm()
{
assert(m_isInDestroy); // check that only DestroySwFrm does "delete"
+assert(!IsDeleteForbidden()); // check that its not deleted while deletes
are forbidden
#if OSL_
Registration for the conference is open!
Hi all, Registration for the conference is now open! Please do register if you plan to attend, it will help a lot the organization team. Registration page: http://conference.libreoffice.org/2015/registration/ General announcement: http://blog.documentfoundation.org/2015/07/02/registration-for-the-libreoffice-conference-is-now-open/ Thanks in advance :) Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org GSM: +33683901545 IRC: sophi Co-founder - Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source include/ucbhelper io/source pyuno/inc
bridges/source/jni_uno/jni_base.h|8
include/ucbhelper/interactionrequest.hxx | 17 -
include/ucbhelper/propertyvalueset.hxx | 25 -
include/ucbhelper/resultsethelper.hxx| 12
io/source/stm/streamhelper.cxx | 11 ---
io/source/stm/streamhelper.hxx |3 ---
pyuno/inc/pyuno/pyuno.hxx|8
7 files changed, 84 deletions(-)
New commits:
commit 1a7e0cfd86c03607f9009aec40dbfa5d43de0c8e
Author: Noel Grandin
Date: Thu Jul 2 09:40:48 2015 +0200
loplugin:unusedmethods bridges,ucbhelper,io,pyuno
Change-Id: I483deb33b9d861af679d4a36e13585345401e10d
Reviewed-on: https://gerrit.libreoffice.org/16681
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/bridges/source/jni_uno/jni_base.h
b/bridges/source/jni_uno/jni_base.h
index af93d6a..4fd90ea 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -158,7 +158,6 @@ public:
inline bool is() const
{ return (0 != m_jo); }
inline jobject release();
-inline void reset();
inline void reset( jobject jo );
inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref );
};
@@ -183,13 +182,6 @@ inline jobject JLocalAutoRef::release()
return jo;
}
-inline void JLocalAutoRef::reset()
-{
-if (0 != m_jo)
-m_jni->DeleteLocalRef( m_jo );
-m_jo = 0;
-}
-
inline void JLocalAutoRef::reset( jobject jo )
{
if (jo != m_jo)
diff --git a/include/ucbhelper/interactionrequest.hxx
b/include/ucbhelper/interactionrequest.hxx
index d0996d7..2cba1ca 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -529,14 +529,6 @@ public:
const OUString & getPassword() const { return m_aPassword; }
/**
- * This method returns the account that was supplied by the interaction
- * handler.
- *
- * @return the account.
- */
-const OUString & getAccount() const { return m_aAccount; }
-
-/**
* This method returns the authentication remember-mode for the password
* that was supplied by the interaction handler.
*
@@ -545,15 +537,6 @@ public:
const com::sun::star::ucb::RememberAuthentication &
getRememberPasswordMode() const { return m_eRememberPasswordMode; }
-/**
- * This method returns the authentication remember-mode for the account
- * that was supplied by the interaction handler.
- *
- * @return the remember-mode for the account.
- */
-const com::sun::star::ucb::RememberAuthentication &
-getRememberAccountMode() const { return m_eRememberAccountMode; }
-
bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
};
diff --git a/include/ucbhelper/propertyvalueset.hxx
b/include/ucbhelper/propertyvalueset.hxx
index c557373..09f5564 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -193,62 +193,37 @@ public:
// Non-interface methods
-
void appendString( const OUString& rPropName, const OUString& rValue );
-void appendString( const sal_Char* pAsciiPropName, const OUString& rValue )
-{
-appendString( OUString::createFromAscii( pAsciiPropName ), rValue );
-}
void appendString( const ::com::sun::star::beans::Property& rProp, const
OUString& rValue )
{
appendString( rProp.Name, rValue );
}
void appendBoolean( const OUString& rPropName, bool bValue );
-void appendBoolean( const sal_Char* pAsciiPropName, bool bValue )
-{
-appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue );
-}
void appendBoolean( const ::com::sun::star::beans::Property& rProp, bool
bValue )
{
appendBoolean( rProp.Name, bValue );
}
void appendLong( const OUString& rPropName, sal_Int64 nValue );
-void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue )
-{
-appendLong( OUString::createFromAscii( pAsciiPropName ), nValue );
-}
void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64
nValue )
{
appendLong( rProp.Name, nValue );
}
void appendTimestamp( const OUString& rPropName, const
::com::sun::star::util::DateTime& rValue );
-void appendTimestamp( const sal_Char* pAsciiPropName, const
::com::sun::star::util::DateTime& rValue )
-{
-appendTimestamp( OUString::createFromAscii( pAsciiPropName ), rValue );
-}
void appendTimestamp( const ::com::sun::star::beans::Property& rProp,
const ::com::sun::star::util::DateTime& rValue )
{
appendTimestamp( rProp.Name, rValue );
}
void appendObject( const OUString& rPropName, const
::com::sun::star::uno::Any& rValue );
-void appendObject( const sal_Char* pAsciiPropName, const
::com::sun::star::uno::Any& rValue )
-{
-appendObject
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/componentbase.hxx|4 --
include/comphelper/containermultiplexer.hxx |2 -
include/comphelper/interaction.hxx |3 --
include/comphelper/listenernotification.hxx | 11 ---
include/comphelper/logging.hxx | 40
include/comphelper/namedvaluecollection.hxx | 15 --
include/comphelper/sharedmutex.hxx |1
include/comphelper/threadpool.hxx |1
8 files changed, 77 deletions(-)
New commits:
commit 813f3436eaca46087e35912719a5cc198712714b
Author: Noel Grandin
Date: Thu Jul 2 10:57:52 2015 +0200
loplugin:unusedmethods comphelper
Change-Id: I704a1e777505dbad83d81857f09601c2887fb6a1
Reviewed-on: https://gerrit.libreoffice.org/16682
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/comphelper/componentbase.hxx
b/include/comphelper/componentbase.hxx
index 349e6c6..9418249 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -136,10 +136,6 @@ namespace comphelper
{
m_aMutexGuard.clear();
}
-inline void reset()
-{
-m_aMutexGuard.reset();
-}
private:
::osl::ResettableMutexGuard m_aMutexGuard;
diff --git a/include/comphelper/containermultiplexer.hxx
b/include/comphelper/containermultiplexer.hxx
index 97fff52..6b2525a 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -101,8 +101,6 @@ namespace comphelper
/// dispose the object. No multiplexing anymore
voiddispose();
-const ::com::sun::star::uno::Reference<
::com::sun::star::container::XContainer >&
-getContainer() const { return m_xContainer; }
};
diff --git a/include/comphelper/interaction.hxx
b/include/comphelper/interaction.hxx
index 8e49d72..6520b48 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -51,9 +51,6 @@ namespace comphelper
public:
/// determines whether or not this handler was selected
boolwasSelected() const { return m_bSelected; }
-/// resets the state to "not selected", so you may reuse the handler
-voidreset() { m_bSelected = false; }
-
protected:
voidimplSelected() { m_bSelected = true; }
};
diff --git a/include/comphelper/listenernotification.hxx
b/include/comphelper/listenernotification.hxx
index a2b6d35..f0ff806 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -77,11 +77,6 @@ namespace comphelper
inline bool
empty() const;
-/** determines the number of elements in the container
-*/
-inline size_t
-size() const;
-
/** creates an iterator for looping through all registered listeners
*/
::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
@@ -145,11 +140,6 @@ namespace comphelper
return ( m_aListeners.getLength() == 0 );
}
-inline size_t OListenerContainer::size() const
-{
-return m_aListeners.getLength();
-}
-
//= OSimpleListenerContainer
@@ -194,7 +184,6 @@ namespace comphelper
using OListenerContainer::disposing;
using OListenerContainer::clear;
using OListenerContainer::empty;
-using OListenerContainer::size;
using OListenerContainer::createIterator;
/// typed notification
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 0a5e807..dcfe7b3 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -119,14 +119,6 @@ namespace comphelper
//- XLogger::log equivalents/wrappers
//- string messages
-/// logs a given message, without any arguments, or source
class/method names
-boollog( const sal_Int32 _nLogLevel, const OUString& _rMessage
) const
-{
-if ( isLoggable( _nLogLevel ) )
-return impl_log( _nLogLevel, NULL, NULL, _rMessage );
-return false;
-}
-
/** logs a given message, replacing a placeholder in the message with
an argument
The function takes, additionally to the log level and the message,
an arbitrary
@@ -212,14 +204,6 @@ namespace comphelper
//- XLogger::log equivalents/wrappers
//- ASCII messages
-/// logs a given message, without any arguments, or source
class/method names
-boollog( const sal_Int32 _nLogLevel, const sal_Char* _pMessage
) const
-{
-if ( isLoggable( _nLogLevel ) )
-return impl_log( _nLogLevel, NULL, NULL,
OUString::createFromAscii( _pMessage ) );
-return false;
-}
-
/** logs a given message, replacing a placeholder
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl vcl/source
include/vcl/outdev.hxx |2 +-
vcl/source/outdev/bitmap.cxx | 28 +++-
vcl/source/outdev/curvedshapes.cxx | 10 ++
vcl/source/outdev/gradient.cxx | 22 +++---
vcl/source/outdev/hatch.cxx |8 +---
vcl/source/outdev/line.cxx |5 +++--
vcl/source/outdev/mask.cxx | 10 ++
vcl/source/outdev/nativecontrols.cxx |4 +++-
vcl/source/outdev/pixel.cxx | 11 +++
vcl/source/outdev/polygon.cxx| 11 +++
vcl/source/outdev/polyline.cxx | 11 +++
vcl/source/outdev/rect.cxx | 11 +++
vcl/source/outdev/text.cxx | 11 ++-
vcl/source/outdev/textline.cxx |7 +--
vcl/source/outdev/transparent.cxx| 13 -
vcl/source/outdev/wallpaper.cxx | 12 +++-
16 files changed, 104 insertions(+), 72 deletions(-)
New commits:
commit b0f8ade4d4c3f689a292be66bc2932d1adf4e3f5
Author: Tor Lillqvist
Date: Thu Jun 18 10:37:01 2015 +0300
Assertions should tell the line number where the problem is
Let's not hide the assert() in a function whose sole purpose is to
call assert().
Change-Id: I7a8a04aad560b0f22398daabf12d00bbe58e89f1
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1754058..4a8dd85 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -613,7 +613,7 @@ protected:
SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice*
pSrcDev, SalTwoRect& rPosAry );
-SAL_DLLPRIVATE void assert_if_double_buffered_window() const;
+SAL_DLLPRIVATE bool is_double_buffered_window() const;
private:
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 718cef9..2ae0236 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
#include
@@ -36,7 +38,7 @@
void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
const Size aSizePix( rBitmap.GetSizePixel() );
DrawBitmap( rDestPt, PixelToLogic( aSizePix ), Point(), aSizePix, rBitmap,
MetaActionType::BMP );
@@ -44,7 +46,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const
Bitmap& rBitmap )
void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Bitmap& rBitmap )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
DrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap,
MetaActionType::BMPSCALE );
}
@@ -54,7 +56,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const
Size& rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
const Bitmap& rBitmap, const MetaActionType
nAction )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
@@ -236,7 +238,7 @@ Bitmap OutputDevice::GetDownsampledBitmap( const Size&
rDstSz,
void OutputDevice::DrawBitmapEx( const Point& rDestPt,
const BitmapEx& rBitmapEx )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
@@ -255,7 +257,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt,
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const BitmapEx& rBitmapEx )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
@@ -275,7 +277,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
const BitmapEx& rBitmapEx, const
MetaActionType nAction )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
if( ImplIsRecordLayout() )
return;
@@ -492,7 +494,7 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt,
const Size& rDestSize
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
BitmapEx& rBitmapEx )
{
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
if (rBitmapEx.IsAlpha())
{
@@ -622,7 +624,7 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap&
rBmp, const AlphaMask& r
const Point& rDestPt, const Size&
rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel )
{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 21 +++---
1 file changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 9ecdfc2a6d912eb8edcff76e85c999a6d2acae83
Author: Caolán McNamara
Date: Mon Jun 29 11:26:41 2015 +0100
Resolves: tdf#92275 impress grinds to a halt constant swapping images
This reverts commit 6c84442f99de109b585d3ba8964deb8dcf261c0f.
"tdf#87820 Images not displayed properly in Calc"
and replaces it with an alternative solution
Change-Id: Iecb560d43767f0e41e442a307eefcdcecb7589ef
(cherry picked from commit 2d196d0ee26b3840e56ec6537066a3b4a2f08691)
(cherry picked from commit 72da6ef835982e1927fd7405bb42f403c2fee5f9)
Reviewed-on: https://gerrit.libreoffice.org/16574
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 4a8f469..df3e06e 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -134,22 +134,30 @@ namespace sdr
rGrafObj.mbInsidePaint = false;
}
-// Invalidate paint areas.
-GetViewContact().ActionChanged();
-
bRetval = true;
}
}
}
else
{
-// it is not swapped out, somehow it was loaded. In that case,
forget
+// it is not swapped out, somehow[1] it was loaded. In that
case, forget
// about an existing triggered event
-if(mpAsynchLoadEvent)
+if (mpAsynchLoadEvent)
{
// just delete it, this will remove it from the
EventHandler and
// will trigger forgetAsynchGraphicLoadingEvent from the
destructor
delete mpAsynchLoadEvent;
+
+// Invalidate paint areas.
+// [1] If a calc document with graphics is loaded then
OnLoad will
+// be emitted before the graphic are due to be swapped in
asynchronously
+// In sfx2 we generate a preview on receiving onload,
which forces
+// the graphics to be swapped in to generate the preview.
When
+// the timer triggers it find the graphics already swapped
in. So
+// we should still invalidate the paint area on finding
the graphic
+// swapped in seeing as we're still waiting in calc to
draw the
+// graphics on receipt of their contents.
+GetViewContact().ActionChanged();
}
}
@@ -189,9 +197,6 @@ namespace sdr
rGrafObj.mbInsidePaint = false;
}
-// Invalidate paint areas.
-GetViewContact().ActionChanged();
-
bRetval = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 15 commits - dbaccess/source filter/source formula/source helpcompiler/source include/svx include/vbahelper pyuno/inc pyuno/source sc/source svl/source svx/source sw/in
dbaccess/source/core/api/StaticSet.cxx |2 +-
dbaccess/source/core/api/StaticSet.hxx |2 +-
filter/source/svg/svgexport.cxx|2 +-
filter/source/svg/svgfilter.hxx|2 +-
filter/source/svg/test/svg2odf.cxx |5 +
formula/source/ui/dlg/formula.cxx |3 +--
helpcompiler/source/HelpLinker_main.cxx|5 +
include/svx/AccessibleShape.hxx|2 +-
include/vbahelper/vbaeventshelperbase.hxx |4 ++--
pyuno/inc/pyuno/pyuno.hxx |2 +-
pyuno/source/module/pyuno_runtime.cxx |2 +-
sc/source/ui/vba/excelvbahelper.cxx|2 +-
sc/source/ui/vba/excelvbahelper.hxx|2 +-
sc/source/ui/vba/vbaeventshelper.cxx |2 +-
sc/source/ui/vba/vbaeventshelper.hxx |2 +-
svl/source/inc/passwordcontainer.hxx |4 ++--
svl/source/passwordcontainer/passwordcontainer.cxx |4 ++--
svx/source/accessibility/AccessibleShape.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx |4 ++--
svx/source/svdraw/svdobj.cxx |1 -
sw/inc/unocrsrhelper.hxx | 11 ++-
sw/inc/unostyle.hxx|2 +-
sw/source/core/unocore/unoobj.cxx |2 +-
sw/source/core/unocore/unostyle.cxx|2 +-
sw/source/core/unocore/unotbl.cxx |3 ++-
ucb/source/core/ucbcmds.cxx|2 +-
ucb/source/ucp/ftp/ftpurl.cxx |2 +-
ucb/source/ucp/ftp/ftpurl.hxx |2 +-
ucb/source/ucp/webdav-neon/webdavcontent.cxx |7 +++
ucb/source/ucp/webdav-neon/webdavcontent.hxx |6 +++---
vbahelper/source/vbahelper/vbaeventshelperbase.cxx |2 +-
31 files changed, 52 insertions(+), 43 deletions(-)
New commits:
commit 1d498fb0feca911fa063e96779b654c3aded2415
Author: Caolán McNamara
Date: Thu Jul 2 09:15:23 2015 +0100
some other coverity things
Change-Id: I89ffd2b918f8707cde1b1d015c1ad35ef484b69c
diff --git a/dbaccess/source/core/api/StaticSet.cxx
b/dbaccess/source/core/api/StaticSet.cxx
index aea9c4d..7fd2cae 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -296,7 +296,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow&
_rInsertRow,const connect
}
}
-void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(SQLException, RuntimeException)
+void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(SQLException, RuntimeException, std::exception)
{
OCacheSet::updateRow( _rInsertRow,_rOriginalRow,_xTable);
}
diff --git a/dbaccess/source/core/api/StaticSet.hxx
b/dbaccess/source/core/api/StaticSet.hxx
index 1a07d79..4b30def 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -74,7 +74,7 @@ namespace dbaccess
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any
>& rows,const connectivity::OSQLTable& _xTable )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// ::com::sun::star::sdbc::XResultSetUpdate
virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const
connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const
connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL cancelRowUpdates( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL moveToInsertRow( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index cb36b26..495c3c1 100644
--- a/include/svx/AccessibleShape.hx
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/source
include/vcl/outdev.hxx |6 --
vcl/inc/impbmp.hxx |6 ++
vcl/source/outdev/mask.cxx |6 --
vcl/source/outdev/pixel.cxx |6 --
4 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 9645435e3f408cf7877466c240522fb65acb8519
Author: Tor Lillqvist
Date: Thu Jul 2 12:46:09 2015 +0300
No need for these declarations to be public
Change-Id: I101269defce2cdbbb686c0ac0bb4bcb8c9a23846
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 279cb1e..e357fcf 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -300,12 +300,6 @@ typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
BmpMirrorFlags AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix );
void AdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect );
-extern const sal_uLong nVCLRLut[ 6 ];
-extern const sal_uLong nVCLGLut[ 6 ];
-extern const sal_uLong nVCLBLut[ 6 ];
-extern const sal_uLong nVCLDitherLut[ 256 ];
-extern const sal_uLong nVCLLut[ 256 ];
-
class OutputDevice;
namespace vcl {
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 0dc9ec8..1fa17f8 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -24,6 +24,12 @@
#include
#include
+extern const sal_uLong nVCLRLut[ 6 ];
+extern const sal_uLong nVCLGLut[ 6 ];
+extern const sal_uLong nVCLBLut[ 6 ];
+extern const sal_uLong nVCLDitherLut[ 256 ];
+extern const sal_uLong nVCLLut[ 256 ];
+
struct BitmapBuffer;
class SalBitmap;
class BitmapPalette;
commit feec4bfb9df7bc33a6093a397614d085e63cc708
Author: Tor Lillqvist
Date: Thu Jul 2 12:42:25 2015 +0300
Bin unused declarations
Change-Id: I0ebedfdefee4ba452b42eb695d949aeff24a5df0
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index ed69b48..6223de1 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -27,12 +27,6 @@
#include
#include
-extern const sal_uLong nVCLRLut[ 6 ];
-extern const sal_uLong nVCLGLut[ 6 ];
-extern const sal_uLong nVCLBLut[ 6 ];
-extern const sal_uLong nVCLDitherLut[ 256 ];
-extern const sal_uLong nVCLLut[ 256 ];
-
void OutputDevice::DrawMask( const Point& rDestPt,
const Bitmap& rBitmap, const Color& rMaskColor )
{
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index b031ef4..bfa8384 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -29,12 +29,6 @@
#include "outdata.hxx"
#include "salgdi.hxx"
-extern const sal_uLong nVCLRLut[ 6 ];
-extern const sal_uLong nVCLGLut[ 6 ];
-extern const sal_uLong nVCLBLut[ 6 ];
-extern const sal_uLong nVCLDitherLut[ 256 ];
-extern const sal_uLong nVCLLut[ 256 ];
-
Color OutputDevice::GetPixel( const Point& rPt ) const
{
___
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/control/button.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit b45040d1ec1a0b765f1b2284fffaed2b17b6227b Author: Miklos Vajna Date: Thu Jul 2 12:09:59 2015 +0200 tdf#92443 PushButton::ImplDrawPushButtonFrame: fix Invalidate() loop Regression from commit 32a776c83b86db3efaa7177c479e9327f28fbf46 (Refactor Buttons to use RenderContext when painting, 2015-05-05), the problem was that we started to call vcl::Window::SetSettings(), which invokes Invalidate(), which should not happen, since we're in Paint(). Fix this by restoring the old behavior of calling OutputDevice::SetSettings() directly again. Change-Id: I57c8e7947764e8cdc2d144be2dd140d3c408255d diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 35c0262..0c330d6 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -729,9 +729,13 @@ void PushButton::ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, StyleSettings aStyleSettings = aSettings.GetStyleSettings(); aStyleSettings.Set3DColors(GetControlBackground()); aSettings.SetStyleSettings(aStyleSettings); -rRenderContext.SetSettings(aSettings); + +// Call OutputDevice::SetSettings() explicitly, as rRenderContext may +// be a vcl::Window in fact, and vcl::Window::SetSettings() will call +// Invalidate(), which is a problem, since we're in Paint(). +rRenderContext.OutputDevice::SetSettings(aSettings); rRect = aDecoView.DrawButton(rRect, nStyle); -rRenderContext.SetSettings(aOldSettings); +rRenderContext.OutputDevice::SetSettings(aOldSettings); } else rRect = aDecoView.DrawButton(rRect, nStyle); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source writerfilter/source
include/oox/vml/vmlshape.hxx |1
include/oox/vml/vmltextbox.hxx|1
oox/source/vml/vmlshape.cxx | 77 --
oox/source/vml/vmlshapecontext.cxx|1
oox/source/vml/vmltextboxcontext.cxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 77 +-
6 files changed, 151 insertions(+), 8 deletions(-)
New commits:
commit 091fe76b6329b4bb974987554369cbfadd8f2401
Author: Justin Luth
Date: Tue Jun 30 12:55:18 2015 +0300
tdf#87348 implement mso-next-textbox vml-style textbox chaining import
Change-Id: Ic62769cf5bb1589dd4de3a66b3d7dd896e5b5711
Reviewed-on: https://gerrit.libreoffice.org/16366
Reviewed-by: Justin Luth
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 6cc180c..e4b5c92 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -58,6 +58,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4;
struct OOX_DLLPUBLIC ShapeTypeModel
{
OUString maShapeId; ///< Unique identifier of the shape.
+OUString maLegacyId; ///< Plaintext identifier of the
shape.
OUString maShapeName;///< Name of the shape, if present.
OptValue< sal_Int32 > moShapeType; ///< Builtin shape type
identifier.
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 3ff88d4..6b14c4c 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -95,6 +95,7 @@ public:
bool borderDistanceSet;
int borderDistanceLeft, borderDistanceTop, borderDistanceRight,
borderDistanceBottom;
OUString maLayoutFlow;
+OUString msNextTextbox;
private:
typedef ::std::vector< TextPortionModel > PortionVector;
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 55b17d9..2c2f6eb 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -312,21 +312,64 @@ Reference< XShape > ShapeBase::convertAndInsert( const
Reference< XShapes >& rxS
if( aShapeProp.hasProperty( PROP_Name ) )
aShapeProp.setProperty( PROP_Name, getShapeName() );
uno::Reference< lang::XServiceInfo > xSInfo( xShape,
uno::UNO_QUERY_THROW );
+
+OUString sLinkChainName = getTypeModel().maLegacyId;
+sal_Int32 id = 0;
+sal_Int32 idPos = sLinkChainName.indexOf("_x");
+sal_Int32 seq = 0;
+sal_Int32 seqPos = sLinkChainName.indexOf("_s",idPos);
+if( idPos >= 0 && idPos < seqPos )
+{
+id = sLinkChainName.copy(idPos+2,seqPos-idPos+2).toInt32();
+seq = sLinkChainName.copy(seqPos+2).toInt32();
+}
+
+OUString s_mso_next_textbox;
+if( getTextBox() )
+s_mso_next_textbox = getTextBox()->msNextTextbox;
+if( s_mso_next_textbox.startsWith("#") )
+s_mso_next_textbox = s_mso_next_textbox.copy(1);
+
if (xSInfo->supportsService("com.sun.star.text.TextFrame"))
{
uno::Sequence aGrabBag;
uno::Reference propertySet (xShape,
uno::UNO_QUERY);
propertySet->getPropertyValue("FrameInteropGrabBag") >>=
aGrabBag;
-sal_Int32 length = aGrabBag.getLength();
+sal_Int32 length;
+length = aGrabBag.getLength();
aGrabBag.realloc( length+1 );
aGrabBag[length].Name = "VML-Z-ORDER";
aGrabBag[length].Value = uno::makeAny(
maTypeModel.maZIndex.toInt32() );
+
+if( !s_mso_next_textbox.isEmpty() )
+{
+length = aGrabBag.getLength();
+aGrabBag.realloc( length+1 );
+aGrabBag[length].Name = "mso-next-textbox";
+aGrabBag[length].Value = uno::makeAny(
s_mso_next_textbox );
+}
+
+if( !sLinkChainName.isEmpty() )
+{
+length = aGrabBag.getLength();
+aGrabBag.realloc( length+4 );
+aGrabBag[length].Name = "TxbxHasLink";
+aGrabBag[length].Value = uno::makeAny( true );
+aGrabBag[length+1].Name = "Txbx-Id";
+aGrabBag[length+1].Value = uno::makeAny( id );
+aGrabBag[length+2].Name = "Txbx-Seq";
+aGrabBag[length+2].Value = uno::makeAny( seq );
+aGrabBag[length+3].Name = "LinkChainName";
+aGrabBag[length+3].Value = uno::makeAny(
s
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/cfaf0a580920727002510c996b5a83beb2e2a308/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/simpleauthenticationrequest.hxx |8 ++-
ucb/source/ucp/cmis/auth_provider.cxx |2
ucb/source/ucp/cmis/cmis_content.cxx |4 -
ucbhelper/source/provider/simpleauthenticationrequest.cxx | 32 ++
4 files changed, 31 insertions(+), 15 deletions(-)
New commits:
commit a2425b462886f09cdf272d20473bd6a225b8178a
Author: Szymon KÅos
Date: Thu Jul 2 11:24:39 2015 +0200
tdf#84190 : when auth fails, don't remember passwords for cmis
Change-Id: Ia1e0d553556693e0efa6de0bfc6f8b0ae9d40b5d
diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx
b/include/ucbhelper/simpleauthenticationrequest.hxx
index 85e949e..7bc5a40 100644
--- a/include/ucbhelper/simpleauthenticationrequest.hxx
+++ b/include/ucbhelper/simpleauthenticationrequest.hxx
@@ -60,8 +60,9 @@ private:
bool bCanSetUserName,
bool bCanSetPassword,
bool bCanSetAccount,
- bool bAllowPersistentStoring,
- bool bAllowUseSystemCredentials );
+ bool bAllowPersistentStoring,
+ bool bAllowUseSystemCredentials,
+ bool bAllowSessionStoring = true );
public:
/** Specification whether some entity (realm, username, password, account)
@@ -97,7 +98,8 @@ public:
const OUString & rPassword,
const OUString & rAccount,
bool bAllowPersistentStoring,
- bool bAllowUseSystemCredentials );
+ bool bAllowUseSystemCredentials,
+ bool bAllowSessionStoring = true );
/**
diff --git a/ucb/source/ucp/cmis/auth_provider.cxx
b/ucb/source/ucp/cmis/auth_provider.cxx
index 97414f1..500b601 100644
--- a/ucb/source/ucp/cmis/auth_provider.cxx
+++ b/ucb/source/ucp/cmis/auth_provider.cxx
@@ -38,7 +38,7 @@ namespace cmis
m_sUrl, m_sBindingUrl, OUString(),
STD_TO_OUSTR( username ),
STD_TO_OUSTR( password ),
-OUString(), true, false );
+OUString(), true, false, false );
xIH->handle( xRequest.get() );
rtl::Reference< ucbhelper::InteractionContinuation > xSelection
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index b54c246..34f5b9f 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -362,7 +362,6 @@ namespace cmis
ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_SECRET ) );
}
-
m_pSession = libcmis::SessionFactory::createSession(
OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
rUsername, rPassword, OUSTR_TO_STDSTR(
m_aURL.getRepositoryId( ) ), false, oauth2Data );
@@ -372,7 +371,8 @@ namespace cmis
uno::Sequence< uno::Any >( 0 ),
xEnv,
OUString( ) );
-m_pProvider->registerSession( sSessionId, m_pSession );
+else
+m_pProvider->registerSession( sSessionId, m_pSession );
}
else
{
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index cdaa80a..ad6c9cd 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -33,7 +33,8 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
const OUString & rPassword,
const OUString & rAccount,
bool bAllowPersistentStoring,
- bool bAllowUseSystemCredentials )
+ bool bAllowUseSystemCredentials,
+ bool bAllowSessionStoring )
{
// Fill request...
@@ -61,7 +62,8 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
true,
aRequest.HasAccount,
bAllowPersistentStoring,
- bAllowUseSystemCredentials );
+ bAllowUseSystemCredentials,
+ bAllowSessionStoring );
}
@@ -115,17 +117,29 @@ void SimpleAuthenticationRequest::initialize(
bool bCanSetPassword,
bool bCanSetAccount,
bool bAllowPersistentStoring,
- bool bAllowUseSystemCredentials )
+ bool bAllowUseSystemCredentials,
+ bool bAllowSessionStoring )
{
setRequest( uno::makeAny( rRequest ) );
// Fill continuations...
-uno::Sequence< ucb::Rememb
[Libreoffice-commits] core.git: dbaccess/source svtools/source
dbaccess/source/ui/querydesign/TableWindowAccess.cxx |4 ++--
dbaccess/source/ui/relationdesign/RelationDesignView.cxx |2 +-
svtools/source/contnr/treelistbox.cxx|3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 996b16dcb590ebf779f5d95caf15e9ab18036b07
Author: Michael Meeks
Date: Wed Jul 1 21:22:34 2015 +0100
tdf#92434 - A series of hideous knock-on dbaccess crasher fixes.
Focus events during dispose, unfortunate incoming a11y events, etc.
Change-Id: Iee296b767839904f5f330786891bc2513ca06c0c
Reviewed-on: https://gerrit.libreoffice.org/16672
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 82580fc..eb1941a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -105,7 +105,7 @@ namespace dbaui
{
::osl::MutexGuard aGuard( m_aMutex );
Reference< XAccessible > aRet;
-if(m_pTable)
+if(m_pTable && !m_pTable->IsDisposed())
{
switch(i)
{
@@ -151,7 +151,7 @@ namespace dbaui
{
::osl::MutexGuard aGuard( m_aMutex );
Reference< XAccessible > aRet;
-if( m_pTable )
+if(m_pTable && !m_pTable->IsDisposed())
{
Point aPoint(_aPoint.X,_aPoint.Y);
Rectangle aRect(m_pTable->GetDesktopRectPixel());
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 72e75de..5e7f370 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -69,7 +69,7 @@ bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
bool nDone = false;
if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
{
-if(!m_pTableView->HasChildPathFocus())
+if(m_pTableView && !m_pTableView->HasChildPathFocus())
{
m_pTableView->GrabTabWinFocus();
nDone = true;
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index e4d8319..6114df9 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -444,7 +444,8 @@ VCL_BUILDER_DECL_FACTORY(SvTreeListBox)
void SvTreeListBox::Clear()
{
-pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared()
+if (pModel)
+pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared()
}
void SvTreeListBox::EnableEntryMnemonics( bool _bEnable )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/JoinTableView.cxx | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 356bc0f697299e5fb6156ce25dc69845eaa6f9e6
Author: Michael Meeks
Date: Wed Jul 1 19:03:55 2015 +0100
tdf#92434 - fix iteration, and remember to disposeAndClear.
Change-Id: Id9c7b33689ea51a18394a96acbb9c08d67992942
Reviewed-on: https://gerrit.libreoffice.org/16671
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 32adfa6..1586cd9 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -246,7 +246,7 @@ sal_uLong OJoinTableView::GetTabWinCount()
return m_aTableMap.size();
}
-bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,bool _bDelete )
+bool OJoinTableView::RemoveConnection( OTableConnection* _pConn, bool _bDelete
)
{
DeselectConn(_pConn);
@@ -255,8 +255,12 @@ bool OJoinTableView::RemoveConnection( OTableConnection*
_pConn,bool _bDelete )
m_pView->getController().removeConnectionData( _pConn->GetData() );
-m_vTableConnection.erase(
-
::std::find(m_vTableConnection.begin(),m_vTableConnection.end(),_pConn) );
+auto it =
::std::find(m_vTableConnection.begin(),m_vTableConnection.end(),_pConn);
+if (it != m_vTableConnection.end())
+{
+it->disposeAndClear();
+m_vTableConnection.erase( it );
+}
modified();
if ( m_pAccessible )
@@ -983,10 +987,13 @@ void OJoinTableView::ClearAll()
HideTabWins();
// and the same with the Connections
-auto aIter = m_vTableConnection.begin();
-auto aEnd = m_vTableConnection.end();
-for(;aIter != aEnd;++aIter)
-RemoveConnection( *aIter ,true);
+while(true)
+{
+auto aIter = m_vTableConnection.begin();
+if (aIter == m_vTableConnection.end())
+break;
+RemoveConnection(*aIter, true);
+}
m_vTableConnection.clear();
m_pLastFocusTabWin = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/icons/breeze/lc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/breeze/lc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/breeze/lc_arrowshapes.down-arrow.png |binary librelogo/source/icons/breeze/lc_arrowshapes.up-arrow.png |binary librelogo/source/icons/breeze/lc_basicstop.png |binary librelogo/source/icons/breeze/lc_editglossary.png |binary librelogo/source/icons/breeze/lc_navigationbarleft.png |binary librelogo/source/icons/breeze/lc_newdoc.png |binary librelogo/source/icons/breeze/lc_runbasic.png |binary librelogo/source/icons/breeze/sc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/breeze/sc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/breeze/sc_arrowshapes.down-arrow.png |binary librelogo/source/icons/breeze/sc_arrowshapes.up-arrow.png |binary librelogo/source/icons/breeze/sc_basicstop.png |binary librelogo/source/icons/breeze/sc_editglossary.png |binary librelogo/source/icons/breeze/sc_navigationbarleft.png |binary librelogo/source/icons/breeze/sc_newdoc.png |binary librelogo/source/icons/breeze/sc_runbasic.png |binary 18 files changed New commits: commit c74ac32544c2be241e5a5ce4de01dc0bd3b6cde9 Author: Jan Holesovsky Date: Thu Jul 2 11:15:10 2015 +0200 tdf#92287: Store the Breeze icons for LibreLogo in a subdir. Change-Id: Ib0492a20a83deba2dc4a59a4277072cf140b12c6 diff --git a/librelogo/source/icons/breeze/lc_arrowshapes.circular-arrow.png b/librelogo/source/icons/breeze/lc_arrowshapes.circular-arrow.png new file mode 100644 index 000..9a7169f Binary files /dev/null and b/librelogo/source/icons/breeze/lc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/breeze/lc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/breeze/lc_arrowshapes.circular-leftarrow.png new file mode 100644 index 000..30dcee1 Binary files /dev/null and b/librelogo/source/icons/breeze/lc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/breeze/lc_arrowshapes.down-arrow.png b/librelogo/source/icons/breeze/lc_arrowshapes.down-arrow.png new file mode 100644 index 000..06fcf4b Binary files /dev/null and b/librelogo/source/icons/breeze/lc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/breeze/lc_arrowshapes.up-arrow.png b/librelogo/source/icons/breeze/lc_arrowshapes.up-arrow.png new file mode 100644 index 000..a700d12 Binary files /dev/null and b/librelogo/source/icons/breeze/lc_arrowshapes.up-arrow.png differ diff --git a/librelogo/source/icons/breeze/lc_basicstop.png b/librelogo/source/icons/breeze/lc_basicstop.png new file mode 100644 index 000..ef0957c Binary files /dev/null and b/librelogo/source/icons/breeze/lc_basicstop.png differ diff --git a/librelogo/source/icons/breeze/lc_editglossary.png b/librelogo/source/icons/breeze/lc_editglossary.png new file mode 100644 index 000..19b186e Binary files /dev/null and b/librelogo/source/icons/breeze/lc_editglossary.png differ diff --git a/librelogo/source/icons/breeze/lc_navigationbarleft.png b/librelogo/source/icons/breeze/lc_navigationbarleft.png new file mode 100644 index 000..b8f41b1 Binary files /dev/null and b/librelogo/source/icons/breeze/lc_navigationbarleft.png differ diff --git a/librelogo/source/icons/breeze/lc_newdoc.png b/librelogo/source/icons/breeze/lc_newdoc.png new file mode 100644 index 000..75cbc0f Binary files /dev/null and b/librelogo/source/icons/breeze/lc_newdoc.png differ diff --git a/librelogo/source/icons/breeze/lc_runbasic.png b/librelogo/source/icons/breeze/lc_runbasic.png new file mode 100644 index 000..69ca7c5 Binary files /dev/null and b/librelogo/source/icons/breeze/lc_runbasic.png differ diff --git a/librelogo/source/icons/breeze/sc_arrowshapes.circular-arrow.png b/librelogo/source/icons/breeze/sc_arrowshapes.circular-arrow.png new file mode 100644 index 000..b05d9e1 Binary files /dev/null and b/librelogo/source/icons/breeze/sc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/breeze/sc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/breeze/sc_arrowshapes.circular-leftarrow.png new file mode 100644 index 000..95c5713 Binary files /dev/null and b/librelogo/source/icons/breeze/sc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/breeze/sc_arrowshapes.down-arrow.png b/librelogo/source/icons/breeze/sc_arrowshapes.down-arrow.png new file mode 100644 index 000..3b195bd Binary files /dev/null and b/librelogo/source/icons/breeze/sc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/breeze/sc_arrowshapes.up-arrow.png b/librelogo/source/icons/breeze/sc_arrowshapes.up-arr
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/icons/lc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/lc_arrowshapes.down-arrow.png |binary librelogo/source/icons/lc_arrowshapes.up-arrow.png |binary librelogo/source/icons/lc_basicstop.png |binary librelogo/source/icons/lc_editglossary.png |binary librelogo/source/icons/lc_navigationbarleft.png |binary librelogo/source/icons/lc_newdoc.png |binary librelogo/source/icons/lc_runbasic.png |binary librelogo/source/icons/sc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/sc_arrowshapes.down-arrow.png |binary librelogo/source/icons/sc_arrowshapes.up-arrow.png |binary librelogo/source/icons/sc_basicstop.png |binary librelogo/source/icons/sc_editglossary.png |binary librelogo/source/icons/sc_navigationbarleft.png |binary librelogo/source/icons/sc_newdoc.png |binary librelogo/source/icons/sc_runbasic.png |binary 18 files changed New commits: commit 721ffdf6f6d163885aa2612a65b8231504a14b2b Author: Jan Holesovsky Date: Thu Jul 2 11:11:04 2015 +0200 Revert "Related: tdf#92287 Breeze: change LogoToolbar icons into breeze icons" We don't have a mechanism to use different icon set for extensions; let's do it at some stage, but until then, please let's not modify the icons to breeze only. This reverts commit 48ecae47a5d1911296549fd31378ff07b402d2ab. diff --git a/librelogo/source/icons/lc_arrowshapes.circular-arrow.png b/librelogo/source/icons/lc_arrowshapes.circular-arrow.png index 9a7169f..b7a5a92 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.circular-arrow.png and b/librelogo/source/icons/lc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png index 30dcee1..ad21978 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png and b/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.down-arrow.png b/librelogo/source/icons/lc_arrowshapes.down-arrow.png index 06fcf4b..d3b81b9 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.down-arrow.png and b/librelogo/source/icons/lc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.up-arrow.png b/librelogo/source/icons/lc_arrowshapes.up-arrow.png index a700d12..6ae84ab 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.up-arrow.png and b/librelogo/source/icons/lc_arrowshapes.up-arrow.png differ diff --git a/librelogo/source/icons/lc_basicstop.png b/librelogo/source/icons/lc_basicstop.png index ef0957c..ab9bddb 100644 Binary files a/librelogo/source/icons/lc_basicstop.png and b/librelogo/source/icons/lc_basicstop.png differ diff --git a/librelogo/source/icons/lc_editglossary.png b/librelogo/source/icons/lc_editglossary.png index 19b186e..fcba68f 100644 Binary files a/librelogo/source/icons/lc_editglossary.png and b/librelogo/source/icons/lc_editglossary.png differ diff --git a/librelogo/source/icons/lc_navigationbarleft.png b/librelogo/source/icons/lc_navigationbarleft.png index b8f41b1..7e69c80 100644 Binary files a/librelogo/source/icons/lc_navigationbarleft.png and b/librelogo/source/icons/lc_navigationbarleft.png differ diff --git a/librelogo/source/icons/lc_newdoc.png b/librelogo/source/icons/lc_newdoc.png index 75cbc0f..8e18798 100644 Binary files a/librelogo/source/icons/lc_newdoc.png and b/librelogo/source/icons/lc_newdoc.png differ diff --git a/librelogo/source/icons/lc_runbasic.png b/librelogo/source/icons/lc_runbasic.png index 69ca7c5..da2d9d9 100644 Binary files a/librelogo/source/icons/lc_runbasic.png and b/librelogo/source/icons/lc_runbasic.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.circular-arrow.png b/librelogo/source/icons/sc_arrowshapes.circular-arrow.png index b05d9e1..35a5e97 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.circular-arrow.png and b/librelogo/source/icons/sc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png index 95c5713..626 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png and b/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.down-arrow.png b/librelogo/source/icons/sc_arrowshapes.down-arrow.png index 3b195bd..7290cae 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.down-arrow.png and b/librelogo/source/icon
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - svx/source vcl/source
svx/source/svdraw/sdrpaintwindow.cxx |4 ++--
vcl/source/window/window.cxx |3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 08c6d3b1805e06165a85b7861c61a0c662cc8c31
Author: Miklos Vajna
Date: Wed Jul 1 10:55:37 2015 +0200
SdrPaintWindow: no own buffer for rendercontext-enabled vcl::Windows
The buffered overlay manager paints using a timer, which is problematic
if the given vcl::Window already supports double-buffering itself, so
always use direct (to the rendercontext) painting in that case.
Change-Id: I93144c02814fd511f333224ab058374c7da369f0
(cherry picked from commit 25ade7450ce41a46094d63123eabdf32bd68c918)
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index e75acd8..d8f0c03 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -201,8 +201,9 @@ void SdrPaintWindow::impCreateOverlayManager()
// is it a window?
if(OUTDEV_WINDOW == GetOutputDevice().GetOutDevType())
{
+vcl::Window* pWindow =
dynamic_cast(&GetOutputDevice());
// decide which OverlayManager to use
-if(GetPaintView().IsBufferedOverlayAllowed() && mbUseBuffer)
+if(GetPaintView().IsBufferedOverlayAllowed() && mbUseBuffer &&
!pWindow->SupportsDoubleBuffering())
{
// buffered OverlayManager, buffers its background and
refreshes from there
// for pure overlay changes (no system redraw). The 3rd
parameter specifies
@@ -225,7 +226,6 @@ void SdrPaintWindow::impCreateOverlayManager()
// Request a repaint so that the buffered overlay manager fills
// its buffer properly. This is a workaround for missing buffer
// updates.
-vcl::Window* pWindow =
dynamic_cast(&GetOutputDevice());
if (pWindow != NULL)
pWindow->Invalidate();
commit be8bf4b6cb6288161be0d2f63207711b002a36e5
Author: Miklos Vajna
Date: Wed Jul 1 10:44:43 2015 +0200
vcl::Window::SupportsDoubleBuffering: respect
VCL_DOUBLEBUFFERING_FORCE_ENABLE
Double buffering default is false, then can be enabled on a per-widget
basis, finally this can be overriden at runtime by the
VCL_DOUBLEBUFFERING_FORCE_ENABLE environment variable (so that
everything is painted using double buffering).
Let SupportsDoubleBuffering() also respect this variable, so code
calling SupportsDoubleBuffering() can react to the runtime override,
too.
Change-Id: Ic9a1c00a801f6976069d7cfc47c3fa491ebc1ff0
(cherry picked from commit 7df3879d3f6222b840724ae748bdf8bf6a7af9f1)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 757b2d1..372ea7d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3943,7 +3943,8 @@ vcl::RenderSettings& Window::GetRenderSettings()
bool Window::SupportsDoubleBuffering() const
{
-return mpWindowImpl->mbDoubleBuffering;
+static bool bDoubleBuffering = getenv("VCL_DOUBLEBUFFERING_FORCE_ENABLE");
+return mpWindowImpl->mbDoubleBuffering || bDoubleBuffering;
}
void Window::SetDoubleBuffering(bool bDoubleBuffering)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/registry registry/source store/source
include/registry/reflread.hxx | 233 -- include/registry/reflwrit.hxx | 129 --- include/registry/registry.hxx | 92 registry/source/keyimpl.hxx |3 store/source/storbase.hxx | 34 -- store/source/stordata.hxx | 35 -- store/source/stortree.hxx |7 - 7 files changed, 3 insertions(+), 530 deletions(-) New commits: commit 081ae7a734381dffe0aece7ea8d3c412f602df38 Author: Noel Grandin Date: Thu Jul 2 09:18:06 2015 +0200 loplugin:unusedmethods registry,store Change-Id: Ie78eb881a7fc47d0cd7b9862bd0cd200153ce77d Reviewed-on: https://gerrit.libreoffice.org/16679 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/registry/reflread.hxx b/include/registry/reflread.hxx index 1f4938e..a298909 100644 --- a/include/registry/reflread.hxx +++ b/include/registry/reflread.hxx @@ -123,24 +123,6 @@ public: /// Assign operator inline RegistryTypeReader& operator == (const RegistryTypeReader& toAssign); -/// checks if the registry type reader points to a valid Api. -inline bool isValid() const; - -/** @deprecated -returns the minor version number. - -We currently don't support a versioning concept of IDL interfaces and -so this function is currently not used. - */ -inline sal_uInt16 getMinorVersion() const; - -/** @deprecated -returns the major version number. - -We currently don't support a versioning concept of IDL interfaces and -so this function is currently not used. - */ -inline sal_uInt16 getMajorVersion() const; /** returns the typeclass of the type represented by this blob. @@ -157,23 +139,6 @@ public: */ inline rtl::OUString getSuperTypeName() const; -/** @deprecated -returns the unique identifier for an interface type as an out parameter. - -An earlier version of UNO used an unique identifier for interfaces. In the -current version of UNO this uik was eliminated and this function is -not longer used. - */ -inline void getUik(RTUik& uik) const; - -/** returns the documentation string of this type. - */ -inline rtl::OUString getDoku() const; - -/** returns the IDL filename where the type is defined. - */ -inline rtl::OUString getFileName() const; - /** returns the number of fields (attributes/properties, enum values or number of constants in a module). @@ -211,98 +176,6 @@ public: */ inline rtl::OUString getFieldFileName( sal_uInt16 index ) const; -/** returns the number of methods of an interface type. - */ -inline sal_uInt32 getMethodCount() const; - -/** returns the name of the method specified by index. - */ -inline rtl::OUString getMethodName( sal_uInt16 index ) const; - -/** returns number of parameters of the method specified by index. - */ -inline sal_uInt32 getMethodParamCount( sal_uInt16 index ) const; - -/** returns the full qualified parameter typename. - -@param index indicates the method -@param paramIndex indeciates the parameter which type will be returned. - */ -inline rtl::OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const; - -/** returns the name of a parameter. - -@param index indicates the method -@param paramIndex indiciates the parameter which name will be returned. - */ -inline rtl::OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const; - -/** returns the parameter mode, if it is an in, out or inout parameter. - -@param index indicates the method -@param paramIndex indeciates the parameter which mode will be returned. - */ -inline RTParamMode getMethodParamMode( sal_uInt16 index, sal_uInt16 paramIndex ) const; - -/** returns the number of exceptions which are declared for the method specified by index. - -@param index indicates the method - */ -inline sal_uInt32 getMethodExcCount( sal_uInt16 index ) const; - -/** returns the full qualified exception type of the specified exception. - -@param index indicates the method -@param excIndex indeciates the exception which typename will be returned. - */ -inline rtl::OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const; - -/** returns the full qualified return type of the method specified by index. - */ -inline rtl::OUString getMethodReturnType( sal_uInt16 index ) const; - -/** returns the full qualified exception type of the specified exception. - -@param index indicates the method - */ -inline RTMethodMode getMethodMode( sal_uInt16 index ) const; - -/** returns the documentation string of the method specified by index. - -@param i
[Libreoffice-commits] core.git: basic/source
basic/source/comp/exprgen.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e7fe5087487cab0bb0173c84f91e1cf843d963e
Author: Miklos Vajna
Date: Thu Jul 2 10:24:59 2015 +0200
error: 'pGen' was not declared in this scope
Change-Id: I6ebf100be3a90b315491e2735da9c82e5901fc59
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index df46923..c0e619c 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -173,7 +173,7 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode
eOp )
{
#ifdef DBG_UTIL
if ((eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM &&
eOp != _FIND_STATIC)
-pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
+rGen.GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
#endif
SbiSymDef* pDef = aVar.pDef;
// The ID is either the position or the String-ID
___
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/layout/frmtool.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ef46186bbab756442db1b7c12cd1902c138c737e
Author: Miklos Vajna
Date: Thu Jul 2 09:56:33 2015 +0200
coverity#1309050 pLayout might be 0 here
Change-Id: I5756c033e173faaba373c145b15a07e275453643
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 6a7e0c2..aa1e2db 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3317,7 +3317,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify
const& rMod, sal_uInt1
{
SwObjectFormatter::FormatObj( *pFlyFrm );
}
-pTmpFrm->Calc(pLayout->GetCurrShell()->GetOut());
+pTmpFrm->Calc(pLayout ?
pLayout->GetCurrShell()->GetOut() : 0);
}
// #127369#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/icons/lc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/lc_arrowshapes.down-arrow.png |binary librelogo/source/icons/lc_arrowshapes.up-arrow.png |binary librelogo/source/icons/lc_basicstop.png |binary librelogo/source/icons/lc_editglossary.png |binary librelogo/source/icons/lc_navigationbarleft.png |binary librelogo/source/icons/lc_newdoc.png |binary librelogo/source/icons/lc_runbasic.png |binary librelogo/source/icons/sc_arrowshapes.circular-arrow.png |binary librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png |binary librelogo/source/icons/sc_arrowshapes.down-arrow.png |binary librelogo/source/icons/sc_arrowshapes.up-arrow.png |binary librelogo/source/icons/sc_basicstop.png |binary librelogo/source/icons/sc_editglossary.png |binary librelogo/source/icons/sc_navigationbarleft.png |binary librelogo/source/icons/sc_newdoc.png |binary librelogo/source/icons/sc_runbasic.png |binary 18 files changed New commits: commit 48ecae47a5d1911296549fd31378ff07b402d2ab Author: andreask Date: Thu Jul 2 00:05:28 2015 +0200 Related: tdf#92287 Breeze: change LogoToolbar icons into breeze icons Change-Id: I8e576afc2d7d57b6b3d56788e69fc5e1fa3c39ab diff --git a/librelogo/source/icons/lc_arrowshapes.circular-arrow.png b/librelogo/source/icons/lc_arrowshapes.circular-arrow.png index b7a5a92..9a7169f 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.circular-arrow.png and b/librelogo/source/icons/lc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png index ad21978..30dcee1 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png and b/librelogo/source/icons/lc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.down-arrow.png b/librelogo/source/icons/lc_arrowshapes.down-arrow.png index d3b81b9..06fcf4b 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.down-arrow.png and b/librelogo/source/icons/lc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/lc_arrowshapes.up-arrow.png b/librelogo/source/icons/lc_arrowshapes.up-arrow.png index 6ae84ab..a700d12 100644 Binary files a/librelogo/source/icons/lc_arrowshapes.up-arrow.png and b/librelogo/source/icons/lc_arrowshapes.up-arrow.png differ diff --git a/librelogo/source/icons/lc_basicstop.png b/librelogo/source/icons/lc_basicstop.png index ab9bddb..ef0957c 100644 Binary files a/librelogo/source/icons/lc_basicstop.png and b/librelogo/source/icons/lc_basicstop.png differ diff --git a/librelogo/source/icons/lc_editglossary.png b/librelogo/source/icons/lc_editglossary.png index fcba68f..19b186e 100644 Binary files a/librelogo/source/icons/lc_editglossary.png and b/librelogo/source/icons/lc_editglossary.png differ diff --git a/librelogo/source/icons/lc_navigationbarleft.png b/librelogo/source/icons/lc_navigationbarleft.png index 7e69c80..b8f41b1 100644 Binary files a/librelogo/source/icons/lc_navigationbarleft.png and b/librelogo/source/icons/lc_navigationbarleft.png differ diff --git a/librelogo/source/icons/lc_newdoc.png b/librelogo/source/icons/lc_newdoc.png index 8e18798..75cbc0f 100644 Binary files a/librelogo/source/icons/lc_newdoc.png and b/librelogo/source/icons/lc_newdoc.png differ diff --git a/librelogo/source/icons/lc_runbasic.png b/librelogo/source/icons/lc_runbasic.png index da2d9d9..69ca7c5 100644 Binary files a/librelogo/source/icons/lc_runbasic.png and b/librelogo/source/icons/lc_runbasic.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.circular-arrow.png b/librelogo/source/icons/sc_arrowshapes.circular-arrow.png index 35a5e97..b05d9e1 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.circular-arrow.png and b/librelogo/source/icons/sc_arrowshapes.circular-arrow.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png b/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png index 626..95c5713 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png and b/librelogo/source/icons/sc_arrowshapes.circular-leftarrow.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.down-arrow.png b/librelogo/source/icons/sc_arrowshapes.down-arrow.png index 7290cae..3b195bd 100644 Binary files a/librelogo/source/icons/sc_arrowshapes.down-arrow.png and b/librelogo/source/icons/sc_arrowshapes.down-arrow.png differ diff --git a/librelogo/source/icons/sc_arrowshapes.up-arrow.png b/librelogo/source/icons/sc_arrowshapes.up-arrow.png index 5f9bcc1..7fae96e 100644 Binary files a/li
[Libreoffice-commits] core.git: basic/source
basic/source/comp/exprgen.cxx | 40 +--
basic/source/comp/exprnode.cxx | 143 ++---
basic/source/comp/exprtree.cxx | 58
basic/source/inc/expr.hxx | 29
4 files changed, 129 insertions(+), 141 deletions(-)
New commits:
commit fabe32941233b697a5d918fba0526d24c648372f
Author: Arnaud Versini
Date: Sat Jun 27 22:15:18 2015 +0200
BASIC : Remove SbCodeGen attribute from SbiExprNode and user
std::unique_ptr.
Change-Id: I9f44f6a4b61987de960b77f54bac8cf2c981bd2a
Reviewed-on: https://gerrit.libreoffice.org/16551
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 22e59bb..df46923 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -56,7 +56,7 @@ static const OpTable aOpTable [] = {
{ NIL, _NOP }};
// Output of an element
-void SbiExprNode::Gen( RecursiveMode eRecMode )
+void SbiExprNode::Gen( SbiCodeGen& rGen, RecursiveMode eRecMode )
{
sal_uInt16 nStringId;
@@ -65,18 +65,18 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
switch( GetType() )
{
case SbxEMPTY:
-pGen->Gen( _EMPTY );
+rGen.Gen( _EMPTY );
break;
case SbxINTEGER:
-pGen->Gen( _CONST, (short) nVal );
+rGen.Gen( _CONST, (short) nVal );
break;
case SbxSTRING:
-nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, true );
-pGen->Gen( _SCONST, nStringId );
+nStringId = rGen.GetParser()->aGblStrings.Add( aStrVal, true );
+rGen.Gen( _SCONST, nStringId );
break;
default:
-nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
-pGen->Gen( _NUMBER, nStringId );
+nStringId = rGen.GetParser()->aGblStrings.Add( nVal, eType );
+rGen.Gen( _NUMBER, nStringId );
break;
}
}
@@ -122,7 +122,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
{
SbiProcDef* pProc = aVar.pDef->GetProcDef();
-if ( pGen->GetParser()->bClassModule )
+if ( rGen.GetParser()->bClassModule )
{
eOp = _FIND_CM;
}
@@ -135,33 +135,33 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
{
if( p == this && pWithParent_ != NULL )
{
-pWithParent_->Gen();
+pWithParent_->Gen(rGen);
}
-p->GenElement( eOp );
+p->GenElement( rGen, eOp );
eOp = _ELEM;
}
}
else if( IsTypeOf() )
{
-pLeft->Gen();
-pGen->Gen( _TESTCLASS, nTypeStrId );
+pLeft->Gen(rGen);
+rGen.Gen( _TESTCLASS, nTypeStrId );
}
else if( IsNew() )
{
-pGen->Gen( _CREATE, 0, nTypeStrId );
+rGen.Gen( _CREATE, 0, nTypeStrId );
}
else
{
-pLeft->Gen();
+pLeft->Gen(rGen);
if( pRight )
{
-pRight->Gen();
+pRight->Gen(rGen);
}
for( const OpTable* p = aOpTable; p->eTok != NIL; p++ )
{
if( p->eTok == eTok )
{
-pGen->Gen( p->eOp ); break;
+rGen.Gen( p->eOp ); break;
}
}
}
@@ -169,7 +169,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
// Output of an operand element
-void SbiExprNode::GenElement( SbiOpcode eOp )
+void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode eOp )
{
#ifdef DBG_UTIL
if ((eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM &&
eOp != _FIND_STATIC)
@@ -187,7 +187,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
aVar.pPar->Gen();
}
-pGen->Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
+rGen.Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
if( aVar.pvMorePar )
{
@@ -197,7 +197,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
{
SbiExprList* pExprList = *it;
pExprList->Gen();
-pGen->Gen( _ARRAYACCESS );
+rGen.Gen( _ARRAYACCESS );
}
}
}
@@ -260,7 +260,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
{
// special treatment for WITH
// If pExpr == .-term in With, approximately Gen for Basis-Object
-pExpr->Gen( eRecMode );
+pExpr->Gen( pParser->aGen, eRecMode );
if( bByVal )
{
pParser->aGen.Gen( _BYVAL );
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 2ddbc33..fecf642 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -26,54 +26,44 @@
#include "expr.hxx"
-SbiExprNode::SbiExprNode()
+SbiExprNode::SbiExprNode( SbiExprNode* l, SbiToken t, SbiExprNode* r ) :
+pLeft(l),
+pRight(r
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/ui/dialogs/XFilePicker.idl |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit fb2889512adf7d08a4083235a2fdabe080b5c8fa Author: Julien Nabet Date: Tue Jun 30 21:59:59 2015 +0200 Deprecate "getFiles" for "getSelectedFiles" from XFilePicker2.idl See http://nabble.documentfoundation.org/Multiselection-needs-work-td4153207.html Change-Id: Ieceecd04dd161d40054715f74a4351397f97addc Reviewed-on: https://gerrit.libreoffice.org/16630 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl index a273f87..1a7fa05 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl @@ -82,8 +82,6 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog If the dialog is in execution mode and a single file is selected the complete URL of this file will be returned. -If the dialog is in execution mode and multiple files are selected -an empty sequence will be returned. If the dialog is in execution mode and the selected file name is false or any other error occurs an empty sequence will be returned. @@ -109,6 +107,7 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog a checkbox "Automatic File Extension" which is checked and a valid filter is currently selected the dialog may automatically add an extension to the selected file name. +@deprecated use com::sun::star::ui::dialogs::XFilePicker2::getSelectedFiles instead */ sequence< string > getFiles(); }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Parts.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1465f96938373441db1e333c7b36d6dd8f120793
Author: Mihai Varga
Date: Thu Jul 2 10:26:29 2015 +0300
Updated control description
diff --git a/loleaflet/src/control/Control.Parts.js
b/loleaflet/src/control/Control.Parts.js
index c0e75d9..7d6d2a7 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -1,5 +1,5 @@
/*
- * L.Control.Zoom is used for the default zoom buttons on the map.
+ * L.Control.Parts is used to switch parts
*/
L.Control.Parts = L.Control.extend({
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source svx/source
svl/source/inc/passwordcontainer.hxx |2 +-
svl/source/passwordcontainer/passwordcontainer.cxx |2 +-
svx/source/svdraw/svdobj.cxx |1 +
3 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a9ad8444b8e1c47a47dc4ef6367335e3ccad59ea
Author: Caolán McNamara
Date: Thu Jul 2 08:23:17 2015 +0100
coverity#1309051 Uncaught exception
Change-Id: Ia1ae16d9560c1eac294e29445e71dcee49ed16ce
diff --git a/svl/source/inc/passwordcontainer.hxx
b/svl/source/inc/passwordcontainer.hxx
index df421b5..ba8e72f 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -248,7 +248,7 @@ private:
::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord >
CopyToUserRecordSequence(
const ::std::list< NamePassRecord >&
original,
const
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler
>& Handler )
-
throw(::com::sun::star::uno::RuntimeException);
+
throw(css::uno::RuntimeException, std::exception);
::com::sun::star::task::UserRecord CopyToUserRecord(
const NamePassRecord& aRecord,
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 6b8fa7f..5b807cd 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -623,7 +623,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const
NamePassRecord& aRecord, b
}
-Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const
list< NamePassRecord >& original, const Reference< XInteractionHandler >&
aHandler ) throw(RuntimeException)
+Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const
list< NamePassRecord >& original, const Reference< XInteractionHandler >&
aHandler ) throw(RuntimeException, std::exception)
{
Sequence< UserRecord > aResult( original.size() );
sal_uInt32 nInd = 0;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 9bf94f7..51b5e0d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1620,6 +1620,7 @@ void SdrObject::ImpSetAnchorPos(const Point& rPnt)
void SdrObject::NbcSetAnchorPos(const Point& rPnt)
{
+fprintf(stderr, "NbcSetAnchorPos %ld %ld\n", rPnt.X(), rPnt.Y());
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
aAnchor=rPnt;
NbcMove(aSiz); // This also calls SetRectsDirty()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
