Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/32bccdb8feebb1145cfb75e61c39c317b4931553/ 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
formula previews on export to word2003
Currently, when exporting a document with formulas in it to word2003 .DOC, previews' lower edges are place too high in the respective lines of the text (bug 88697). To me it seems like instead of the line's lower edge Y coordinate the line's baseline's Y coordinate is used -- but only for the generation and placement of the bitmapped preview -- opening the respective formula in word2003 regenerates the preview in the correct form. Where in the source (module, function(s)) are the coordinates for the (formulas on export) preview images determined? I'd like to have it quick fixed and wouldn't mind attempting to fix it myself. -Yury ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/newhelp.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit a76dcdfaa6c6d2b1d73fb1c96fe38dd7e452f48a
Author: Michael Meeks
Date: Sat May 16 12:59:20 2015 +0100
tdf#91259 - fix help browser focus issue post dispose.
Change-Id: I0b7758b6780dfbe88aff8f0fc1a93d93b9910d87
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 4a8ca07..e6c3b2b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2719,15 +2719,14 @@ void SfxHelpWindow_Impl::Split()
InitSizes();
}
-
-
void SfxHelpWindow_Impl::GetFocus()
{
-pTextWin->GrabFocus();
+if( pTextWin )
+pTextWin->GrabFocus();
+else
+vcl::Window::GetFocus();
}
-
-
void SfxHelpWindow_Impl::MakeLayout()
{
if ( nHeight > 0 && xWindow.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - dbaccess/source desktop/source include/vcl sd/source vcl/source
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 12
dbaccess/source/ui/app/AppDetailView.cxx | 12
dbaccess/source/ui/browser/dataview.cxx| 28
dbaccess/source/ui/control/marktree.cxx|6
dbaccess/source/ui/inc/ConnectionLine.hxx |2
dbaccess/source/ui/inc/JoinTableView.hxx |2
dbaccess/source/ui/inc/TableConnection.hxx |2
dbaccess/source/ui/inc/TableWindow.hxx |2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 14
dbaccess/source/ui/querydesign/TableConnection.cxx |4
dbaccess/source/ui/querydesign/TableWindow.cxx | 26
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 25
dbaccess/source/ui/relationdesign/RTableConnection.hxx |2
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 14
desktop/source/deployment/gui/dp_gui_extlistbox.cxx| 148 ++--
desktop/source/deployment/gui/dp_gui_extlistbox.hxx| 101 +--
desktop/source/splash/splash.cxx | 22
include/vcl/menu.hxx | 533 -
sd/source/ui/animations/CustomAnimationList.cxx| 25
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 84 +-
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 136 ++--
vcl/source/control/tabctrl.cxx | 165 ++---
vcl/source/window/floatwin.cxx | 55 -
vcl/source/window/menu.cxx | 411 +
vcl/source/window/menubarwindow.cxx| 92 +-
vcl/source/window/menubarwindow.hxx|4
vcl/source/window/menufloatingwindow.cxx | 151 ++--
vcl/source/window/menufloatingwindow.hxx | 129 ++--
28 files changed, 1077 insertions(+), 1130 deletions(-)
New commits:
commit 1902ebaa4b14c62ecec80b525fb43b7011fa4c29
Author: Tomaž Vajngerl
Date: Sat May 16 21:55:53 2015 +0900
cleanup FloatWindow
Change-Id: I214322303ae0f7c1a0e3cee0fea112f06a38f06c
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 413aeef..f7aca45 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -65,55 +65,58 @@ void FloatingWindow::ImplInit( vcl::Window* pParent,
WinBits nStyle )
mbInCleanUp = false;
mbGrabFocus = false;
-DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL!" );
+DBG_ASSERT(pParent, "FloatWindow::FloatingWindow(): - pParent == NULL!");
-if ( !pParent )
+if (!pParent)
pParent = ImplGetSVData()->maWinData.mpAppWin;
-DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL and
no AppWindow exists" );
+DBG_ASSERT(pParent, "FloatWindow::FloatingWindow(): - pParent == NULL and
no AppWindow exists");
// no Border, then we dont need a border window
-if ( !nStyle )
+if (!nStyle)
{
mpWindowImpl->mbOverlapWin = true;
nStyle |= WB_DIALOGCONTROL;
-SystemWindow::ImplInit( pParent, nStyle, NULL );
+SystemWindow::ImplInit(pParent, nStyle, NULL);
}
else
{
-if ( !(nStyle & WB_NODIALOGCONTROL) )
+if (!(nStyle & WB_NODIALOGCONTROL))
nStyle |= WB_DIALOGCONTROL;
-if( nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE |
WB_STANDALONE)
-&& !(nStyle & WB_OWNERDRAWDECORATION) )
+if (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE |
WB_STANDALONE)
+&& !(nStyle & WB_OWNERDRAWDECORATION))
{
WinBits nFloatWinStyle = nStyle;
// #99154# floaters are not closeable by default anymore, eg
fullscreen floater
// nFloatWinStyle |= WB_CLOSEABLE;
mpWindowImpl->mbFrame = true;
mpWindowImpl->mbOverlapWin = true;
-SystemWindow::ImplInit( pParent, nFloatWinStyle & ~WB_BORDER, NULL
);
+SystemWindow::ImplInit(pParent, nFloatWinStyle & ~WB_BORDER, NULL);
}
else
{
-ImplBorderWindow* pBorderWin;
-sal_uInt16 nBorderStyle = BORDERWINDOW_STYLE_BORDER |
BORDERWINDOW_STYLE_FLOAT;
+ImplBorderWindow* pBorderWin;
+sal_uInt16 nBorderStyle = BORDERWINDOW_STYLE_BORDER |
BORDERWINDOW_STYLE_FLOAT;
-if( nStyle & WB_OWNERDRAWDECORATION ) nBorderStyle |=
BORDERWINDOW_STYLE_FRAME;
-else nBorderStyle |=
BORDERWINDOW_STYLE_OVERLAP;
+if (nStyle & WB_OWNERDRAWDECORATION)
+nBorderStyle |= BORDERWINDOW_STYLE_FRAME;
+else
+nBorderStyle |= BORDERWINDOW_STYLE_OVERLAP;
-if ( (nStyle & WB_SYSTEMWINDOW) && !(nStyle & (WB_MOVEABLE |
WB_SIZEABLE)) )
+if ((nStyle & WB_SYSTEMWINDOW) && !(nStyle & (WB_MOVEABLE |
WB_SI
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.documentfoundation.org/show_bug.cgi?id=62475 --- Comment #32 from Tomaz Vajngerl --- Regarding the latest commit: Actually comments like "// namespace xy" and "// end namespace xy" are there for clarity so you don't wonder why there is a closing bracket all of a sudden. I always add them and I'm not really happy that some were removed. Additionally "/**" tag is recognized by doxygen - I'm not sure if "//" is recognized, it should be "///" for doxygen. -- 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 62475] Remove pointless comments and ASCII art
https://bugs.documentfoundation.org/show_bug.cgi?id=62475 --- Comment #33 from Kohei Yoshida --- /** */ tags are one of the standard ways of documenting class/struct/method etc. It's originally known as Javadoc and has been adopted by doxygen and other code documentation parsers. You shouldn't be replacing those with //'s. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/chart2/res/typebar_16.png |binary icon-themes/breeze/chart2/res/typecolumn_16.png |binary icon-themes/breeze/cmd/lc_drawchart.png |binary icon-themes/breeze/cmd/lc_insertobject.png |binary icon-themes/breeze/cmd/lc_insertobjectchart.png |binary icon-themes/breeze/cmd/lc_insertobjectdialog.png |binary icon-themes/breeze/cmd/lc_starchartdialog.png|binary icon-themes/breeze/cmd/sc_drawchart.png |binary icon-themes/breeze/cmd/sc_insertobject.png |binary icon-themes/breeze/cmd/sc_insertobjectchart.png |binary icon-themes/breeze/cmd/sc_insertobjectdialog.png |binary icon-themes/breeze/cmd/sc_starchartdialog.png|binary icon-themes/breeze/dbaccess/res/sc036.png|binary icon-themes/breeze/desktop/res/caution_16.png|binary icon-themes/breeze/sc/imglst/nc05.png|binary icon-themes/breeze/svx/res/ole.png |binary icon-themes/breeze/sw/imglst/nc20004.png |binary icon-themes/breeze/sw/imglst/sr20010.png |binary 18 files changed New commits: commit 242ea48f05742274817db0078f04032ab786617a Author: andreas_ka Date: Sat May 16 16:18:39 2015 +0200 Breeze: diagramm icon design The left column is too close to the Y-axis and there isnt a plus sign in the large icon. With the small one, the columns need to be larger and maybe the Y-axis doesnt need to be shown now with the right color setting Change-Id: I49ad3cdb1f7b76822bc44d499130110baf646d9f Reviewed-on: https://gerrit.libreoffice.org/15754 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/chart2/res/typebar_16.png b/icon-themes/breeze/chart2/res/typebar_16.png index 1b2197a..a73a146 100644 Binary files a/icon-themes/breeze/chart2/res/typebar_16.png and b/icon-themes/breeze/chart2/res/typebar_16.png differ diff --git a/icon-themes/breeze/chart2/res/typecolumn_16.png b/icon-themes/breeze/chart2/res/typecolumn_16.png index 039287f..1e5493a 100644 Binary files a/icon-themes/breeze/chart2/res/typecolumn_16.png and b/icon-themes/breeze/chart2/res/typecolumn_16.png differ diff --git a/icon-themes/breeze/cmd/lc_drawchart.png b/icon-themes/breeze/cmd/lc_drawchart.png index 63df604..54433f4 100644 Binary files a/icon-themes/breeze/cmd/lc_drawchart.png and b/icon-themes/breeze/cmd/lc_drawchart.png differ diff --git a/icon-themes/breeze/cmd/lc_insertobject.png b/icon-themes/breeze/cmd/lc_insertobject.png index 340e02d..54433f4 100644 Binary files a/icon-themes/breeze/cmd/lc_insertobject.png and b/icon-themes/breeze/cmd/lc_insertobject.png differ diff --git a/icon-themes/breeze/cmd/lc_insertobjectchart.png b/icon-themes/breeze/cmd/lc_insertobjectchart.png index cbef30f..54433f4 100644 Binary files a/icon-themes/breeze/cmd/lc_insertobjectchart.png and b/icon-themes/breeze/cmd/lc_insertobjectchart.png differ diff --git a/icon-themes/breeze/cmd/lc_insertobjectdialog.png b/icon-themes/breeze/cmd/lc_insertobjectdialog.png index c4e8761..d0b56c2 100644 Binary files a/icon-themes/breeze/cmd/lc_insertobjectdialog.png and b/icon-themes/breeze/cmd/lc_insertobjectdialog.png differ diff --git a/icon-themes/breeze/cmd/lc_starchartdialog.png b/icon-themes/breeze/cmd/lc_starchartdialog.png index d24f85b..d0b56c2 100644 Binary files a/icon-themes/breeze/cmd/lc_starchartdialog.png and b/icon-themes/breeze/cmd/lc_starchartdialog.png differ diff --git a/icon-themes/breeze/cmd/sc_drawchart.png b/icon-themes/breeze/cmd/sc_drawchart.png index 8aa4edf..1e5493a 100644 Binary files a/icon-themes/breeze/cmd/sc_drawchart.png and b/icon-themes/breeze/cmd/sc_drawchart.png differ diff --git a/icon-themes/breeze/cmd/sc_insertobject.png b/icon-themes/breeze/cmd/sc_insertobject.png index 8aa4edf..1e5493a 100644 Binary files a/icon-themes/breeze/cmd/sc_insertobject.png and b/icon-themes/breeze/cmd/sc_insertobject.png differ diff --git a/icon-themes/breeze/cmd/sc_insertobjectchart.png b/icon-themes/breeze/cmd/sc_insertobjectchart.png index 8aa4edf..1e5493a 100644 Binary files a/icon-themes/breeze/cmd/sc_insertobjectchart.png and b/icon-themes/breeze/cmd/sc_insertobjectchart.png differ diff --git a/icon-themes/breeze/cmd/sc_insertobjectdialog.png b/icon-themes/breeze/cmd/sc_insertobjectdialog.png index e949ee4..ca47d50 100644 Binary files a/icon-themes/breeze/cmd/sc_insertobjectdialog.png and b/icon-themes/breeze/cmd/sc_insertobjectdialog.png differ diff --git a/icon-themes/breeze/cmd/sc_starchartdialog.png b/icon-themes/breeze/cmd/sc_starchartdialog.png index 7e3ef5b..ca47d50 100644 Binary files a/icon-themes/breeze/cmd/sc_starchartdialog.png and b/icon-themes/breeze/cmd/sc_starchartdialog.png differ diff --git a/icon-themes/breeze/dbaccess/res/sc036.png b/icon-themes/breeze/dbaccess/res/sc036.png index 9992b06..f8594f7 100644 Binary files a/icon-themes/breeze/dbaccess/res/sc036.png and b/icon-themes/breeze/dbaccess/res/sc036.png differ diff --git a/
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png |binary icon-themes/breeze/cmd/sc_fontworkgalleryfloater.png |binary 2 files changed New commits: commit 3a6dee0c731bca754a6ae83944a726371785a399 Author: andreas_ka Date: Sat May 16 16:21:39 2015 +0200 Breeze: update fontworkgallery floater icon Change-Id: I9800f252e489dd3635b3ead92b362d05c059cd55 Reviewed-on: https://gerrit.libreoffice.org/15755 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png b/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png index 8c3b175..441d6a2 100644 Binary files a/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png and b/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png differ diff --git a/icon-themes/breeze/cmd/sc_fontworkgalleryfloater.png b/icon-themes/breeze/cmd/sc_fontworkgalleryfloater.png index 22a511b..5f42d50 100644 Binary files a/icon-themes/breeze/cmd/sc_fontworkgalleryfloater.png and b/icon-themes/breeze/cmd/sc_fontworkgalleryfloater.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 0ccdbe1bab51e5657c6888594bcf5655b86a72ea Author: Andras Timar Date: Sat May 16 17:03:05 2015 +0200 unused MACOSX_HIGH_RESOLUTION_VALUE Change-Id: I881d2bb00e5f89f269063fd6af9c99692820a264 diff --git a/configure.ac b/configure.ac index ca530c1..b9d9e75 100644 --- a/configure.ac +++ b/configure.ac @@ -2962,7 +2962,6 @@ AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY) AC_SUBST(ENABLE_MACOSX_SANDBOX) AC_SUBST(MACOSX_BUNDLE_IDENTIFIER) AC_SUBST(MACOSX_APP_NAME) -AC_SUBST(MACOSX_HIGH_RESOLUTION_VALUE) dnl === dnl Check iOS SDK and compiler ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Error building LO - ("LIBO_UDK 4.4 not found")
Hi there, I was building LO on GNU/Linux (on a machine where LO building went smooth until a couple months ago) and I got this message ["SOMEPATH" is my replacement of a longer path]: DynamicLibraryManagerException: "Failed to load dynamic library: SOMEPATH/libreoffice/workdir/LinkTarget/CppunitTest/libtest_sax.so SOMEPATH/libreoffice/instdir/ure/lib/libuno_cppu.so.3: version `LIBO_UDK_4.4' not found (required by SOMEPATH/libreoffice/instdir/program/libuno_cppuhelpergcc3.so.3)" Path is '.:SOMEPATH/libreoffice/solenv/bin:/home/seriouspillow/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/jvm/java-7-openjdk-amd64/bin' [build LNK] CppunitTest/libtest_sot_test_sot.so Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sax make[1]: *** [SOMEPATH/libreoffice/workdir/CppunitTest/sax.test] Error 1 make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 Any ideas? _Maybe_ it's noteworthy that I'm trying to compile a branch whose last commit is around 9 months old; just mentioning that for completeness. I tried using "EXPORT DEBUGCPPUNIT=TRUE" and "make CppunitTest_sax" but it produced no output after "[build CUT] sax" for around 30 minutes. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 86190] use GLM library instead of basegfx
https://bugs.documentfoundation.org/show_bug.cgi?id=86190 --- Comment #3 from Zsolt Bölöny --- I'm interested in this, as I have some experiences with GLM, but the task is not completely clear to me. What methods should I overload to return GLM datatypes? Basegfx mostly contains classes which are used widespread in the codebase. There are two things I can think of: 1) keep the current classes and use them as a wrapper around the corresponding GLM types (e.g. use a glm::dvec2 instead of two doubles in B2DVector), or 2) completely get rid of basegfx's vectors and matrices, find out where they're used, replace them with GLM ones and put the additional helper methods (like matrix inversion, etc.) into new class(es). The first scenario is this easy-hack is about, I think (plus the writing of conversion functions between basegfx and GLM types). Please somebody confirm what I think is correct, so I can start hacking. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sc/source
cui/uiconfig/ui/colorpage.ui |2 +- sc/source/ui/src/condformatdlg.src |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 16e5fe1af6025fecb06d4cfdd300903019e4eac9 Author: Adolfo Jayme Barrientos Date: Sat May 16 11:31:01 2015 -0500 Spelling: smilies â smileys Change-Id: I855060d91933414ffb51f45420abf8d0bd69399b diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 4d2ca4c..f7cb9e5 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -285,10 +285,10 @@ Control RID_COND_ENTRY "3 Signs"; "3 Symbols 1"; "3 Symbols 2"; -"3 Smilies"; +"3 Smileys"; "3 Stars"; "3 Triangles"; -"3 Colored Smilies"; +"3 Colored Smileys"; "4 Arrows"; "4 Gray Arrows"; "4 Circles Red to Black"; commit af764d0b8171d87d5457604467afe9b16426d41d Author: Adolfo Jayme Barrientos Date: Sat May 16 11:22:46 2015 -0500 Add missing ellipsis to the color picking button Change-Id: I19fc41fdffc2579a6316807ba3dc4d937864a37c diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 5d91456..2027800 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -430,7 +430,7 @@ -_Pick +_Pick⦠True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.documentfoundation.org/show_bug.cgi?id=62475 --- Comment #34 from Tor Lillqvist --- I think namespace end comments are unnecessary when the namespace block is just a few lines, though. Do you agree, Tomaz? Of course one could also argue that for consistency, they should be used in those cases, too. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/splitwin.hxx | 10
vcl/source/window/splitwin.cxx | 725 -
2 files changed, 369 insertions(+), 366 deletions(-)
New commits:
commit 91b181467f8fe5f7bf325e3bb82aead7eadc6ad9
Author: Philippe Jung
Date: Sat May 16 15:11:36 2015 +0200
tdf#91259 Crash when closing Help
Rewrite of splitwin.
The previous implementation used struct and memset/memcpy/memmove.
Struct have been replaced by classes with destructors. Array of pointers
are handled in vectors.
This enables clean call to clear of VclPtr.
Change-Id: Idfbe698348f7bfb46aae7f97f6edbe7127df58cf
Reviewed-on: https://gerrit.libreoffice.org/15756
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index ea38e5b..e8b442d 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -57,9 +57,9 @@ private:
longmnMSplitPos;
WinBits mnWinStyle;
WindowAlign meAlign;
-sal_uInt16 mnSplitTest;
-sal_uInt16 mnSplitPos;
-sal_uInt16 mnMouseModifier;
+sal_uInt16 mnSplitTest;
+sal_uInt16 mnSplitPos;
+sal_uInt16 mnMouseModifier;
boolmbDragFull:1,
mbHorz:1,
mbBottomRight:1,
@@ -145,10 +145,10 @@ public:
virtual boolPreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
voidInsertItem( sal_uInt16 nId, vcl::Window* pWindow, long
nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nIntoSetId = 0,
SplitWindowItemBits nBits = 0 );
voidInsertItem( sal_uInt16 nId, long nSize,
-sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nSetId = 0,
+sal_uInt16 nPos = SPLITWINDOW_APPEND,
sal_uInt16 nIntoSetId = 0,
SplitWindowItemBits nBits = 0 );
voidRemoveItem( sal_uInt16 nId, bool bHide = true );
voidClear();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index f88aec7..7e1a472 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -36,10 +36,13 @@
#include
#include
-// Attention: Must not contain non-PODs because array is enlarged/copied
-// with the use of memmove/memcpy.
-struct ImplSplitItem
+
+class ImplSplitItem
{
+public:
+~ImplSplitItem();
+void dispose();
+
longmnSize;
longmnPixSize;
longmnLeft;
@@ -65,18 +68,56 @@ struct ImplSplitItem
longmnMaxSize;
};
-struct ImplSplitSet
+typedef std::vector< ImplSplitItem* > ImplSplitItems;
+
+class ImplSplitSet
{
-ImplSplitItem* mpItems;
+public:
+~ImplSplitSet();
+void dispose();
+
+ImplSplitItems mpItems;
Wallpaper* mpWallpaper;
Bitmap* mpBitmap;
longmnLastSize;
longmnSplitSize;
-sal_uInt16 mnItems;
-sal_uInt16 mnId;
+sal_uInt16 mnId;
boolmbCalcPix;
};
+ImplSplitItem::~ImplSplitItem()
+{
+dispose();
+}
+
+void ImplSplitItem::dispose()
+{
+if (mpSet)
+delete mpSet ;
+mpWindow.clear();
+mpOrgParent.clear();
+}
+
+ImplSplitSet::~ImplSplitSet()
+{
+dispose();
+}
+
+void ImplSplitSet::dispose()
+{
+size_t nItems = mpItems.size();
+
+for ( size_t i = 0; i < nItems; i++ )
+delete mpItems[i];
+mpItems.clear();
+
+if ( mpWallpaper )
+delete mpWallpaper;
+
+if ( mpBitmap )
+delete mpBitmap;
+}
+
/** Check whether the given size is inside the valid range defined by
[rItem.mnMinSize,rItem.mnMaxSize]. When it is not inside it then return
the upper or lower bound, respectively. Otherwise return the given size
@@ -85,12 +126,12 @@ struct ImplSplitSet
size has not lower or upper bound.
*/
namespace {
-long ValidateSize (const long nSize, const ImplSplitItem &rItem)
+long ValidateSize (const long nSize, const ImplSplitItem* pItem)
{
-if (rItem.mnMinSize>=0 && nSize0 && nSize>rItem.mnMaxSize)
-return rItem.mnMaxSize;
+if (pItem->mnMinSize>=0 && nSizemnMinSize)
+return pItem->mnMinSize;
+else if (pItem->mnMaxSize>0 && nSize>pItem->mnMaxSize)
+return pItem->mnMaxSize;
else
return nSize;
}
@@ -258,20 +299,20 @@ static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet,
sal_uInt16 nId )
return pSet;
sal_uInt16 i;
-sal_uInt16 nItems = pSet->mnIt
[Libreoffice-commits] core.git: include/cppuhelper
include/cppuhelper/interfacecontainer.h |4
1 file changed, 4 insertions(+)
New commits:
commit 592ba8776be8e4b70264ccf1485396242ca63b24
Author: Noel Grandin
Date: Sun May 10 14:09:59 2015 +0200
comment the element_alias union
Change-Id: I0467b2e3d124e71da7df150da31e3936615e098b
Reviewed-on: https://gerrit.libreoffice.org/15746
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/cppuhelper/interfacecontainer.h
b/include/cppuhelper/interfacecontainer.h
index 6ec2e08..a29eba0 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -41,6 +41,10 @@ namespace cppu
namespace detail {
+/**
+ This is here to optimise space in the common case that there are zero or
one
+ listeners.
+*/
union element_alias
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > > *pAsSequence;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/splitwin.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11e4acc80ed7c0180e32a62db6d2de1610ff1a93 Author: Michael Meeks Date: Sat May 16 20:00:41 2015 +0100 Correct forward definition. Change-Id: I6cf65892c0b3dd929067f2bdc1176a1a870df042 diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index e8b442d..867a343 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -24,7 +24,7 @@ #include class Wallpaper; -struct ImplSplitSet; +class ImplSplitSet; typedef sal_uInt16 SplitWindowItemBits; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/customshapepresetdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1f576d9c83f239e1c05ebcd04fa97038942e4d5 Author: Joren De Cuyper Date: Sat May 16 13:41:57 2015 +0200 Fix copy-paste error Due the variables above this error, I think this needs to be the .Height, not .Width Change-Id: If796cd1950f59d0e1a6005c1c1185066c688ef55 Reviewed-on: https://gerrit.libreoffice.org/15748 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 94d29f7..92252f3 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -146,7 +146,7 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue) aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedHeightPrefix)); nIndex = strlen(aExpectedHeightPrefix); -aRectangle.Width = static_cast(aToken.copy(nIndex).toInt32()); +aRectangle.Height = static_cast(aToken.copy(nIndex).toInt32()); return aRectangle; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/dockinganimation.ui | 40 ++-- 1 file changed, 20 insertions(+), 20 deletions(-) New commits: commit 09226ca4a8baefb9a45af954dcef974b7cb38c29 Author: Stanislav Horacek Date: Sat May 16 22:16:46 2015 +0200 mark numbers in dockinganimation.ui as untranslatable Change-Id: I536b20e5d48ff911ad87c486e59b121533e2870a Reviewed-on: https://gerrit.libreoffice.org/15761 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/sd/uiconfig/simpress/ui/dockinganimation.ui b/sd/uiconfig/simpress/ui/dockinganimation.ui index bfa2169..31f169b 100644 --- a/sd/uiconfig/simpress/ui/dockinganimation.ui +++ b/sd/uiconfig/simpress/ui/dockinganimation.ui @@ -115,24 +115,24 @@ False Loop Count - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 12 - 15 - 20 - 25 - 50 - 100 - 500 - 1000 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 12 + 15 + 20 + 25 + 50 + 100 + 500 + 1000 Max. @@ -162,7 +162,7 @@ True True Image Number -1 +1 adjustment1 1 @@ -490,7 +490,7 @@ True False 0 -67 +67 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/svx/res/ole.png |binary 1 file changed New commits: commit bcfac2585c83edbd4a0cf5458c47d1d9a257c5fe Author: andreas_ka Date: Sat May 16 23:15:40 2015 +0200 Breeze: one ole icon was missing Change-Id: I08ad5f88be63fb767f1323c3d20ae973bf8df8b7 Reviewed-on: https://gerrit.libreoffice.org/15763 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/icon-themes/breeze/svx/res/ole.png b/icon-themes/breeze/svx/res/ole.png index 1e5493a..cf270b9 100644 Binary files a/icon-themes/breeze/svx/res/ole.png and b/icon-themes/breeze/svx/res/ole.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_insertobject.png |binary icon-themes/breeze/cmd/sc_insertobject.png |binary 2 files changed New commits: commit bb2b3dad59aa97c81a113cfaa7f23f76225902a2 Author: andreas_ka Date: Sat May 16 23:13:20 2015 +0200 Breeze: new OLE icon Change-Id: I3f2c010c428c218d93be0da284d18bab594026ed Reviewed-on: https://gerrit.libreoffice.org/15762 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/icon-themes/breeze/cmd/lc_insertobject.png b/icon-themes/breeze/cmd/lc_insertobject.png index 54433f4..25be558 100644 Binary files a/icon-themes/breeze/cmd/lc_insertobject.png and b/icon-themes/breeze/cmd/lc_insertobject.png differ diff --git a/icon-themes/breeze/cmd/sc_insertobject.png b/icon-themes/breeze/cmd/sc_insertobject.png index 1e5493a..cf270b9 100644 Binary files a/icon-themes/breeze/cmd/sc_insertobject.png and b/icon-themes/breeze/cmd/sc_insertobject.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_edithyperlink.png |binary icon-themes/breeze/cmd/lc_removehyperlink.png |binary icon-themes/breeze/cmd/sc_edithyperlink.png |binary icon-themes/breeze/cmd/sc_removehyperlink.png |binary 4 files changed New commits: commit 6aab2eceaa386c14c2283631d3107cab7484f0f8 Author: andreas_ka Date: Sat May 16 23:29:39 2015 +0200 Breeze: edit and remove hyperlink new icons not in galaxy recommandation from jay Change-Id: Ia05be765bf8952f2be4e54c3494c387c4700e2c5 Reviewed-on: https://gerrit.libreoffice.org/15764 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/icon-themes/breeze/cmd/lc_edithyperlink.png b/icon-themes/breeze/cmd/lc_edithyperlink.png new file mode 100644 index 000..dfe9a2b Binary files /dev/null and b/icon-themes/breeze/cmd/lc_edithyperlink.png differ diff --git a/icon-themes/breeze/cmd/lc_removehyperlink.png b/icon-themes/breeze/cmd/lc_removehyperlink.png new file mode 100644 index 000..bc8a2fb Binary files /dev/null and b/icon-themes/breeze/cmd/lc_removehyperlink.png differ diff --git a/icon-themes/breeze/cmd/sc_edithyperlink.png b/icon-themes/breeze/cmd/sc_edithyperlink.png new file mode 100644 index 000..370b045 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_edithyperlink.png differ diff --git a/icon-themes/breeze/cmd/sc_removehyperlink.png b/icon-themes/breeze/cmd/sc_removehyperlink.png new file mode 100644 index 000..6d359cc Binary files /dev/null and b/icon-themes/breeze/cmd/sc_removehyperlink.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-17-05_02:13:44 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.documentfoundation.org/show_bug.cgi?id=62475 --- Comment #35 from Tomaz Vajngerl --- Sure, I agree. Looking again at the removed ones - they are mostly of the simple kind. But I had to complain before somebody has the idea to mass remove all of them. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error building LO - ("LIBO_UDK 4.4 not found")
All solved. Sorry for the noise. It was loosely related with ccache and using "ccache -C" did it. Matteo On Sat, May 16, 2015 at 11:14 AM, Matteo Campanelli < matteo.campane...@gmail.com> wrote: > Hi there, > > I was building LO on GNU/Linux (on a machine where LO building went smooth > until a couple months ago) and I got this message ["SOMEPATH" is my > replacement of a longer path]: > > DynamicLibraryManagerException: "Failed to load dynamic library: > SOMEPATH/libreoffice/workdir/LinkTarget/CppunitTest/libtest_sax.so > SOMEPATH/libreoffice/instdir/ure/lib/libuno_cppu.so.3: version > `LIBO_UDK_4.4' not found (required by > SOMEPATH/libreoffice/instdir/program/libuno_cppuhelpergcc3.so.3)" > > Path is > '.:SOMEPATH/libreoffice/solenv/bin:/home/seriouspillow/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/jvm/java-7-openjdk-amd64/bin' > [build LNK] CppunitTest/libtest_sot_test_sot.so > > Error: a unit test failed, please do one of: > > export DEBUGCPPUNIT=TRUE# for exception catching > export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux > export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for > interactive debugging in Visual Studio > export VALGRIND=memcheck# for memory checking > > and retry using: make CppunitTest_sax > > make[1]: *** [SOMEPATH/libreoffice/workdir/CppunitTest/sax.test] Error 1 > make[1]: *** Waiting for unfinished jobs > make: *** [build] Error 2 > > Any ideas? > > _Maybe_ it's noteworthy that I'm trying to compile a branch whose last > commit is around 9 months old; just mentioning that for completeness. > > I tried using "EXPORT DEBUGCPPUNIT=TRUE" and "make CppunitTest_sax" but it > produced no output after "[build CUT] sax" for around 30 minutes. > > Cheers, > Matteo > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/svtools sc/source svtools/source
include/svtools/tabbar.hxx | 10
sc/source/ui/inc/tabcont.hxx|2
sc/source/ui/view/tabcont.cxx | 40 -
svtools/source/control/filectrl.src |4
svtools/source/control/tabbar.cxx | 818 ++--
svtools/source/inc/filectrl.hrc |9
6 files changed, 450 insertions(+), 433 deletions(-)
New commits:
commit 51d16cc69d8ad9065f61d108ea25d6a025a2e228
Author: Tomaž Vajngerl
Date: Sun May 17 12:24:49 2015 +0900
cleanup tabbar
Change-Id: Ibb4922899f8b182c51a8e4d77e3b12a0b28e582a
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 2fe1724..0b8ca9e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -211,32 +211,31 @@ public:
struct ImplTabBarItem
{
-sal_uInt16 mnId;
-TabBarPageBits mnBits;
-OUStringmaText;
-OUStringmaHelpText;
-Rectangle maRect;
-longmnWidth;
-OStringmaHelpId;
-boolmbShort;
-boolmbSelect;
-boolmbEnable;
-Color maTabBgColor;
-Color maTabTextColor;
-
-ImplTabBarItem( sal_uInt16 nItemId, const OUString& rText,
-TabBarPageBits nPageBits ) :
-maText( rText )
-{
-mnId = nItemId;
-mnBits = nPageBits;
-mnWidth = 0;
-mbShort = false;
-mbSelect = false;
-mbEnable = true;
-maTabBgColor = Color( COL_AUTO );
-maTabTextColor = Color( COL_AUTO );
-}
+sal_uInt16 mnId;
+TabBarPageBits mnBits;
+OUString maText;
+OUString maHelpText;
+Rectangle maRect;
+long mnWidth;
+OString maHelpId;
+bool mbShort : 1;
+bool mbSelect : 1;
+bool mbEnable : 1;
+Color maTabBgColor;
+Color maTabTextColor;
+
+ImplTabBarItem(sal_uInt16 nItemId, const OUString& rText, TabBarPageBits
nPageBits)
+: mnId(nItemId)
+, mnBits(nPageBits)
+, maText(rText)
+, mnWidth(0)
+, mbShort(false)
+, mbSelect(false)
+, mbEnable(true)
+, maTabBgColor(Color(COL_AUTO))
+, maTabTextColor(Color(COL_AUTO))
+{
+}
bool IsDefaultTabBgColor() const
{
@@ -693,23 +692,23 @@ void TabBar::ImplGetColors(const StyleSettings&
rStyleSettings,
bool TabBar::ImplCalcWidth()
{
// Sizes should only be retrieved if the text or the font was changed
-if ( !mbSizeFormat )
+if (!mbSizeFormat)
return false;
// retrieve width of tabs with bold font
vcl::Font aFont = GetFont();
-if ( aFont.GetWeight() != WEIGHT_BOLD )
+if (aFont.GetWeight() != WEIGHT_BOLD)
{
-aFont.SetWeight( WEIGHT_BOLD );
-SetFont( aFont );
+aFont.SetWeight(WEIGHT_BOLD);
+SetFont(aFont);
}
-if ( mnMaxPageWidth )
+if (mnMaxPageWidth)
mnCurMaxWidth = mnMaxPageWidth;
-else if ( mbAutoMaxWidth )
+else if (mbAutoMaxWidth)
{
mnCurMaxWidth = mnLastOffX - mnOffX;
-if ( mnCurMaxWidth < 1 )
+if (mnCurMaxWidth < 1)
mnCurMaxWidth = 1;
}
else
@@ -719,8 +718,8 @@ bool TabBar::ImplCalcWidth()
for (size_t i = 0; i < mpImpl->mpItemList.size(); ++i)
{
ImplTabBarItem* pItem = mpImpl->mpItemList[i];
-long nNewWidth = GetTextWidth( pItem->maText );
-if ( mnCurMaxWidth && (nNewWidth > mnCurMaxWidth) )
+long nNewWidth = GetTextWidth(pItem->maText);
+if (mnCurMaxWidth && (nNewWidth > mnCurMaxWidth))
{
pItem->mbShort = true;
nNewWidth = mnCurMaxWidth;
@@ -734,10 +733,10 @@ bool TabBar::ImplCalcWidth()
long nFontWidth = aFont.GetHeight();
nNewWidth += nFontWidth * 2;
-if ( pItem->mnWidth != nNewWidth )
+if (pItem->mnWidth != nNewWidth)
{
pItem->mnWidth = nNewWidth;
-if ( !pItem->maRect.IsEmpty() )
+if (!pItem->maRect.IsEmpty())
bChanged = true;
}
}
@@ -750,7 +749,7 @@ void TabBar::ImplFormat()
{
ImplCalcWidth();
-if ( !mbFormat )
+if (!mbFormat)
return;
sal_uInt16 n = 0;
@@ -759,13 +758,13 @@ void TabBar::ImplFormat()
{
ImplTabBarItem* pItem = mpImpl->mpItemList[i];
// At all non-visible tabs an empty rectangle is set
-if ( (n+1 < mnFirstPos) || (x > mnLastOffX) )
+if ((n + 1 < mnFirstPos) || (x > mnLastOffX))
pItem->maRect.SetEmpty();
else
{
// Slightly before the tab before the first visible page
// should also be visible
-if ( n+1 == mnFirstPos )
+if (n + 1
[Libreoffice-commits] core.git: 14 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 160 ++
sc/qa/unit/ucalc.hxx |4
sc/source/core/data/colorscale.cxx| 99 +-
sc/source/filter/oox/condformatbuffer.cxx |5
sc/source/ui/condformat/condformatdlg.cxx |4
5 files changed, 220 insertions(+), 52 deletions(-)
New commits:
commit 1e8d6bb3e64700b0309bbc3331109d08404972e8
Author: Markus Mohrhard
Date: Sun May 17 06:44:47 2015 +0200
add a few more databar length tests
Change-Id: I178a028d65acaf80fdfe23c3911c1f178650b9c1
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 430a1fb..ad0ae3d 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5970,6 +5970,26 @@ void Test::testDataBarLengthAutomaticAxis()
testDataBarLengthImpl(m_pDoc, aValues2, ScRange(1,0,0,1,15,0),
-4, COLORSCALE_VALUE, 8, COLORSCALE_VALUE, 1.0/3.0 * 100,
databar::AUTOMATIC);
+ScDataBarLengthData aValues3[] = {
+{ 2, 0.0 },
+{ 3, 25.0 },
+{ 4, 50.0 },
+{ 6, 100.0 },
+{ 0, -200 }
+};
+testDataBarLengthImpl(m_pDoc, aValues3, ScRange(2,0,0,2,3,0),
+0, COLORSCALE_MIN, 0, COLORSCALE_MAX, 0, databar::AUTOMATIC);
+
+ScDataBarLengthData aValues4[] = {
+{ 2, 40.0 },
+{ 3, 60.0 },
+{ 4, 80.0 },
+{ 5, 100.0 },
+{ 0, -200 }
+};
+testDataBarLengthImpl(m_pDoc, aValues4, ScRange(3,0,0,3,3,0),
+0, COLORSCALE_AUTO, 0, COLORSCALE_AUTO, 0, databar::AUTOMATIC);
+
m_pDoc->DeleteTab(0);
}
commit 0b43d4232e0f6eacfdca8334c6cc19eece47d79a
Author: Markus Mohrhard
Date: Sun May 17 05:45:20 2015 +0200
add tests for last round of fixes
Change-Id: I5c6d079e8da8797edae4f0649524fcd70c84f2bf
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 78e7af6..430a1fb 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5890,7 +5890,7 @@ struct ScDataBarLengthData
void testDataBarLengthImpl(ScDocument* pDoc, ScDataBarLengthData* pData, const
ScRange& rRange,
double nMinVal, ScColorScaleEntryType eMinType,
double nMaxVal, ScColorScaleEntryType eMaxType,
-double nZeroPos)
+double nZeroPos, databar::ScAxisPosition eAxisPos)
{
ScConditionalFormat* pFormat = new ScConditionalFormat(1, pDoc);
ScRangeList aRangeList(rRange);
@@ -5902,6 +5902,8 @@ void testDataBarLengthImpl(ScDocument* pDoc,
ScDataBarLengthData* pData, const S
pFormat->AddEntry(pDatabar);
ScDataBarFormatData* pFormatData = new ScDataBarFormatData();
+pFormatData->meAxisPosition = eAxisPos;
+
pFormatData->mpLowerLimit.reset(new ScColorScaleEntry());
pFormatData->mpLowerLimit->SetValue(nMinVal);
pFormatData->mpLowerLimit->SetType(eMinType);
@@ -5927,7 +5929,7 @@ void testDataBarLengthImpl(ScDocument* pDoc,
ScDataBarLengthData* pData, const S
}
-void Test::testDataBarLength()
+void Test::testDataBarLengthAutomaticAxis()
{
m_pDoc->InsertTab(0, "Test");
@@ -5944,7 +5946,7 @@ void Test::testDataBarLength()
};
testDataBarLengthImpl(m_pDoc, aValues, ScRange(0,0,0,0,7,0),
-3, COLORSCALE_VALUE, 7, COLORSCALE_VALUE, 0.0);
+3, COLORSCALE_VALUE, 7, COLORSCALE_VALUE, 0.0, databar::AUTOMATIC);
ScDataBarLengthData aValues2[] = {
{ -6, -100 },
@@ -5966,7 +5968,52 @@ void Test::testDataBarLength()
{ 0, -200 }
};
testDataBarLengthImpl(m_pDoc, aValues2, ScRange(1,0,0,1,15,0),
--4, COLORSCALE_VALUE, 8, COLORSCALE_VALUE, 1.0/3.0 * 100);
+-4, COLORSCALE_VALUE, 8, COLORSCALE_VALUE, 1.0/3.0 * 100,
databar::AUTOMATIC);
+
+m_pDoc->DeleteTab(0);
+}
+
+void Test::testDataBarLengthMiddleAxis()
+{
+m_pDoc->InsertTab(0, "Test");
+
+ScDataBarLengthData aValues[] = {
+{ 1, 25.0 },
+{ 2, 25.0 },
+{ 3, 37.5 },
+{ 4, 50.0 },
+{ 5, 62.5 },
+{ 6, 75.0 },
+{ 7, 87.5 },
+{ 8, 100.0 },
+{ 9, 100.0 },
+{ 0, -200 }
+};
+
+testDataBarLengthImpl(m_pDoc, aValues, ScRange(0,0,0,0,8,0),
+2, COLORSCALE_VALUE, 8, COLORSCALE_VALUE, 50.0, databar::MIDDLE);
+
+ScDataBarLengthData aValues2[] = {
+{ -6, -50 },
+{ -5, -50 },
+{ -4, -50 },
+{ -3, -37.5 },
+{ -2, -25.0 },
+{ -1, -12.5 },
+{ 0, 0.0 },
+{ 1, 12.5 },
+{ 2, 25.0 },
+{ 3, 37.5 },
+{ 4, 50.0 },
+{ 5, 62.5 },
+{ 6, 75.0 },
+{ 7, 87.5 },
+{ 8, 100.0 },
+{ 9, 100.0 },
+{ 0, -200 }
+};
+testDataBarLengthImpl(m_pDoc, aValues2, ScRange(1,0,0,1,15,0),
+-4, COLORSCALE_VALUE, 8, COLORSCALE_VALUE, 50.0, databar::MIDDLE);
m_pDoc->DeleteTab(0);
}
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index ff8356e..a2bd053 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -419,7 +4
[Bug 66305] FILESAVE: ToC exported to XHTML still has page numbers
https://bugs.documentfoundation.org/show_bug.cgi?id=66305 Adolfo Jayme changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
