[Libreoffice-commits] core.git: canvas/source cppcanvas/qa cui/source drawinglayer/source filter/source include/vcl sd/qa sd/source svtools/source svx/source sw/qa vcl/backendtest vcl/qa vcl/quartz vc
canvas/source/cairo/cairo_canvashelper.cxx|4 -
cppcanvas/qa/extras/emfplus/emfplus.cxx |2
cui/source/dialogs/colorpicker.cxx|2
cui/source/tabpages/tppattern.cxx |4 -
drawinglayer/source/texture/texture3d.cxx |2
filter/source/msfilter/msdffimp.cxx |4 -
include/vcl/salbtype.hxx |6 -
sd/qa/unit/import-tests.cxx |6 -
sd/source/ui/slidesorter/view/SlsFramePainter.cxx |3
svtools/source/graphic/transformer.cxx| 74 ++-
svx/source/dialog/dlgctrl.cxx | 18 +---
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|6 -
vcl/backendtest/outputdevice/common.cxx |2
vcl/qa/cppunit/BitmapProcessorTest.cxx|2
vcl/qa/cppunit/BitmapTest.cxx |2
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx|8 +-
vcl/qa/cppunit/outdev.cxx | 16 ++--
vcl/quartz/salbmp.cxx |6 -
vcl/source/bitmap/BitmapProcessor.cxx | 16 ++--
vcl/source/filter/igif/gifread.cxx| 33
vcl/source/gdi/bitmapex.cxx | 13 +--
vcl/source/gdi/pngread.cxx| 29 ---
vcl/source/gdi/print2.cxx | 82 +++---
vcl/unx/generic/gdi/gdiimpl.cxx |4 -
vcl/win/gdi/gdiimpl.cxx |4 -
25 files changed, 180 insertions(+), 168 deletions(-)
New commits:
commit 01e470f0ab49e458c57b0f28636a517b2bfb1b4a
Author: Chris Sherlock
Date: Sun Jan 21 04:48:50 2018 +1100
vcl: remove BitmapColor Color() operator
BitmapColor has a Color() operator. However, this is confusing and
tends to hide that the two classes aren't the same. I have converted this
to GetColor().
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index a25dac85acc6..bba59a15c475 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -470,7 +470,7 @@ namespace cairocanvas
else
nAlpha = data[ nOff + 3 ] = 255;
#endif
-aColor = pBitmapReadAcc->GetPaletteColor(
*pReadScan++ );
+aColor =
pBitmapReadAcc->GetPaletteColor(*pReadScan++).GetColor();
#ifdef OSL_BIGENDIAN
data[ nOff++ ] = sal::static_int_cast(( nAlpha*( aColor.GetRed() ) )/255 );
@@ -611,7 +611,7 @@ namespace cairocanvas
for( nX = 0; nX < nWidth; nX++ )
{
-aColor = pBitmapReadAcc->GetColor( nY, nX );
+aColor = pBitmapReadAcc->GetColor( nY, nX
).GetColor();
// cairo need premultiplied color values
// TODO(rodo) handle endianness
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index b5a32b1fca94..fbc55d2f2181 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -80,7 +80,7 @@ void Test::testFdo77229()
Bitmap aBitmap = load("fdo77229.emf");
Bitmap::ScopedReadAccess pAccess(aBitmap);
// The green star was missing.
-Color aColor(pAccess->GetPixel(142, 140));
+Color aColor(pAccess->GetPixel(142, 140).GetColor());
CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetRed());
CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetBlue());
CPPUNIT_ASSERT(aColor.GetGreen() == 0xfe || aColor.GetGreen() == 0xff);
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 687e44677825..6492ad558a3e 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -447,7 +447,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos,
bool bUpdate )
if (pReadAccess != nullptr)
{
// mpBitmap always has a bit count of 24 => use of GetPixel(...)
is safe
-maColor = pReadAccess->GetPixel(nY, nX);
+maColor = pReadAccess->GetPixel(nY, nX).GetColor();
Bitmap::ReleaseAccess(pReadAccess);
pReadAccess = nullptr;
}
diff --git a/cui/source/tabpages/tppattern.cxx
b/cui/source/tabpages/tppattern.cxx
index 5422e9c0334f..141bd052cc66 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -313,8 +313,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl,
ValueSet*, void)
m_pCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - cui/source include/vcl
cui/source/tabpages/backgrnd.cxx | 22 ++
include/vcl/window.hxx |2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 81e6d59738c67e2050428bce9c0f490eebacb7f2
Author: Tamás Zolnai
Date: Fri Feb 2 19:10:19 2018 +0100
lokdialog: Color/font picker in dialogs don't show preview
Invalidation needs to be passed upward to the right parent window.
It should work similar to other dialog items, but this preview class
is not derived from the Control class.
Reviewed-on: https://gerrit.libreoffice.org/49101
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 974ea04ddd1b82e5d5c0171bd8ad29310e3f2bd7)
Change-Id: I5fb2b6438b8be92d55609c8d3c25110b49d0e6d7
Reviewed-on: https://gerrit.libreoffice.org/49160
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 43d8fdd2eddb..2554da1581b7 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -51,6 +52,7 @@
#include
#include
#include
+#include
using namespace css;
@@ -160,6 +162,7 @@ protected:
virtual voidPaint( vcl::RenderContext& /*rRenderContext*/, const
Rectangle& rRect ) override;
virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
virtual voidResize() override;
+virtual voidLogicInvalidate(const Rectangle* pRectangle) override;
private:
@@ -321,6 +324,25 @@ void BackgroundPreviewImpl::DataChanged( const
DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
}
+
+void BackgroundPreviewImpl::LogicInvalidate(const Rectangle* /*pRectangle*/)
+{
+// Invalidate the container dialog or floating window
+// The code is same as in Control::LogicInvalidate() method
+if (comphelper::LibreOfficeKit::isActive() &&
!comphelper::LibreOfficeKit::isDialogPainting())
+{
+if (VclPtr pParent = GetParentWithLOKNotifier())
+{
+// invalidate the complete floating window for now
+if (pParent->ImplIsFloatingWindow())
+return pParent->LogicInvalidate(nullptr);
+
+const Rectangle aRect(Point(GetOutOffXPixel(), GetOutOffYPixel()),
Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
+pParent->LogicInvalidate(&aRect);
+}
+}
+}
+
#define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl)
SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const
SfxItemSet& rCoreSet)
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7f15b5dac267..dcdaddc75c12 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -560,7 +560,7 @@ public:
SAL_DLLPRIVATE bool ImplIsWindowOrChild( const
vcl::Window* pWindow, bool bSystemWindow = false ) const;
SAL_DLLPRIVATE bool ImplIsChild( const vcl::Window*
pWindow, bool bSystemWindow = false ) const;
-SAL_DLLPRIVATE bool ImplIsFloatingWindow() const;
+ bool ImplIsFloatingWindow() const;
SAL_DLLPRIVATE bool ImplIsPushButton() const;
SAL_DLLPRIVATE bool ImplIsSplitter() const;
SAL_DLLPRIVATE bool ImplIsOverlapWindow() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uitest/manual_tests
uitest/manual_tests/more_calc.py | 52 +++
1 file changed, 52 insertions(+)
New commits:
commit b57ad983e6ed5d976903b1d6588b472bb3051e7d
Author: Saurav Chirania
Date: Sat Feb 3 01:58:42 2018 +0530
tdf#107501 automatize EN-8 manual test, related tdf#84810
This test is to check that paste special combined
with some options and link is ok.
Change-Id: Ifffca8033b195d64d310d9d063ee95bbc8e8ad5d
Reviewed-on: https://gerrit.libreoffice.org/49164
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/uitest/manual_tests/more_calc.py b/uitest/manual_tests/more_calc.py
new file mode 100644
index ..08aeb654e449
--- /dev/null
+++ b/uitest/manual_tests/more_calc.py
@@ -0,0 +1,52 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+from uitest.uihelper.calc import enter_text_to_cell
+
+
+class ManualCalcTests(UITestCase):
+def test_paste_special(self):
+# EN-8:Paste special with options
+# This test is to check that paste special combined with some options
and link is ok.
+# Refers to tdf#84810
+
+self.ui_test.create_doc_in_start_center("calc")
+
+# Write text to cell A1
+xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
+enter_text_to_cell(xGridWin, "A1", "abcd")
+
+# Copy cell A1 to clipboard
+xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+self.xUITest.executeCommand(".uno:Copy")
+
+# Set cursor to cell A3
+xGridWin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
+
+# Choose Paste Special Options and paste data
+self.ui_test.execute_dialog_through_command(".uno:PasteSpecial")
+xPasteSpecialDlg = self.xUITest.getTopFocusWindow()
+xAllChkBox = xPasteSpecialDlg.getChild("paste_all")
+xAllChkBox.executeAction("CLICK", tuple())
+xLinkChkBox = xPasteSpecialDlg.getChild("link")
+xLinkChkBox.executeAction("CLICK", tuple())
+xOkBtn = xPasteSpecialDlg.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+# Assert successful paste
+document = self.ui_test.get_component()
+self.assertEqual(get_cell_by_position(document, 0, 0, 2).getString(),
"abcd")
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/namebuff.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ac3757b8becabc56081f9a454275ccc10bca2cda
Author: Johnny_M
Date: Sun Feb 4 00:48:57 2018 +0100
Translate German variable names
Akt -> Current in Excel filter (namebuff)
Change-Id: Idf36f8e19bb96b1d71edb49138c0ab36856c73ce
Reviewed-on: https://gerrit.libreoffice.org/49192
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/namebuff.cxx
b/sc/source/filter/excel/namebuff.cxx
index e08a46653666..b25edaa010dd 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -33,15 +33,15 @@
sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r )
{
sal_uInt32 n = 0;
-const sal_Unicode* pAkt = r.getStr();
-sal_UnicodecAkt = *pAkt;
+const sal_Unicode* pCurrent = r.getStr();
+sal_UnicodecCurrent = *pCurrent;
-while( cAkt )
+while( cCurrent )
{
n *= 70;
-n += static_cast(cAkt);
-pAkt++;
-cAkt = *pAkt;
+n += static_cast(cCurrent);
+pCurrent++;
+cCurrent = *pCurrent;
}
return n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/read.cxx | 130
1 file changed, 65 insertions(+), 65 deletions(-)
New commits:
commit d757c695f9736c064735017c02380eb6257a7875
Author: Johnny_M
Date: Sun Feb 4 00:39:25 2018 +0100
Translate German variable names
Akt -> Current
Zustand -> STATE
Ende -> End
in Excel filter (read)
Change-Id: I4bbb59fb8de1b59ecb4c8fd1ce0765e654acd10f
Reviewed-on: https://gerrit.libreoffice.org/49193
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index b9d77a0b2b51..54fd40dea65a 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -74,7 +74,7 @@ ErrCode ImportExcel::Read()
XclImpNameManager& rNameMgr= GetNameManager();
// call to GetCurrSheetDrawing() cannot be cached (changes in new sheets)
-enum Zustand {
+enum STATE {
Z_BiffNull, // not a valid Biff-Format
Z_Biff2,// Biff2: only one table
@@ -91,9 +91,9 @@ ErrCode ImportExcel::Read()
Z_Biff5T, // Biff5: a table itself
Z_Biff5E, // Biff5: between tables
Z_Biffn0, // all Biffs: skip table till next EOF
-Z_Ende };
+Z_End };
-Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull;
+STATE eCurrent = Z_BiffNull, ePrev = Z_BiffNull;
ErrCode eLastErr = ERRCODE_NONE;
sal_uInt16 nOpcode;
@@ -107,9 +107,9 @@ ErrCode ImportExcel::Read()
std::size_t nProgressBasePos = 0;
std::size_t nProgressBaseSize = 0;
-for (; eAkt != Z_Ende; mnLastRecId = nOpcode)
+for (; eCurrent != Z_End; mnLastRecId = nOpcode)
{
-if( eAkt == Z_Biff5E )
+if( eCurrent == Z_Biff5E )
{
sal_uInt16 nScTab = GetCurrScTab();
if( nScTab < maSheetOffsets.size() )
@@ -121,11 +121,11 @@ ErrCode ImportExcel::Read()
if (!bValid)
{
// Safeguard ourselves from potential infinite loop.
-eAkt = Z_Ende;
+eCurrent = Z_End;
}
}
else
-eAkt = Z_Ende;
+eCurrent = Z_End;
}
else
aIn.StartNextRecord();
@@ -135,7 +135,7 @@ ErrCode ImportExcel::Read()
if( !aIn.IsValid() )
{
// finalize table if EOF is missing
-switch( eAkt )
+switch( eCurrent )
{
case Z_Biff2:
case Z_Biff3:
@@ -151,13 +151,13 @@ ErrCode ImportExcel::Read()
break;
}
-if( eAkt == Z_Ende )
+if( eCurrent == Z_End )
break;
-if( eAkt != Z_Biff5TPre && eAkt != Z_Biff5WPre )
+if( eCurrent != Z_Biff5TPre && eCurrent != Z_Biff5WPre )
pProgress->ProgressAbs( nProgressBaseSize + aIn.GetSvStreamPos() -
nProgressBasePos );
-switch( eAkt )
+switch( eCurrent )
{
case Z_BiffNull:// --- Z_BiffNull -
@@ -176,7 +176,7 @@ ErrCode ImportExcel::Read()
Bof2();
if( pExcRoot->eDateiTyp == Biff2 )
{
-eAkt = Z_Biff2;
+eCurrent = Z_Biff2;
NewTable();
}
break;
@@ -184,7 +184,7 @@ ErrCode ImportExcel::Read()
Bof3();
if( pExcRoot->eDateiTyp == Biff3 )
{
-eAkt = Z_Biff3;
+eCurrent = Z_Biff3;
NewTable();
}
break;
@@ -192,17 +192,17 @@ ErrCode ImportExcel::Read()
Bof4();
if( pExcRoot->eDateiTyp == Biff4 )
{
-eAkt = Z_Biff4;
+eCurrent = Z_Biff4;
NewTable();
}
else if( pExcRoot->eDateiTyp == Biff4W )
-eAkt = Z_Biff4W;
+eCurrent = Z_Biff4W;
break;
case EXC_BIFF5:
Bof5();
if( pExcRoot->eDateiTyp == Biff5W )
{
-eAkt = Z_Biff5WPre;
+eCurrent = Z_Biff5WPre;
nBdshtTab = 0;
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/tokstack.cxx | 198 ++--
sc/source/filter/inc/tokstack.hxx | 28 ++---
2 files changed, 113 insertions(+), 113 deletions(-)
New commits:
commit f7fb78135c8747a8bca861b736960899dad295d4
Author: Johnny_M
Date: Sun Feb 4 01:11:18 2018 +0100
Translate German variable names
Akt -> Current in Excel filter (tokstack)
Change-Id: I1d7fe8e0116fa9db0df806f50f805e34f0955f56
Reviewed-on: https://gerrit.libreoffice.org/49197
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/tokstack.cxx
b/sc/source/filter/excel/tokstack.cxx
index 01cf12452ec0..1296f319bd6a 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -110,14 +110,14 @@ bool TokenPool::GrowId()
bool TokenPool::CheckElementOrGrow()
{
-// Last possible ID to be assigned somewhere is nElementAkt+1
-if (nElementAkt + 1 == nScTokenOff - 1)
+// Last possible ID to be assigned somewhere is nElementCurrent+1
+if (nElementCurrent + 1 == nScTokenOff - 1)
{
-SAL_WARN("sc.filter","TokenPool::CheckElementOrGrow - last possible ID
" << nElementAkt+1);
+SAL_WARN("sc.filter","TokenPool::CheckElementOrGrow - last possible ID
" << nElementCurrent+1);
return false;
}
-if (nElementAkt >= nElement)
+if (nElementCurrent >= nElement)
return GrowElement();
return true;
@@ -176,9 +176,9 @@ bool TokenPool::GrowMatrix()
bool TokenPool::GetElement( const sal_uInt16 nId )
{
-if (nId >= nElementAkt)
+if (nId >= nElementCurrent)
{
-SAL_WARN("sc.filter","TokenPool::GetElement - Id too large, " << nId
<< " >= " << nElementAkt);
+SAL_WARN("sc.filter","TokenPool::GetElement - Id too large, " << nId
<< " >= " << nElementCurrent);
return false;
}
@@ -343,11 +343,11 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
OSL_ENSURE(m_nRek <= nP_Id, "*TokenPool::GetElement(): recursion loops!?");
#endif
-OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElementRek(): nId >=
nElementAkt" );
+OSL_ENSURE( nId < nElementCurrent, "*TokenPool::GetElementRek(): nId >=
nElementCurrent" );
-if (nId >= nElementAkt)
+if (nId >= nElementCurrent)
{
-SAL_WARN("sc.filter", "*TokenPool::GetElementRek(): nId >=
nElementAkt");
+SAL_WARN("sc.filter", "*TokenPool::GetElementRek(): nId >=
nElementCurrent");
#ifdef DBG_UTIL
m_nRek--;
#endif
@@ -372,33 +372,33 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
nCnt = 0;
bRet = false;
}
-sal_uInt16* pAkt = nCnt ? &pP_Id[ nFirstId ] : nullptr;
+sal_uInt16* pCurrent = nCnt ? &pP_Id[ nFirstId ] : nullptr;
if (nCnt > nP_Id - nFirstId)
{
SAL_WARN("sc.filter", "TokenPool::GetElementRek: nCnt > nP_Id -
nFirstId");
nCnt = nP_Id - nFirstId;
bRet = false;
}
-for( ; nCnt > 0 ; nCnt--, pAkt++ )
+for( ; nCnt > 0 ; nCnt--, pCurrent++ )
{
-assert(pAkt);
-if( *pAkt < nScTokenOff )
+assert(pCurrent);
+if( *pCurrent < nScTokenOff )
{// recursion or not?
-if (*pAkt >= nElementAkt)
+if (*pCurrent >= nElementCurrent)
{
-SAL_WARN("sc.filter", "TokenPool::GetElementRek: *pAkt >=
nElementAkt");
+SAL_WARN("sc.filter", "TokenPool::GetElementRek: *pCurrent >=
nElementCurrent");
bRet = false;
}
else
{
-if (pType[ *pAkt ] == T_Id)
-bRet = GetElementRek( *pAkt );
+if (pType[ *pCurrent ] == T_Id)
+bRet = GetElementRek( *pCurrent );
else
-bRet = GetElement( *pAkt );
+bRet = GetElement( *pCurrent );
}
}
else// elementary SC_Token
-pScToken->AddOpCode( static_cast( *pAkt - nScTokenOff
) );
+pScToken->AddOpCode( static_cast( *pCurrent -
nScTokenOff ) );
}
#ifdef DBG_UTIL
@@ -409,40 +409,40 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
void TokenPool::operator >>( TokenId& rId )
{
-rId = static_cast( nElementAkt + 1 );
+rId = static_cast( nElementCurrent + 1 );
if (!CheckElementOrGrow())
return;
-pElement[ nElementAkt ] = nP_IdLast;// Start of Token-sequence
-pType[ nElementAkt ] = T_Id;// set Typeinfo
-pSize[ nElementAkt ] = nP_IdAkt - nP_IdLast;
-// write from nP_IdLast to nP_IdAkt-1 -> length of the sequence
+pElement[ nElementCurrent ] = nP_IdLast;// Start of Token-sequence
+pType[ nElementCurrent ] = T_Id;// set Typeinfo
+pSize[ nElementCurrent ] = nP_IdCurrent - nP_IdLast;
+// write from nP_IdLast to nP_IdCurrent-1 -> length of the sequence
-nElementAkt++; // sta
[Libreoffice-commits] core.git: sc/source
sc/source/filter/lotus/lotread.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit f8d7e734ec21f7e4a91289299bdd4d31b1bf4621
Author: Johnny_M
Date: Sat Feb 3 23:19:35 2018 +0100
Translate German variable names
Akt -> Current in Lotus filter
Change-Id: Icb13ea51c715df96223fd5b49f33d9321ef41d05
Reviewed-on: https://gerrit.libreoffice.org/49196
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/lotus/lotread.cxx
b/sc/source/filter/lotus/lotread.cxx
index 165071c03931..23f9823629e1 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -47,7 +47,7 @@ ErrCode ImportLotus::Read()
ErrCodeeRet = ERRCODE_NONE;
// ScFormulaCell *pLastFormCell;
-STATE eAkt = S_START;
+STATE eCurrent = S_START;
nTab = 0;
nExtTab = -2;
@@ -57,28 +57,28 @@ ErrCode ImportLotus::Read()
// start progressbar
ScfStreamProgressBar aPrgrsBar( *pIn, pD->GetDocumentShell() );
LotusContext &rContext = aConv.getContext();
-while( eAkt != S_END )
+while( eCurrent != S_END )
{
pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4)
{
eRet = SCERR_IMPORT_FORMAT;
-eAkt = S_END;
+eCurrent = S_END;
if (!pIn->good())
break; // while
}
nNextRec += nRecLen + 4;
-switch( eAkt )
+switch( eCurrent )
{
case S_START: // S_START
if( nOp )
{
eRet = SCERR_IMPORT_UNKNOWN_WK;
-eAkt = S_END;
+eCurrent = S_END;
}
else
{
@@ -87,16 +87,16 @@ ErrCode ImportLotus::Read()
Bof();
switch (rContext.pLotusRoot->eFirstType)
{
-case Lotus123Typ::WK3: eAkt = S_WK3; break;
-case Lotus123Typ::WK4: eAkt = S_WK4; break;
+case Lotus123Typ::WK3: eCurrent = S_WK3; break;
+case Lotus123Typ::WK4: eCurrent = S_WK4; break;
default:
eRet = SCERR_IMPORT_UNKNOWN_WK;
-eAkt = S_END;
+eCurrent = S_END;
}
}
else
{
-eAkt = S_END; // TODO: add here
something for <= WK1!
+eCurrent = S_END; // TODO: add here
something for <= WK1!
eRet = ErrCode(0x);
}
}
@@ -110,13 +110,13 @@ ErrCode ImportLotus::Read()
switch( nOp )
{
case 0x0001:// EOF
-eAkt = S_FM3;
+eCurrent = S_FM3;
nTab++;
break;
case 0x0002:// PASSWORD
eRet = SCERR_IMPORT_FILEPASSWD;
-eAkt = S_END;
+eCurrent = S_END;
break;
case 0x0007:// COLUMNWIDTH
@@ -177,7 +177,7 @@ ErrCode ImportLotus::Read()
else
{
eRet = SCERR_IMPORT_FORMAT;
-eAkt = S_END;
+eCurrent = S_END;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/dif/difimp.cxx | 78
sc/source/filter/inc/dif.hxx|2 -
2 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 2488768e402bcabd40c73e7c693ee2c1c9be2d69
Author: Johnny_M
Date: Sat Feb 3 22:56:56 2018 +0100
Translate German variable names
Akt -> Current in dif filter
Change-Id: Ibae58744a1d0b685b9df4d63b2977ec9b09745d0
Reviewed-on: https://gerrit.libreoffice.org/49189
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index c523b072ba02..349f8e4864d7 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -127,19 +127,19 @@ ErrCode ScFormatFilterPluginImpl::ScImportDif(SvStream&
rIn, ScDocument* pDoc, c
SCROW nRowCnt = rInsPos.Row();
DifAttrCacheaAttrCache;
-DATASET eAkt = D_UNKNOWN;
+DATASET eCurrent = D_UNKNOWN;
ScSetStringParam aStrParam; // used to set string value without number
detection.
aStrParam.setTextInput();
-while( eAkt != D_EOD )
+while( eCurrent != D_EOD )
{
-eAkt = aDifParser.GetNextDataset();
+eCurrent = aDifParser.GetNextDataset();
aPrgrsBar.Progress();
ScAddress aPos(nColCnt, nRowCnt, nBaseTab);
-switch( eAkt )
+switch( eCurrent )
{
case D_BOT:
if( nColCnt < SCCOL_MAX )
@@ -434,30 +434,30 @@ bool DifParser::ReadNextLine( OUString& rStr )
// a valid data record structure
bool DifParser::LookAhead()
{
-const sal_Unicode* pAktBuffer;
+const sal_Unicode* pCurrentBuffer;
bool bValidStructure = false;
OSL_ENSURE( aLookAheadLine.isEmpty(), "*DifParser::LookAhead(): LookAhead
called twice in a row" );
rIn.ReadUniOrByteStringLine( aLookAheadLine, rIn.GetStreamCharSet() );
-pAktBuffer = aLookAheadLine.getStr();
+pCurrentBuffer = aLookAheadLine.getStr();
-switch( *pAktBuffer )
+switch( *pCurrentBuffer )
{
case '-': // Special Datatype
-pAktBuffer++;
+pCurrentBuffer++;
-if( Is1_0( pAktBuffer ) )
+if( Is1_0( pCurrentBuffer ) )
{
bValidStructure = true;
}
break;
case '0': // Numeric Data
-pAktBuffer++;
-if( *pAktBuffer == ',' )
+pCurrentBuffer++;
+if( *pCurrentBuffer == ',' )
{
-pAktBuffer++;
-bValidStructure = ( GetNumberDataset(pAktBuffer) !=
D_SYNT_ERROR );
+pCurrentBuffer++;
+bValidStructure = ( GetNumberDataset(pCurrentBuffer) !=
D_SYNT_ERROR );
}
break;
case '1': // String Data
@@ -474,18 +474,18 @@ DATASET DifParser::GetNextDataset()
{
DATASET eRet = D_UNKNOWN;
OUString aLine;
-const sal_Unicode* pAktBuffer;
+const sal_Unicode* pCurrentBuffer;
ReadNextLine( aLine );
-pAktBuffer = aLine.getStr();
+pCurrentBuffer = aLine.getStr();
-switch( *pAktBuffer )
+switch( *pCurrentBuffer )
{
case '-': // Special Datatype
-pAktBuffer++;
+pCurrentBuffer++;
-if( Is1_0( pAktBuffer ) )
+if( Is1_0( pCurrentBuffer ) )
{
ReadNextLine( aLine );
if( IsBOT( aLine.getStr() ) )
@@ -495,17 +495,17 @@ DATASET DifParser::GetNextDataset()
}
break;
case '0': // Numeric Data
-pAktBuffer++; // value in fVal, 2. line in aData
-if( *pAktBuffer == ',' )
+pCurrentBuffer++; // value in fVal, 2. line in aData
+if( *pCurrentBuffer == ',' )
{
-pAktBuffer++;
-eRet = GetNumberDataset(pAktBuffer);
+pCurrentBuffer++;
+eRet = GetNumberDataset(pCurrentBuffer);
OUString aTmpLine;
ReadNextLine( aTmpLine );
if ( eRet == D_SYNT_ERROR )
{ // for broken records write "#ERR: data" to cell
OUStringBuffer aTmp("#ERR: ");
-aTmp.append(pAktBuffer).append(" (");
+aTmp.append(pCurrentBuffer).append(" (");
aTmp.append(aTmpLine).append(')');
aData = aTmp.makeStringAndClear();
eRet = D_STRING;
@@ -588,30 +588,30 @@ const sal_Unicode* DifParser::ScanIntVal( const
sal_Unicode* pStart, sal_uInt32&
while (*pStart == ' ' || *pStart == '\t')
++pStart;
-sal_Unicode cAkt = *pStart;
+sal_Unicode cCurrent = *pStar
[Libreoffice-commits] core.git: sc/source
sc/source/filter/ftools/ftools.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 3af813241cc8007bcc2077944e12af1a7dfac3b0 Author: Johnny_M Date: Sun Feb 4 00:05:58 2018 +0100 Translate German variable names Fakt -> Factor in ftools Change-Id: I86f8d68015625c8ec7b3d260dbb3f734d2d7008e Reviewed-on: https://gerrit.libreoffice.org/49195 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 525b2eacebb2..f7d085a28b6c 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -67,25 +67,25 @@ SEEE IMMM */ long double lfDouble; -long double lfFakt = 256.0; +long double lfFactor = 256.0; sal_uInt8 pDouble10[ 10 ]; rStrm.ReadBytes(pDouble10, 10);// Intel-10 in pDouble10 lfDouble = static_cast< long double >( pDouble10[ 7 ] ); // Byte 7 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 6 ] ); // Byte 6 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 5 ] ); // Byte 5 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 4 ] ); // Byte 4 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 3 ] ); // Byte 3 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 2 ] ); // Byte 2 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 1 ] ); // Byte 1 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 0 ] ); // Byte 0 // For value 0.0 all bits are zero; pow(2.0,-16446) does not work with CSet compilers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/fontbuff.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit b4571ca497063448805bd707c12fcd584d576620
Author: Johnny_M
Date: Sun Feb 4 00:57:58 2018 +0100
Translate German variable names
Akt -> Current in Excel filter (fontbuff)
Change-Id: I7c969fc17e08efff7a446bf6e11ec0ce4c82
Reviewed-on: https://gerrit.libreoffice.org/49194
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/fontbuff.cxx
b/sc/source/filter/excel/fontbuff.cxx
index 2a0a6c07d4f5..52461ffde7f6 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -42,16 +42,16 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex,
SfxItemSet& rItemSet )
{
sal_uInt8 nIntIndex = nIndex & 0x07;
-ENTRY* pAkt = pData + nIntIndex;
+ENTRY* pCurrent = pData + nIntIndex;
-if( pAkt->pFont )
-rItemSet.Put( *pAkt->pFont );
+if( pCurrent->pFont )
+rItemSet.Put( *pCurrent->pFont );
-if( pAkt->pHeight )
-rItemSet.Put( *pAkt->pHeight );
+if( pCurrent->pHeight )
+rItemSet.Put( *pCurrent->pHeight );
-if( pAkt->pColor )
-rItemSet.Put( *pAkt->pColor );
+if( pCurrent->pColor )
+rItemSet.Put( *pCurrent->pColor );
if( nIndex & 0x08 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/findtxt.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f51ce842a6ac994f68bff453cf97d64dbc29b1ec
Author: Johnny_M
Date: Sun Feb 4 00:12:30 2018 +0100
Translate German variable names
Akt -> Current in crsr
Change-Id: Icdcba2c34c6b76e6a5232a526caeb77a294404ff
Reviewed-on: https://gerrit.libreoffice.org/49190
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 5ea33060dae6..cf98da007ba4 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -115,7 +115,7 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart,
sal_Int32& rEnd,
else
break;
-const sal_Int32 nAkt = nStt - rArr.size();
+const sal_Int32 nCurrent = nStt - rArr.size();
if ( bNewHint )
{
@@ -141,17 +141,17 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const
nStart, sal_Int32& rEnd,
// end (might be normal 0x7f).
const bool bEmpty = pHt->Which() != RES_TXTATR_FIELD
|| (static_txtattr_cast(pHt)->GetFormatField().GetField()->ExpandField(true).isEmpty());
-if ( bEmpty && nStart == nAkt )
+if ( bEmpty && nStart == nCurrent )
{
-rArr.push_back( nAkt );
+rArr.push_back( nCurrent );
--rEnd;
-buf.remove(nAkt, 1);
+buf.remove(nCurrent, 1);
}
else
{
if ( bEmpty )
-aReplaced.push_back( nAkt );
-buf[nAkt] = '\x7f';
+aReplaced.push_back( nCurrent );
+buf[nCurrent] = '\x7f';
}
}
break;
@@ -159,9 +159,9 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart,
sal_Int32& rEnd,
{
if( bRemoveCommentAnchors )
{
-rArr.push_back( nAkt );
+rArr.push_back( nCurrent );
--rEnd;
-buf.remove( nAkt, 1 );
+buf.remove( nCurrent, 1 );
}
}
break;
@@ -175,9 +175,9 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart,
sal_Int32& rEnd,
if ( bNewSoftHyphen )
{
-rArr.push_back( nAkt );
+rArr.push_back( nCurrent );
--rEnd;
-buf.remove(nAkt, 1);
+buf.remove(nCurrent, 1);
++nSoftHyphen;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2c6712b5fe7c0118d67887fa5d18affca8636c1b
Author: Johnny_M
Date: Sat Feb 3 23:25:09 2018 +0100
Translate German variable names
Akt -> Current in dbmgr
Change-Id: Ia44fc1bb424703b417b46ad68f64aa6ffc3d6ccf
Reviewed-on: https://gerrit.libreoffice.org/49191
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 43f6451fa1ef..225dbc2c50b0 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -611,8 +611,8 @@ static OUString lcl_FindColumn(const OUString&
sFormatStr,sal_uInt16 &nUsedPos
nSeparator = 0xff;
while(nUsedPos < nLen && nSeparator == 0xff)
{
-sal_Unicode cAkt = sFormatStr[nUsedPos];
-switch(cAkt)
+sal_Unicode cCurrent = sFormatStr[nUsedPos];
+switch(cCurrent)
{
case ',':
nSeparator = DB_SEP_SPACE;
@@ -627,7 +627,7 @@ static OUString lcl_FindColumn(const OUString&
sFormatStr,sal_uInt16 &nUsedPos
nSeparator = DB_SEP_NEWLINE;
break;
default:
-sReturn += OUStringLiteral1(cAkt);
+sReturn += OUStringLiteral1(cCurrent);
}
nUsedPos++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - stoc/source svx/source
stoc/source/invocation/invocation.cxx | 18 --
svx/source/table/tablelayouter.cxx|2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
New commits:
commit 914a35e8467252da43f864c86b0a820d8c0bd38e
Author: Caolán McNamara
Date: Sun Feb 4 20:45:30 2018 +
ofz#4949 Integer-overflow
Change-Id: Ib8928108c987989ab849e8d7e1a85078f6d93050
Reviewed-on: https://gerrit.libreoffice.org/49216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 9a31f56288cc..9bca986844c3 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -798,7 +798,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle&
rArea, bool bFit )
// now scale if wanted and needed
if( bFit && nCurrentHeight != rArea.getHeight() )
-distribute( maRows, rArea.getHeight() - nCurrentHeight );
+distribute(maRows, o3tl::saturating_sub(rArea.getHeight(),
nCurrentHeight));
// last step, update left edges
sal_Int32 nNewHeight = 0;
commit 52030a3a65657dc5a3aed3208b25b33df7277e1b
Author: Tor Lillqvist
Date: Mon Feb 5 10:57:07 2018 +0200
Remove code that has been commented out since initial import in 2000
Change-Id: I42aaed79e88b6cb8bb0b93aa49555aad45050fe7
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index f639e55bdee8..f564425c4202 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -357,10 +357,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
_xNameContainer.set( _xDirect, UNO_QUERY );
_xENDirect.set( _xDirect, UNO_QUERY );
_xDirect2.set( _xDirect, UNO_QUERY );
-
-// only once!!!
-//_xIntrospectionAccess = XIntrospectionAccessRef();
-//_xPropertySet = XPropertySetRef();
}
else
{
@@ -417,20 +413,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
_xENIntrospection.set( _xIntrospectionAccess, UNO_QUERY );
}
}
-/* only once !!!
-_xDirect = XInvocationRef();
-if( !_xIntrospectionAccess.is() )
-{
-// reset
-_xElementAccess = XElementAccessRef();
-_xEnumerationAccess = XEnumerationAccessRef();
-_xIndexAccess = XIndexAccessRef();
-_xIndexContainer= XIndexContainerRef();
-_xNameAccess= XNameAccessRef();
-_xNameContainer = XNameContainerRef();
-_xPropertySet = XPropertySetRef();
-}
-*/
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py
esc-reporting/esc-collect.py |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7cc66463acfb5e5bea972fe10fcfeda1af1ee023
Author: Xisco Fauli
Date: Mon Feb 5 10:11:16 2018 +0100
esc-collect: Add latest versions
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 491fae4..425175a 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -275,7 +275,9 @@ def do_ESC_MAB_UPDATE(bz):
url = bz + '&f1=version&o1=regexp&priority=highest&v1=^'
rawList = {}
-series = {'5.3' : '5.3',
+series = {'6.0' : '6.0',
+ '5.4' : '5.4',
+ '5.3' : '5.3',
'5.2' : '5.2',
'5.1' : '5.1',
'5.0' : '5.0',
@@ -682,7 +684,7 @@ def get_crash(cfg):
dirList =
util_load_url('http://dev-builds.libreoffice.org/crashtest/?C=M&O=D',
useRaw=True)
# find newest entry by using sort - in nginx' fancyindex first row is
parent-directory
# the second ones is most recent dir that was created. Only regular
entries have a title
-# attribute though, so use that as a shortcut, skip
+# attribute though, so use that as a shortcut, skip
inx = dirList.find('title="', 0)
if inx == -1:
print("ERROR: http://dev-builds.libreoffice.org/crashtest/?C=M&O=D not
showing DIR list")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/sidebar/SidebarDockingWindow.hxx |1 +
sfx2/source/sidebar/SidebarDockingWindow.cxx |9 +
2 files changed, 10 insertions(+)
New commits:
commit bcfc348663b04834fe8e6d6315f647be1595469a
Author: Jim Raykowski
Date: Sun Feb 4 14:12:32 2018 -0900
tdf#115434 Fix key press misbehaviors in sidebar
This patch also is for tdf#98505 and tdf#84657
Change-Id: I6bc125ace035b2c8126f013a63bcc9498b06e08c
Reviewed-on: https://gerrit.libreoffice.org/49219
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx
b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index 0a0a55c76c5e..3467df71c7b3 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -36,6 +36,7 @@ public:
vcl::Window* pParent, WinBits nBits);
virtual ~SidebarDockingWindow() override;
virtual void dispose() override;
+virtual bool EventNotify(NotifyEvent& rEvent) override;
using SfxDockingWindow::Close;
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 84a2834e5a34..05e7a3ab41a9 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -104,6 +104,15 @@ SfxChildAlignment SidebarDockingWindow::CheckAlignment (
}
}
+bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
+{
+MouseNotifyEvent nType = rEvent.GetType();
+if (MouseNotifyEvent::KEYINPUT == nType)
+return true;
+
+return Window::EventNotify(rEvent);
+}
+
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/swcache.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 3c280b7235967b28905220f72333c7029911fb82
Author: Michael Stahl
Date: Fri Feb 2 21:24:37 2018 +0100
sw: convert some SAL_WARN to assert in SwCache
Change-Id: Id148253a2f2c60912cbfbe9628f5ddec56a48952
Reviewed-on: https://gerrit.libreoffice.org/49165
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/bastyp/swcache.cxx
b/sw/source/core/bastyp/swcache.cxx
index 8d8b5997ff9a..282e5c6d4307 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -29,11 +29,14 @@
void SwCache::Check()
{
if ( !m_pRealFirst )
+{
+assert(m_pFirst == nullptr && m_pLast == nullptr);
return;
+}
// consistency check
-SAL_WARN_IF( m_pLast->GetNext(), "sw.core", "Last but not last." );
-SAL_WARN_IF( m_pRealFirst->GetPrev(), "sw.core", "First but not first." );
+assert(m_pLast->GetNext() == nullptr);
+assert(m_pRealFirst->GetPrev() == nullptr);
sal_uInt16 nCnt = 0;
bool bFirstFound = false;
SwCacheObj *pObj = m_pRealFirst;
@@ -44,17 +47,19 @@ void SwCache::Check()
SwCacheObj *pTmp = m_pLast;
while ( pTmp && pTmp != pObj )
pTmp = pTmp->GetPrev();
-SAL_WARN_IF( !pTmp, "sw.core", "Object not found." );
+assert(pTmp && "Object not found.");
++nCnt;
if ( pObj == m_pFirst )
bFirstFound = true;
if ( !pObj->GetNext() )
-SAL_WARN_IF( pObj != m_pLast, "sw.core", "Last not Found." );
+{
+assert(pObj == m_pLast);
+}
pObj = pObj->GetNext();
-SAL_WARN_IF(pObj == pOldRealFirst, "sw.core", "Recursion in SwCache.");
+assert(pObj != pOldRealFirst);
}
-SAL_WARN_IF( !bFirstFound, "sw.core", "First not Found." );
+assert(bFirstFound);
SAL_WARN_IF( nCnt + m_aFreePositions.size() != size(), "sw.core", "Lost
Chain." );
SAL_WARN_IF(
size() == m_nCurMax && m_nCurMax != m_aFreePositions.size() + nCnt,
"sw.core",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight
ios/CustomTarget_iOS_setup.mk |1 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |3 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme | 93 ++ ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme | 93 ++ 4 files changed, 187 insertions(+), 3 deletions(-) New commits: commit f17d0ff5234d88816198becb0f3d8ea7f00f7eb0 Author: jan Iversen Date: Mon Feb 5 11:09:43 2018 +0100 iOS, correctly build release/debug versions Added 2 schemes Debug/Release as shared to make sure they are available. Not having them as shared and cleaning causes them to be "forgotten" Change-Id: I4cb66c7088f770c7cda592994f3610e98fb1b7f0 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme new file mode 100644 index ..b860af5cc7e5 --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme new file mode 100644 index ..4861ceef6913 --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + commit 1ed8f225ab0328055dbb6724060d21584b393bd5 Author: jan Iversen Date: Mon Feb 5 11:06:22 2018 +0100 iOS, removed OTHER_LDFLAGS Change-Id: Ib07c1c4823deda7fa4ba389e9679f6eff99691d8 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index c85096aa1a60..17263df41d76 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -494,7 +494,6 @@ MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -529,7 +528,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; @@ -563,7 +561,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; commit 8258b425e85bc360f67d776a0196a7a091e7975f Author: jan Iversen Date: Mon Feb 5 09:14:01 2018 +0100 iOS, allow x86 release builds Added dir for x86_64 release builds Change-Id: If8c5e775ecd1283d9386a764441019c2423170f9 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 0ca73a345ffb..8fea759249e9 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -14,6 +14,7 @@ IOSRES = $(IOSGEN)/resources IOSDIRS = $(IOSGEN) \ $(IOSGEN)/Debug_x86_64 \ $(IOSGEN)/Debug_arm64 \ + $(IOSGEN)/Release_x86_64 \ $(IOSGEN)/Release_arm64 \
[Libreoffice-commits] core.git: framework/inc framework/source include/comphelper include/filter include/unotools lingucomponent/source stoc/source vcl/source
framework/inc/jobs/helponstartup.hxx |2 --
framework/inc/jobs/shelljob.hxx |2 --
framework/source/inc/loadenv/targethelper.hxx|2 --
include/comphelper/processfactory.hxx|4
include/comphelper/streamsection.hxx |3 ---
include/filter/msfilter/util.hxx |3 ---
include/unotools/streamhelper.hxx|3 ---
include/unotools/streamsection.hxx |3 ---
lingucomponent/source/languageguessing/guess.hxx |3 ---
lingucomponent/source/languageguessing/simpleguesser.hxx |3 ---
stoc/source/corereflection/lrucache.hxx |1 -
vcl/source/fontsubset/ttcr.cxx |3 ---
12 files changed, 32 deletions(-)
New commits:
commit 68d9583db4226a61ba23398928b9416c5d8745c8
Author: Manuj Vashist
Date: Mon Feb 5 15:27:22 2018 +0530
tdf#108523 Removed @author annotations.
Change-Id: I6a60128c413beab6cabb857c073607e15ddbc98f
Reviewed-on: https://gerrit.libreoffice.org/49215
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/framework/inc/jobs/helponstartup.hxx
b/framework/inc/jobs/helponstartup.hxx
index 4550f962e2e7..1fc65b4dd6f6 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -35,8 +35,6 @@ namespace framework{
/** @short implements a job component, which handle the special
feature to show a suitable help page for every (visible!)
loaded document.
-
-@author as96863
*/
class HelpOnStartup : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,css::lang::XEventListener,css::task::XJob >
{
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 4ff90039cac9..a25eb448ceb8 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -38,8 +38,6 @@ namespace framework{
registered for. Further there is a generic
way to configure the shell command and it's list
of arguments.
-
-@author as96863
*/
class ShellJob : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,css::task::XJob >
{
diff --git a/framework/source/inc/loadenv/targethelper.hxx
b/framework/source/inc/loadenv/targethelper.hxx
index afa968645f66..b35caf80d04d 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -28,8 +28,6 @@ namespace framework{
/** @short can be used to detect, if a target name (used e.g. for
XFrame.findFrame())
has a special meaning or can be used as normal frame name (e.g.
for XFrame.setName()).
-
-@author as96863
*/
class TargetHelper
{
diff --git a/include/comphelper/processfactory.hxx
b/include/comphelper/processfactory.hxx
index bf4645124c12..51ba33754a98 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -32,8 +32,6 @@ namespace comphelper
/**
* This function set the process service factory.
- *
- * @author Juergen Schmidt
*/
COMPHELPER_DLLPUBLIC void setProcessServiceFactory(const css::uno::Reference<
css::lang::XMultiServiceFactory >& xSMgr);
@@ -41,8 +39,6 @@ COMPHELPER_DLLPUBLIC void setProcessServiceFactory(const
css::uno::Reference< cs
* This function gets the process service factory.
*
* If no service factory is set the function throws a RuntimeException.
- *
- * @author Juergen Schmidt
*/
COMPHELPER_DLLPUBLIC css::uno::Reference< css::lang::XMultiServiceFactory >
getProcessServiceFactory();
diff --git a/include/comphelper/streamsection.hxx
b/include/comphelper/streamsection.hxx
index 4a53c85a9f8f..6c52892fde6b 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -31,9 +31,6 @@ namespace comphelper
/** implements handling for compatibly reading/writing data from/into an
input/output stream.
data written in a block secured by this class should be readable by older
versions which
use the same mechanism.
-
-@author Frank Schoenheit
-@since 00/26/05
*/
class COMPHELPER_DLLPUBLIC OStreamSection
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 8895a4181bec..50252fc6191a 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -37,9 +37,6 @@ MSFILTER_DLLPUBLIC rtl_TextEncoding
getBestTextEncodingFromLocale(const css::lan
MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour);
/** Convert from DTTM to Writer's DateTime
-
- @author
- mailto:mma...@openoffice.org";>Martin Maher
{
diff --git a/include/unotools/streamsection.hxx
b/include/unotools/streamsection.hxx
index ad45b4e12496..74626d2bed4e 100644
--- a/include/unotools/streamsection.hxx
+++ b/include/unotools/streamsection.hxx
@@ -30,9 +30,6 @@ namespace utl
/** implements handling for compat
Re: Crash test update
On Thu, 2018-02-01 at 21:26 +, Crashtest VM wrote: > New crashtest update available at http://dev-builds.libreoffice.org/c > rashtest/4696d3728f0aba1087001bc543fc0867dd0ebdda/ The threaded xml import stuff is now gone, all that remains is the more recent assert from... commit faa0305ba3d0dc698fce4915d4f3a1fb52422380 Author: Eike Rathke Date: Thu Jan 25 13:20:27 2018 +0100 Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-design] Re: Minutes of the design meeting 2018-Jan-31
Working on papercut bugs is somewhat crucial. If the user experience with each module of Libre Office demands that the user has to use work-arounds to get work done in LO then he will just use other officesuites where he won't face those same issues. Getting someone to fix those issues would be crucial. An example in Calc like the one Renon posted in Impress is this one: https://bugs.documentfoundation.org/show_bug.cgi?id=53300 A bug that exists since Open Office days... With LO and the TDF constantly bragging about having cleaned up so many bugs in LO it's unforgivable that UX bugs like this one are still lingering from Open Office days. On Sat, Feb 3, 2018 at 7:58 PM, Michel RENON wrote: > Hi, > > Le 31/01/2018 à 21:48, Heiko Tietze a écrit : > >> [...] >> GSoC >> >> * Full list of ideas https://pad.documentfoundation.org/p/UX-GSoC_Ideas >> * Public list https://wiki.documentfoundatio >> n.org/Development/GSoC/Ideas#User_Interface >> > > Here are some suggestions based on my recent experience in teaching > LibreOffice and writing a python macro : > > > > Impress : work on "papercut" bugs > -- > > > 1 - Animations sets for a text box with several paragraphs don't affect > new paragraphs (not inherited) > https://bugs.documentfoundation.org/show_bug.cgi?id=57581 > > This is the most annoying problem that new users face : > - they create a slide with few lines of text, > - they add an animation on the text, to make it appear line by line > - they test : it works correctly > - they add one line of text (inside or at the end) > - they test and boom... the animation is "broken" > - they make a pause, then... close impress and open powerpoint... > > > > 2 - Editing: Text spacing changes when click in textbox > https://bugs.documentfoundation.org/show_bug.cgi?id=89060 > > It is a subtle but very annoying visual effect. > > > > > > > Python macros > > > > I had to create a macro embedded in a file. > As I had not written basic for a long time, I tried to write it in python. > > The fist problem is that on Ubuntu, it is necessary to install a specific > package 'libreoffice-script-provider-python' > > > The second problem is that, by default, there is no tool to integrate a > python macro in a document. > I found the APSO extension [1] that allows that and is very useful. > > I found some difficult points in writing python macro with that extension : > - after modifying a python script, you have to close and re-open the odf > file > - some inline documentation is missing : about API, and some sample code > - the context (available via XSCRIPTCONTEXT) is missing some API, > compared to basic > > > > > > So here are my suggestions for GSoC : > - allow an easy activation of python support : a simple button would > download and install all necessary packages > - integrate the functionality of APSO (to allow embedding/managing > python script in odf file) > - remove the need to re-open the odf file before using a new version of > python script > > > > Other points can be done directly in the current extension : > - add some inline documentation about API [2] > - add inline documentation on both ways to use python script : > - an external script that connects to LibreOffice > - an internal script that get called by menu/button > - allow to create scripts empty or with comments (that provide minimum > documentation and good practice) > - add a library of sample code (a list of "how-to ?"), that can be > easily copied in script files > > > Adding API to the context (available via XSCRIPTCONTEXT) can be done by > working on LibreOffice code : > /usr/lib/libreoffice/program/pythonscript/py > > > > > > > Cheers, > > Michel > > > > > > > [1] https://extensions.libreoffice.org/extensions/apso- > alternative-script-organizer-for-python > > [2] based on very useful page https://wiki.openoffice.org/wi > ki/Python/Transfer_from_Basic_to_Python > > > -- > To unsubscribe e-mail to: design+unsubscr...@global.libreoffice.org > Problems? https://www.libreoffice.org/get-help/mailing-lists/how-to-un > subscribe/ > Posting guidelines + more: https://wiki.documentfoundation.org/Netiquette > List archive: https://listarchives.libreoffice.org/global/design/ > All messages sent to this list will be publicly archived and cannot be > deleted > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source
vcl/source/filter/jpeg/jpegc.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit cd855591f49d688e116c3da63d913315c62028c1
Author: Caolán McNamara
Date: Sat Feb 3 16:39:12 2018 +
tdf#115416 allow build with classic libjpeg
Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
Reviewed-on: https://gerrit.libreoffice.org/49205
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index e120fc304228..1210cb34ad53 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader,
void* pInputStream,
eScanlineFormat = ScanlineFormat::N8BitPal;
nPixelSize = 1;
}
+#if defined(JCS_EXTENSIONS)
else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
{
best_out_color_space = JCS_EXT_BGRA;
@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader,
void* pInputStream,
eScanlineFormat = eFinalFormat;
nPixelSize = 4;
}
-
+#endif
if (rContext.cinfo.jpeg_color_space == JCS_YCCK)
rContext.cinfo.out_color_space = JCS_CMYK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/connectivity
connectivity/source/commontools/TTableHelper.cxx | 20 ++--
connectivity/source/drivers/ado/ATable.cxx | 22 ++---
connectivity/source/drivers/component/CTable.cxx |6 -
connectivity/source/drivers/dbase/DTable.cxx | 100 +++
connectivity/source/drivers/evoab2/NTable.cxx|6 -
connectivity/source/drivers/file/FTable.cxx |6 -
connectivity/source/drivers/firebird/Table.cxx |4
connectivity/source/drivers/flat/ETable.cxx |6 -
connectivity/source/drivers/hsqldb/HTable.cxx| 12 +-
connectivity/source/drivers/macab/MacabTable.cxx |6 -
connectivity/source/drivers/mysql/YTable.cxx | 12 +-
connectivity/source/sdbcx/VTable.cxx | 33 ++-
dbaccess/source/core/api/table.cxx |6 -
include/connectivity/sdbcx/VTable.hxx|7 -
14 files changed, 119 insertions(+), 127 deletions(-)
New commits:
commit 5c7b954935369cbbd22a6f43be63ac7c0ddbbfdc
Author: Noel Grandin
Date: Mon Jan 29 13:28:44 2018 +0200
loplugin:useuniqueptr in OTable
use rtl::Reference here since these are reference counted data
structures, and we hand out references to me via our API
Change-Id: I8f69dde2db08519cb3d9de20b4ad54462e3ecc98
Reviewed-on: https://gerrit.libreoffice.org/49180
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index b94ab42d4617..7bb03a90da3c 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -299,10 +299,10 @@ void OTableHelper::refreshColumns()
);
}
-if(m_pColumns)
-m_pColumns->reFill(aVector);
+if(m_xColumns)
+m_xColumns->reFill(aVector);
else
-m_pColumns = createColumns(aVector);
+m_xColumns = createColumns(aVector);
}
const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName)
const
@@ -424,10 +424,10 @@ void OTableHelper::refreshKeys()
{
refreshPrimaryKeys(aNames);
refreshForeignKeys(aNames);
-m_pKeys = createKeys(aNames);
+m_xKeys = createKeys(aNames);
} // if(!isNew())
-else if (!m_pKeys )
-m_pKeys = createKeys(aNames);
+else if (!m_xKeys )
+m_xKeys = createKeys(aNames);
/*if(m_pKeys)
m_pKeys->reFill(aVector);
else*/
@@ -469,10 +469,10 @@ void OTableHelper::refreshIndexes()
}
}
-if(m_pIndexes)
-m_pIndexes->reFill(aVector);
+if(m_xIndexes)
+m_xIndexes->reFill(aVector);
else
-m_pIndexes = createIndexes(aVector);
+m_xIndexes = createIndexes(aVector);
}
OUString OTableHelper::getRenameStart() const
@@ -549,7 +549,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32
index, const Reference
);
Reference< XPropertySet > xOld(
-m_pColumns->getByIndex(index), css::uno::UNO_QUERY);
+m_xColumns->getByIndex(index), css::uno::UNO_QUERY);
if(xOld.is())
alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
}
diff --git a/connectivity/source/drivers/ado/ATable.cxx
b/connectivity/source/drivers/ado/ATable.cxx
index c1688a152cc4..0c028794a6c3 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -84,10 +84,10 @@ void OAdoTable::refreshColumns()
aColumns.fillElementNames(aVector);
}
-if(m_pColumns)
-m_pColumns->reFill(aVector);
+if(m_xColumns)
+m_xColumns->reFill(aVector);
else
-m_pColumns = new
OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pCatalog->getConnection());
+m_xColumns = new
OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pCatalog->getConnection());
}
void OAdoTable::refreshKeys()
@@ -101,10 +101,10 @@ void OAdoTable::refreshKeys()
aKeys.fillElementNames(aVector);
}
-if(m_pKeys)
-m_pKeys->reFill(aVector);
+if(m_xKeys)
+m_xKeys->reFill(aVector);
else
-m_pKeys = new
OKeys(*this,m_aMutex,aVector,aKeys,isCaseSensitive(),m_pCatalog->getConnection());
+m_xKeys = new
OKeys(*this,m_aMutex,aVector,aKeys,isCaseSensitive(),m_pCatalog->getConnection());
}
void OAdoTable::refreshIndexes()
@@ -118,10 +118,10 @@ void OAdoTable::refreshIndexes()
aIndexes.fillElementNames(aVector);
}
-if(m_pIndexes)
-m_pIndexes->reFill(aVector);
+if(m_xIndexes)
+m_xIndexes->reFill(aVector);
else
-m_pIndexes = new
OIndexes(*this,m_aMutex,aVector,aIndexes,isCaseSensitive(),m_pCatalog->getConnection());
+m_xIndexes = new
OIndexes(*this,m_aMutex,aVector,aIndexes,isCaseSensitive(),m_pCatalog->getConnection());
}
Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationI
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/e3dsceneupdater.hxx |3 ++-
svx/source/engine3d/e3dsceneupdater.cxx |7 ++-
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit b05a3198f6c1d4713a871c46610dd48bf3979e8a
Author: Noel Grandin
Date: Tue Jan 30 10:25:15 2018 +0200
loplugin:useuniqueptr in E3DModifySceneSnapRectUpdater
Change-Id: Ied2cdfa314f86ff3a25cecd5c13c03d3428966f0
Reviewed-on: https://gerrit.libreoffice.org/49207
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index ce51518ee689..ad01d667b4f5 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SVX_E3DSCENEUPDATER_HXX
#include
+#include
class SdrObject;
class E3dScene;
@@ -53,7 +54,7 @@ class SVX_DLLPUBLIC E3DModifySceneSnapRectUpdater
// the 3d transformation stack at the time of construction, valid when
// mpScene is not zero
-drawinglayer::geometry::ViewInformation3D* mpViewInformation3D;
+std::unique_ptr
mpViewInformation3D;
public:
// the constructor evaluates and sets the members at construction time
diff --git a/svx/source/engine3d/e3dsceneupdater.cxx
b/svx/source/engine3d/e3dsceneupdater.cxx
index a77e7badd5a6..bc696daebafb 100644
--- a/svx/source/engine3d/e3dsceneupdater.cxx
+++ b/svx/source/engine3d/e3dsceneupdater.cxx
@@ -51,7 +51,7 @@
E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pO
else
{
// secure current 3D transformation stack
-mpViewInformation3D = new
drawinglayer::geometry::ViewInformation3D(rVCScene.getViewInformation3D(aAllContentRange));
+mpViewInformation3D.reset( new
drawinglayer::geometry::ViewInformation3D(rVCScene.getViewInformation3D(aAllContentRange))
);
}
}
}
@@ -83,8 +83,7 @@
E3DModifySceneSnapRectUpdater::~E3DModifySceneSnapRectUpdater()
mpViewInformation3D->getDeviceToView(),
mpViewInformation3D->getViewTime(),
mpViewInformation3D->getExtendedInformationSequence());
-delete mpViewInformation3D;
-mpViewInformation3D = pNew;
+mpViewInformation3D.reset(pNew);
}
// transform content range to scene-relative coordinates using old
3d transformation stack
@@ -111,8 +110,6 @@
E3DModifySceneSnapRectUpdater::~E3DModifySceneSnapRectUpdater()
}
}
}
-
-delete mpViewInformation3D;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W05-2018)
Hello, What have happened in QA in the last 7 days? * 163 bugs have been created, of which, 82 are still unconfirmed ( Total Unconfirmed bugs: 465 ) + Created bugs: http://tinyurl.com/ybf95tyh + Still unconfirmed bugs: http://tinyurl.com/yb7wmdp9 * 1259 comments have been written by 226 users. * 80 new users have signed up to Bugzilla. == STATUSES CHANGED == * 20 bugs have been changed to 'ASSIGNED'. + Link: http://tinyurl.com/y8a3f4on + Done by: Xisco Faulí ( 9 ), Julien Nabet ( 2 ), László Németh ( 2 ), Vasily Melenchuk (CIB) ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Szymon Kłos ( 1 ), Kevin Suo ( 1 ), Yousuf Philips (jay) ( 1 ), Henry Castro ( 1 ) * 2 bugs have been changed to 'CLOSED'. + Link: http://tinyurl.com/ycdztwhu + Done by: Alex Thurgood ( 1 ), Harald Koester ( 1 ) * 19 bugs have been changed to 'NEEDINFO'. + Link: http://tinyurl.com/ycyy3jro + Done by: Xisco Faulí ( 7 ), Timur ( 3 ), Buovjaga ( 2 ), Julien Nabet ( 2 ), m.a.riosv ( 2 ), Heiko Tietze ( 1 ), Alex Thurgood ( 1 ), Dieter Praas ( 1 ) * 62 bugs have been changed to 'NEW'. + Link: http://tinyurl.com/ydxk98zj + Done by: Buovjaga ( 14 ), Xisco Faulí ( 10 ), Heiko Tietze ( 6 ), Dieter Praas ( 5 ), Aron Budea ( 5 ), V Stuart Foote ( 3 ), Julien Nabet ( 3 ), Telesto ( 2 ), MM ( 2 ), Alex Thurgood ( 2 ), Miklos Vajna ( 1 ), Thorsten Behrens (CIB) ( 1 ), Regina Henschel ( 1 ), Pranav Kant ( 1 ), Yousuf Philips (jay) ( 1 ), m.a.riosv ( 1 ), kurt.pfeifle ( 1 ), Diarmuid O'Briain ( 1 ), tommy27 ( 1 ), Alex ARNAUD ( 1 ) * 3 bugs have been changed to 'REOPENED'. + Link: http://tinyurl.com/y85neufo + Done by: Kyle White ( 1 ), Cor Nouws ( 1 ), bordfeldt ( 1 ) * 44 bugs have been changed to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/yd7ygxms + Done by: Xisco Faulí ( 9 ), V Stuart Foote ( 7 ), Buovjaga ( 7 ), Aron Budea ( 4 ), Alex Thurgood ( 3 ), Telesto ( 2 ), Julien Nabet ( 2 ), Timur ( 2 ), Heiko Tietze ( 1 ), Pranav Kant ( 1 ), Yousuf Philips (jay) ( 1 ), m.a.riosv ( 1 ), Luke ( 1 ), Khaled Hosny ( 1 ), Gabor Kelemen ( 1 ), Cor Nouws ( 1 ) * 34 bugs have been changed to 'RESOLVED FIXED'. + Link: http://tinyurl.com/ya29u4fh + Done by: Aron Budea ( 5 ), Thorsten Behrens (CIB) ( 3 ), Michael Stahl ( 3 ), Heiko Tietze ( 2 ), Szymon Kłos ( 2 ), Jim Raykowski ( 2 ), Adolfo Jayme ( 2 ), Caolán McNamara ( 2 ), Tamás Zolnai ( 1 ), Miklos Vajna ( 1 ), Vasily Melenchuk (CIB) ( 1 ), Buovjaga ( 1 ), Julien Nabet ( 1 ), Serge Krot (CIB) ( 1 ), rolywhittellwebb ( 1 ), Pranav Kant ( 1 ), Yousuf Philips (jay) ( 1 ), Noel Grandin ( 1 ), Federico Mena-Quintero ( 1 ), Serg Bormant ( 1 ), Katarina Behrens (CIB) ( 1 ) * 93 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/yaass4w7 + Done by: qa-admin ( 91 ), Volga ( 1 ), raal ( 1 ) * 1 bug has been changed to 'RESOLVED INVALID'. + Link: http://tinyurl.com/ydbavhen + Done by: Beuss ( 1 ) * 1 bug has been changed to 'RESOLVED MOVED'. + Link: http://tinyurl.com/ydadhzck + Done by: Xisco Faulí ( 1 ) * 5 bugs have been changed to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/yaqvcyqd + Done by: Xavier Van Wijmeersch ( 1 ), V Stuart Foote ( 1 ), Mike Kaganski ( 1 ), m.a.riosv ( 1 ), Khaled Hosny ( 1 ) * 10 bugs have been changed to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/yczd2ytc + Done by: Khaled Hosny ( 4 ), Buovjaga ( 3 ), Alex Thurgood ( 2 ), Pranav Kant ( 1 ) * 3 bugs have been changed to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/yae2vhhs + Done by: Heiko Tietze ( 2 ), Khaled Hosny ( 1 ) * 25 bugs have been changed to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/yb9qqhjb + Done by: Xisco Faulí ( 3 ), Cor Nouws ( 3 ), Aron Budea ( 2 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Telesto ( 1 ), Rob Westein ( 1 ), Regina Henschel ( 1 ), qa-admin ( 1 ), Martin Srebotnjak ( 1 ), Michael Meeks ( 1 ), Marco ( 1 ), Matthias Basler ( 1 ), Jos van den Oever ( 1 ), Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 ), Douglas Fiedler ( 1 ), Alex ARNAUD ( 1 ), Howard Johnson ( 1 ) * 22 bugs have been changed to 'UNCONFIRMED'. + Link: http://tinyurl.com/y8s75je6 + Done by: Xisco Faulí ( 2 ), Telesto ( 2 ), Volker Lenhardt ( 1 ), u.fuchs ( 1 ), Sywey_Wang ( 1 ), Paul Menzel ( 1 ), Massimo ( 1 ), perie_gut ( 1 ), Marvin Scott ( 1 ), Oliver Ostertag ( 1 ), Janne Korkkula ( 1 ), Jo-Jo ( 1 ), harriet anders ( 1 ), Gerrit Boom ( 1 ), David F Smith ( 1 ), cr...@arno.com ( 1 ), Daniel Caron ( 1 ), c.bessiere ( 1 ), Bruce Fleming ( 1 ), drawbar ( 1 ) * 5 bugs have been changed to 'VERIFIED FIXED'. + Link: http://tinyurl.com/y9wv3fys + Done by: Jacques Guilleron ( 2 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ), Aron Budea ( 1 ) == KEYWORDS ADDED == * 'acc
[Libreoffice-commits] core.git: vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz5942-1.wmf |binary
vcl/source/gdi/sallayout.cxx |6 ++
2 files changed, 6 insertions(+)
New commits:
commit b189726c4f61a5d28a3b87112e7a85174b5573aa
Author: Caolán McNamara
Date: Mon Feb 5 09:02:39 2018 +
ofz#5942 Out of memory
when missing a glyph in a grapheme we set the whole grapheme as missing.
There
can be a huge long grapheme and iterating through each missing codepoint
results in the whole range pushed back repeatedly as missing.
Change-Id: Ib7c283389ee2357eb3b4264c78e558955ebad1eb
Reviewed-on: https://gerrit.libreoffice.org/49223
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz5942-1.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz5942-1.wmf
new file mode 100644
index ..f9a72867c593
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz5942-1.wmf differ
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 07b65564d6c2..a282a0248621 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -270,6 +270,12 @@ void ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1,
bool bRTL )
nCharPos1 = nTemp;
}
+if (maRuns.size() >= 2 && nCharPos0 == maRuns[maRuns.size() - 2] &&
nCharPos1 == maRuns[maRuns.size() - 1])
+{
+//this run is the same as the last
+return;
+}
+
// append new run
maRuns.push_back( nCharPos0 );
maRuns.push_back( nCharPos1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx |5 ++---
sw/source/filter/ww8/wrtww8.hxx |6 +-
sw/source/filter/ww8/wrtww8gr.cxx|3 +--
sw/source/filter/ww8/ww8atr.cxx |3 +--
sw/source/filter/ww8/ww8par.cxx |2 +-
sw/source/filter/ww8/ww8par.hxx |4
7 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit cfd78dadbb461d8364e9294094e38a03732cabc1
Author: Noel Grandin
Date: Mon Feb 5 11:10:50 2018 +0200
TypedWhichId in sw(2)
Change-Id: I68816c196f36d92fcd1ed58826368bbfe9aa52ce
Reviewed-on: https://gerrit.libreoffice.org/49224
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e24b02e9dd55..c4143c91a8c1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6757,7 +6757,7 @@ void DocxAttributeOutput::CharEscapement( const
SvxEscapementItem& rEscapement )
m_pSerializer->singleElementNS( XML_w, XML_vertAlign,
FSNS( XML_w, XML_val ), sIss.getStr(), FSEND );
-const SvxFontHeightItem& rItem = static_cast(m_rExport.GetItem(RES_CHRATR_FONTSIZE));
+const SvxFontHeightItem& rItem = m_rExport.GetItem(RES_CHRATR_FONTSIZE);
if (sIss.isEmpty() || sIss.match(OString("baseline")))
{
long nHeight = rItem.GetHeight();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index fd5df7d44011..88c70e14532d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2229,8 +2229,7 @@ void RtfAttributeOutput::CharEscapement(const
SvxEscapementItem& rEscapement)
const char* pUpDn;
-SwTwips nH
-= static_cast(m_rExport.GetItem(RES_CHRATR_FONTSIZE)).GetHeight();
+SwTwips nH = m_rExport.GetItem(RES_CHRATR_FONTSIZE).GetHeight();
if (0 < rEscapement.GetEsc())
pUpDn = OOO_STRING_SVTOOLS_RTF_UP;
@@ -2752,7 +2751,7 @@ void RtfAttributeOutput::ParaTabStop(const
SvxTabStopItem& rTabStop)
// Tabs are absolute by default.
if (m_rExport.m_pDoc->getIDocumentSettingAccess().get(
DocumentSettingId::TABS_RELATIVE_TO_INDENT))
-nOffset = static_cast(m_rExport.GetItem(RES_LR_SPACE)).GetTextLeft();
+nOffset = m_rExport.GetItem(RES_LR_SPACE).GetTextLeft();
for (sal_uInt16 n = 0; n < rTabStop.Count(); n++)
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 2b39a7d887d5..5a52a2aa852f 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -612,6 +612,10 @@ public:
}
const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const;
+template const T& GetItem( TypedWhichId nWhich ) const
+{
+return static_cast(GetItem(sal_uInt16(nWhich)));
+}
/// Find the reference.
bool HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16
nSeqNo );
@@ -1405,7 +1409,7 @@ public:
virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const = 0;
virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const = 0;
-};
+ };
/// Used to export formatted text associated to drawings.
class MSWord_SdrAttrIter : public MSWordAttrIter
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx
b/sw/source/filter/ww8/wrtww8gr.cxx
index 31f4a501a019..d0b47f658c7a 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -420,8 +420,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame)
SwTwips nHeight = rFlyFormat.GetFrameSize().GetHeight();
nHeight/=20; //nHeight was in twips, want it in half points,
but
//then half of total height.
-long nFontHeight = static_cast(
-GetItem(RES_CHRATR_FONTSIZE)).GetHeight();
+long nFontHeight = GetItem(RES_CHRATR_FONTSIZE).GetHeight();
nHeight-=nFontHeight/20;
Set_UInt16( pArr, NS_sprm::sprmCHpsPos );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cd8930647624..2c187e610522 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1387,8 +1387,7 @@ void WW8AttributeOutput::CharEscapement( const
SvxEscapementItem& rEscapement )
if ( 0 == b || 0xFF == b )
{
-long nHeight = static_cast(m_rWW8Export.GetItem(
-RES_CHRATR_FONTSIZE )).GetHeight();
+long nHeight = m_rWW8Export.GetItem( RES_CHRATR_FONTSIZE ).GetHeight();
m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsPos );
m_rWW8Export.InsUInt16( static_cast(( nHeight * nEsc + 500 ) /
1000 ));
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |5 -
chart2/source/view/inc/GL3DRenderer.hxx|4
chart2/source/view/main/DummyXShape.cxx|4
chart2/source/view/main/OpenGLRender.hxx | 13 -
4 files changed, 26 deletions(-)
New commits:
commit 16ea77bc4d2218b68d40708f4b8b4a4418a84d05
Author: Chris Sherlock
Date: Sun Jan 7 00:14:48 2018 +1100
chart2: remove dead code
Change-Id: I67bc3785eb0fd2030626becd1ffb6a80bd97d861
Reviewed-on: https://gerrit.libreoffice.org/47491
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 35cc5f572a69..946b28d05261 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -54,13 +54,8 @@ const float TEXT_HEIGHT = 10.0f;
float DEFAULT_CAMERA_HEIGHT = 500.0f;
const sal_uInt32 ID_STEP = 10;
-#if 0
-const float BAR_SIZE_X = 15.0f;
-const float BAR_SIZE_Y = 15.0f;
-#else
const float BAR_SIZE_X = 30.0f;
const float BAR_SIZE_Y = 5.0f;
-#endif
const float BAR_DISTANCE_X = 5.0f;
const float BAR_DISTANCE_Y = 5.0;
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 19b6996b5d8f..141621c1bc70 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -406,11 +406,7 @@ private:
glm::mat4 m_3DMVP;
GLuint m_3DUBOBuffer;
-#if 0
-GLint m_3DLightBlockIndex;
-GLint m_3DMaterialBlockIndex;
-#endif
GLint m_3DActualSizeLight;
GLuint m_NormalBuffer;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 800f9cea2262..99752858c93d 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1088,11 +1088,7 @@ void DummyChart::render()
SAL_INFO("chart2.opengl", "render chart");
m_GLRender.prepareToRender();
-#if 0
-m_GLRender.renderDebug();
-#else
DummyXShapes::render();
-#endif
}
void DummyChart::clear()
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 025b83297a09..d8f81a0f1799 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -109,10 +109,6 @@ public:
void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2,
css::drawing::FillStyle fillstyle);
private:
-#if 0
-//for performance
-double m_dFreq;
-#endif
int m_iWidth;
int m_iHeight;
@@ -128,22 +124,13 @@ private:
glm::mat4 m_Model;
// Our ModelViewProjection : multiplication of our 3 matrices
glm::mat4 m_MVP;
-#if 0
-GLint m_RenderProID;
-#endif
GLuint m_VertexBuffer;
GLuint m_ColorBuffer;
GLint m_MatrixID;
-#if 0
-GLint m_RenderVertexID;
-GLint m_RenderTexCoordID;
-
-GLint m_RenderTexID;
-#endif
GLuint m_RenderVertexBuf;
GLuint m_RenderTexCoordBuf;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/qa
sc/qa/unit/functions_test.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit d78a70d34ac5eac0b9bd831d7cd5777a55d906ac
Author: Michael Stahl
Date: Fri Feb 2 14:13:35 2018 +0100
sc: disable "forecast.ets.add.fods" test file on Macs
This sometimes fails, since months, and nobody has fixed it.
Let's improve the reliability of CI a bit.
Change-Id: Ic4d2e085151855d35804f8ed6ebca04366815c0b
Reviewed-on: https://gerrit.libreoffice.org/49144
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 00a6f0908a73a80fb0521e1f4cdc99647e43c126)
Reviewed-on: https://gerrit.libreoffice.org/49228
diff --git a/sc/qa/unit/functions_test.cxx b/sc/qa/unit/functions_test.cxx
index ac9a430a96e7..e48c209e1974 100644
--- a/sc/qa/unit/functions_test.cxx
+++ b/sc/qa/unit/functions_test.cxx
@@ -40,6 +40,10 @@ bool FunctionsTest::load(const OUString& rFilter, const
OUString& rURL,
ScDocument& rDoc = xDocShRef->GetDocument();
+#ifdef __APPLE__
+// FIXME tends to fail a lot
+if (!rURL.endsWith("forecast.ets.add.fods"))
+#endif
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, rDoc.GetValue(1, 2, 0), 1e-14);
xDocShRef->DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/list-uitest.py
bin/list-uitest.py |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ad32bcdfa1cecb28abe934885df62bd6a49aa978
Author: Zdeněk Crhonek
Date: Wed Jan 3 20:14:24 2018 +0100
uitest - add folder uitest/manual_tests to script
script for page https://wiki.documentfoundation.org/ListUiTests
Change-Id: I0081a4e1229105ef7387e70d76a5670a4f5de691
Reviewed-on: https://gerrit.libreoffice.org/47340
Reviewed-by: Xisco Faulí
Tested-by: Xisco Faulí
diff --git a/bin/list-uitest.py b/bin/list-uitest.py
index baecc41b89a0..8924a1f5daec 100755
--- a/bin/list-uitest.py
+++ b/bin/list-uitest.py
@@ -12,7 +12,7 @@ import datetime
def analyze_file(filename):
class_name = ""
method_list = []
-with open(filename) as fh:
+with open(filename, encoding='utf-8') as fh:
for line in fh:
if line.lstrip().startswith('class '):
class_name = line.lstrip().split(" ")[1].split("(")[0]
@@ -51,7 +51,8 @@ def main():
'Calc' : ['../uitest/calc_tests', '../sc/qa/uitest/'],
'Impress' : ['../uitest/impress_tests/'],
'Math': ['../uitest/math_tests/'],
-'Draw': ['']}
+'Draw': [''],
+'Manual_tests': ['../uitest/manual_tests/']}
print('{{TopMenu}}')
print('{{Menu}}')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com wizards/Pyuno_commonwizards.mk
wizards/Pyuno_commonwizards.mk|5 wizards/com/sun/star/wizards/common/Configuration.py | 36 --- wizards/com/sun/star/wizards/common/FileAccess.py | 117 -- wizards/com/sun/star/wizards/common/ListModel.py |4 wizards/com/sun/star/wizards/common/SystemDialog.py | 42 --- wizards/com/sun/star/wizards/common/UCB.py| 33 -- wizards/com/sun/star/wizards/common/XMLHelper.py | 34 -- wizards/com/sun/star/wizards/common/XMLProvider.py| 24 -- wizards/com/sun/star/wizards/document/OfficeDocument.py | 63 - wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 22 - wizards/com/sun/star/wizards/text/TextDocument.py | 25 -- wizards/com/sun/star/wizards/ui/DocumentPreview.py|5 wizards/com/sun/star/wizards/ui/UnoDialog.py | 24 -- wizards/com/sun/star/wizards/ui/UnoDialog2.py | 37 --- wizards/com/sun/star/wizards/ui/WizardDialog.py | 19 - wizards/com/sun/star/wizards/ui/event/CommonListener.py | 50 wizards/com/sun/star/wizards/ui/event/DataAware.py| 27 -- wizards/com/sun/star/wizards/ui/event/EventListenerList.py|3 wizards/com/sun/star/wizards/ui/event/ListDataEvent.py| 36 --- wizards/com/sun/star/wizards/ui/event/ListDataListener.py | 32 -- wizards/com/sun/star/wizards/ui/event/ListModelBinder.py | 42 --- wizards/com/sun/star/wizards/ui/event/SimpleDataAware.py | 33 -- wizards/com/sun/star/wizards/ui/event/Task.py | 38 --- wizards/com/sun/star/wizards/ui/event/TaskEvent.py|6 wizards/com/sun/star/wizards/ui/event/TaskListener.py |4 wizards/com/sun/star/wizards/ui/event/UnoDataAware.py |6 26 files changed, 28 insertions(+), 739 deletions(-) New commits: commit 2029a593f2ff5863b81ba6abc5e466473c475b48 Author: Xisco Fauli Date: Thu Feb 1 15:40:51 2018 +0100 Removed unused code in python wizards This code got unused after 5b3022860abfe7eefd2e25b60b5b2a563b42b3c0 Change-Id: I6c198ab359f8468a9f4d9041b9bc4feb88eedd74 Reviewed-on: https://gerrit.libreoffice.org/49109 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk index 578555c6c5eb..1c139950d963 100644 --- a/wizards/Pyuno_commonwizards.mk +++ b/wizards/Pyuno_commonwizards.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\ common/SystemDialog.py \ common/IRenderer.py \ common/UCB.py \ -common/XMLHelper.py \ -common/XMLProvider.py \ common/ListModel.py \ common/__init__.py \ document/OfficeDocument.py \ @@ -50,12 +48,9 @@ $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\ ui/event/ListModelBinder.py \ ui/event/RadioDataAware.py \ ui/event/UnoDataAware.py \ -ui/event/SimpleDataAware.py \ ui/event/Task.py \ ui/event/TaskEvent.py \ ui/event/TaskListener.py \ -ui/event/ListDataEvent.py \ -ui/event/ListDataListener.py \ ui/event/EventListenerList.py \ ui/event/__init__.py \ )) diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index e63d20827542..91274e0b288c 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -54,47 +54,11 @@ class Configuration(object): def getNode(self, name, parent): return parent.getByName(name) -# This method creates a new configuration node and adds it -# to the given view. Note that if a node with the given name -# already exists it will be completely removed from -# the configuration. -# @param configView -# @param name -# @return the new created configuration node. -# @throws com.sun.star.lang.WrappedTargetException -# @throws ElementExistException -# @throws NoSuchElementException -# @throws com.sun.star.uno.Exception -@classmethod -def addConfigNode(self, configView, name): -try: -node = configView.getByName(name) -except Exception: -node = None -if (node is not None): -return node -else: -# create a new detached set element (instance of DataSourceDescription) -# the new element is the result ! -node = configView.createInstance() -# insert it - this also names the element -configView.insertByName(name, node) -return node - -@classmethod -def removeNode(self, configView, name): -if (configView.hasByName(name)): -configView.removeByName(name) - @classmethod def commit(self, configView): configView.commitChanges() @classmethod
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/html/fail/ofz5909-1.html |1 +
sw/source/filter/html/htmltab.cxx| 11 +--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 5090d575117fbe6ced75dc45c514f8d990523251
Author: Caolán McNamara
Date: Sun Feb 4 21:02:37 2018 +
ofz#5909 Null-dereference READ
Change-Id: I830d3e8bda517e7681cea7481c32457486ced693
Reviewed-on: https://gerrit.libreoffice.org/49218
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/core/data/html/fail/ofz5909-1.html
b/sw/qa/core/data/html/fail/ofz5909-1.html
new file mode 100644
index ..9511b2bc1eac
--- /dev/null
+++ b/sw/qa/core/data/html/fail/ofz5909-1.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index b1b273ddc531..fa9a8a6e9f87 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2296,6 +2296,12 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16
nAbsAvail,
break;
}
+if (!m_pSwTable)
+{
+SAL_WARN("sw.html", "no table");
+return;
+}
+
// get the table format and adapt it
SwFrameFormat *pFrameFormat = m_pSwTable->GetFrameFormat();
pFrameFormat->SetFormatAttr( SwFormatHoriOrient(0, eHoriOri) );
@@ -5196,8 +5202,9 @@ std::shared_ptr
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
m_bUpperSpace = true;
SetTextCollAttrs();
-m_nParaCnt = m_nParaCnt - std::min(m_nParaCnt,
-pTCntxt->GetTableNode()->GetTable().GetTabSortBoxes().size());
+SwTableNode* pTableNode = pTCntxt->GetTableNode();
+size_t nTableBoxSize = pTableNode ?
pTableNode->GetTable().GetTabSortBoxes().size() : 0;
+m_nParaCnt = m_nParaCnt - std::min(m_nParaCnt, nTableBoxSize);
// Jump to a table if needed
if( JUMPTO_TABLE == m_eJumpTo && m_xTable->GetSwTable() &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - ucbhelper/source
ucbhelper/source/provider/contentinfo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c77726f88d1a04616bb177505a7733b0e008f5c Author: David Tardon Date: Sun Nov 5 20:41:03 2017 +0100 Related: rhbz#304121 one slash is enough (cherry picked from commit 1bacce999d7dad91b1f87baaf09b08e6b4629fad) Change-Id: I35fbca7592f3e17a071df567f691c62fe9232fc1 Reviewed-on: https://gerrit.libreoffice.org/49241 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 2ad3edc29d5d..cdbae40880fc 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include "osl/mutex.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/source
sc/source/ui/inc/linkarea.hxx |2 +-
sc/source/ui/miscdlgs/linkarea.cxx |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 91ec9510e5b28aa2214d735faf11197b931c72b3
Author: Katarina Behrens
Date: Thu Feb 1 12:08:34 2018 +0100
Don't recycle DocumentInserter, create a new one every time
After all, everyone else using DocumentInserter across the codebase
does the same.
For KDE4, an attempt to reuse the same filepicker dialog sporadically
crashes in the depths of (old-ish, possibly buggy) libQt due to nested
event loop and/or recursive repaints.
(crash scenario: Calc > Sheet > Link to external data > Browse >
double-click
a file > Browse again > Kaboom!)
Reviewed-on: https://gerrit.libreoffice.org/49082
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit a74590e4b4475253bd7752738e570cdafe45e674)
Change-Id: Ib494203abd07873919b8394a442f09c5329d237c
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index a9a8b575d6e7..0d0e4e245b18 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -47,7 +47,7 @@ private:
VclPtr m_pBtnOk;
ScDocShell* pSourceShell;
-sfx2::DocumentInserter* pDocInserter;
+std::unique_ptr pDocInserter;
SfxObjectShellRef aSourceRef;
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx
b/sc/source/ui/miscdlgs/linkarea.cxx
index 143799d52ce3..0a475402dd12 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -88,9 +88,8 @@ short ScLinkedAreaDlg::Execute()
IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void)
{
-if ( !pDocInserter )
-pDocInserter = new sfx2::DocumentInserter(
-OUString::createFromAscii( ScDocShell::Factory().GetShortName() )
);
+pDocInserter.reset( new sfx2::DocumentInserter(
+OUString::createFromAscii( ScDocShell::Factory().GetShortName() )
) );
pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg,
DialogClosedHdl ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-design] Re: Minutes of the design meeting 2018-Jan-31
Pedro, I think you’ve been here enough time to realize that, as many similar libre software projects, this project is volunteer-driven, and that waving around your pet bugs without giving some support (financial or otherwise) yourself is borderline offensive for those who are contributing their free time… People are free to choose what they will work on… And no, the age of a bug does not automatically increase its importance. Just sayin’. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - common/Util.cpp
common/Util.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53384000a26222b5ba7189df43fa40022e53e153 Author: Miklos Vajna Date: Tue Jan 30 15:50:10 2018 +0100 common: avoid pointless copy in Util loolforkit is never able to get the arguments passed to it without this patch and nothing starts. Change-Id: I40097203eba6fede78a17caf057452f4704b2bd4 (cherry picked from commit 222399e99a2cec31bf6414252765098467629f70) Reviewed-on: https://gerrit.libreoffice.org/49243 Reviewed-by: pranavk Tested-by: pranavk diff --git a/common/Util.cpp b/common/Util.cpp index 357f6da8..8c7792c9 100644 --- a/common/Util.cpp +++ b/common/Util.cpp @@ -173,7 +173,7 @@ namespace Util std::vector params; params.push_back(const_cast(cmd.c_str())); -for (auto i : args) +for (const auto& i : args) params.push_back(const_cast(i.c_str())); params.push_back(nullptr); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - cui/source include/svx sd/source
cui/source/inc/backgrnd.hxx |1
cui/source/tabpages/backgrnd.cxx | 104 ++-
include/svx/flagsdef.hxx | 11 ++--
sd/source/ui/dlg/dlgchar.cxx |2
sd/source/ui/func/fuchar.cxx | 26 -
5 files changed, 91 insertions(+), 53 deletions(-)
New commits:
commit b0958ff8bf86b86682131b4da99da701a4a72adb
Author: Caolán McNamara
Date: Fri Aug 11 11:51:09 2017 +0100
Resolves: tdf#110077 move the SvxBackgroundColorItem<->SvxBrushItem
conversion
into the dialog itself
Reviewed-on: https://gerrit.libreoffice.org/41029
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 6284804c2ccb3ad8bb6e1c1dac8d622f66b8c07d)
Reviewed-on: https://gerrit.libreoffice.org/41168
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit a407285747c65894bc858c4aa722a24e57caca31)
Change-Id: I83db9f02145a4927257dd5691f82dad1a11eaea6
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index d2663f3cd27e..cd7ab4ffec35 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -107,6 +107,7 @@ private:
boolbIsGraphicValid : 1;
boolbLinkOnly : 1;
boolbHighlighting : 1;
+boolbCharBackColor : 1;
boolm_bColorSelected: 1;
Graphic aBgdGraphic;
OUStringaBgdGraphicPath;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 2554da1581b7..ed04e696199c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -39,6 +39,7 @@
#include
#include
+#include
#include "backgrnd.hxx"
#include
@@ -352,6 +353,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window*
pParent, const SfxItemSe
, bIsGraphicValid(false)
, bLinkOnly(false)
, bHighlighting(false)
+, bCharBackColor(false)
, m_bColorSelected(false)
, pPageImpl(new SvxBackgroundPage_Impl)
, pImportDlg(nullptr)
@@ -482,7 +484,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
// get and evaluate Input-BrushItem
-const SvxBrushItem* pBgdAttr = nullptr;
+bool bBrushItemSet = false;
sal_uInt16 nSlot = SID_ATTR_BRUSH;
const SfxPoolItem* pItem;
sal_uInt16 nDestValue = USHRT_MAX;
@@ -510,20 +512,39 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
{
nSlot = SID_ATTR_BRUSH_CHAR;
}
+else if( bCharBackColor )
+{
+nSlot = SID_ATTR_CHAR_BACK_COLOR;
+}
+
//#73# the destination item is missing when the parent style has been
changed
if(USHRT_MAX == nDestValue && m_pTblLBox->IsVisible())
nDestValue = 0;
-sal_uInt16 nWhich = GetWhich( nSlot );
+sal_uInt16 nWhich = GetWhich(nSlot);
+SvxBrushItem aBgdAttr(nWhich);
-if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
-pBgdAttr = static_cast(&( rSet->Get( nWhich ) ));
+if (rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT)
+{
+if (!bCharBackColor)
+aBgdAttr = static_cast(rSet->Get(nWhich));
+else
+{
+// EE_CHAR_BKGCOLOR is SvxBackgroundColorItem, but char background
tabpage
+// can only work with SvxBrushItems
+// extract Color out of SvxBackColorItem
+Color aBackColor = static_cast(rSet->Get(nWhich)).GetValue();
+// make new SvxBrushItem with this Color
+aBgdAttr = SvxBrushItem(aBackColor, SID_ATTR_BRUSH_CHAR);
+}
+bBrushItemSet = true;
+}
m_pBtnTile->Check();
-if ( pBgdAttr )
+if (bBrushItemSet)
{
-FillControls_Impl(*pBgdAttr, aUserData);
-aBgdColor = const_cast(pBgdAttr)->GetColor();
+FillControls_Impl(aBgdAttr, aUserData);
+aBgdColor = aBgdAttr.GetColor();
}
else
{
@@ -558,22 +579,22 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_BRUSH );
if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
-pBgdAttr = static_cast(&( rSet->Get(
nWhich ) ));
-pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
+aBgdAttr = static_cast(rSet->Get(nWhich));
+pTableBck_Impl->pCellBrush = new SvxBrushItem(aBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SfxItemState::DEFAULT )
{
-pBgdAttr = static_cast(&( rSet->Get(
SID_ATTR_BRUSH_ROW ) ));
-pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr);
+aBgdAttr = static_cast(rSet->Get(SID_ATTR_BRUSH_ROW));
+pTableBck_Impl->pRowBrush = new SvxBrushItem(aBgdAttr);
[Libreoffice-commits] core.git: include/svx
include/svx/svxids.hrc |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 96335019cdd7f7e611c29206eb9706556dd53c78 Author: Noel Grandin Date: Mon Feb 5 12:58:43 2018 +0200 fix ubsan after "TypedWhichId in svx part 1" noelgrandin, SID_ATTR_PAGE_EXT1 is used both as an SfxBoolItem (e.g., sd/source/ui/func/fupage.cxx) and as an SfxStringItem (e.g., sw/source/uibase/utlui/uitool.cxx) commit 24158311c115c2db6dd05a751f75a5c084e2c0d1 Author: Noel Grandin Date: Wed Dec 20 13:30:21 2017 +0200 TypedWhichId in svx part 1 Change-Id: If4e75470449d8f967f5f6818067edd7c24bc19a1 Reviewed-on: https://gerrit.libreoffice.org/49230 Reviewed-by: Stephan Bergmann Tested-by: Jenkins diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 93946c20a892..1d455dcef735 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -207,7 +207,8 @@ class SvxLineItem; #define SID_ATTR_PAGE_MAXSIZE TypedWhichId( SID_SVX_START + 52 ) #define SID_ATTR_PAGE_ORIENTATION TypedWhichId( SID_SVX_START + 53 ) #define SID_ATTR_PAGE_PAPERBIN TypedWhichId( SID_SVX_START + 54 ) -#define SID_ATTR_PAGE_EXT1 TypedWhichId( SID_SVX_START + 55 ) +// this is used both as a SfxBoolItem(sd/source/ui/func/fupage.cxx) and as a SfxStringItem(sw/source/uibase/utlui/uitool.cxx) +#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 55 ) #define SID_ATTR_PAGE_EXT2 TypedWhichId( SID_SVX_START + 56 ) #define SID_ATTR_PAGE_HEADERSET TypedWhichId( SID_SVX_START + 57 ) #define SID_ATTR_PAGE_FOOTERSET TypedWhichId( SID_SVX_START + 58 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Header.js |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit fec429ecdcb7de36cf65e1aa27d2e233a48a32ec
Author: Marco Cecchetti
Date: Fri Feb 2 12:36:24 2018 +0100
loleaflet: calc: double click on resize area freezes header handling
Change-Id: I05d758ed0cb6cafa5ab14418b82f23b607e4ea95
Reviewed-on: https://gerrit.libreoffice.org/49238
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Header.js
b/loleaflet/src/control/Control.Header.js
index 844e340e..9a97a254 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -396,6 +396,10 @@ L.Control.Header = L.Control.extend({
if (!this._hitResizeArea)
return;
+ var rect = this.getHeaderEntryBoundingClientRect();
+ if (!rect)
+ return;
+
L.DomUtil.disableImageDrag();
L.DomUtil.disableTextSelection();
@@ -408,7 +412,7 @@ L.Control.Header = L.Control.extend({
L.DomEvent.on(document, 'mousemove',
this._onMouseMoveForDragging, this);
L.DomEvent.on(document, 'mouseup', this._onMouseUp, this);
- var rect = this.getHeaderEntryBoundingClientRect();
+
this._start = new L.Point(rect.left, rect.top);
this._offset = new L.Point(rect.right - e.clientX, rect.bottom
- e.clientY);
this._item = target;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src
loleaflet/src/control/Control.Header.js |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 31d2fc7cb079fc28674d8de8b8770c1e0e923047
Author: Marco Cecchetti
Date: Fri Feb 2 12:36:24 2018 +0100
loleaflet: calc: double click on resize area freezes header handling
Change-Id: I05d758ed0cb6cafa5ab14418b82f23b607e4ea95
Reviewed-on: https://gerrit.libreoffice.org/49239
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Header.js
b/loleaflet/src/control/Control.Header.js
index ad8edec3..22e176da 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -396,6 +396,10 @@ L.Control.Header = L.Control.extend({
if (!this._hitResizeArea)
return;
+ var rect = this.getHeaderEntryBoundingClientRect();
+ if (!rect)
+ return;
+
L.DomUtil.disableImageDrag();
L.DomUtil.disableTextSelection();
@@ -408,7 +412,7 @@ L.Control.Header = L.Control.extend({
L.DomEvent.on(document, 'mousemove',
this._onMouseMoveForDragging, this);
L.DomEvent.on(document, 'mouseup', this._onMouseUp, this);
- var rect = this.getHeaderEntryBoundingClientRect();
+
this._start = new L.Point(rect.left, rect.top);
this._offset = new L.Point(rect.right - e.clientX, rect.bottom
- e.clientY);
this._item = target;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects postprocess/CustomTarget_check_dynamic_objects.mk
bin/check-elf-dynamic-objects |7 +-- postprocess/CustomTarget_check_dynamic_objects.mk |3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 49696161be136a274d23b5704f146e0421aeb7fe Author: Michael Stahl Date: Wed Nov 29 21:23:44 2017 +0100 postprocess: enable the check-elf-dynamic-objects for real Change-Id: Ie08d3dfc6306c18da7b1a5c000a75a18917c1f70 Reviewed-on: https://gerrit.libreoffice.org/45529 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index a066d8f55eb9..3561b4109c78 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -191,8 +191,11 @@ else wait if [ -s check_elf.out ] ; then - cat check_elf.out - status=1 +cat check_elf.out +# FIXME known broken, ignore for now +if grep -v 'libgpgmepp.so.6\|libgpgme.so.11\|libassuan.so.0' check_elf.out >/dev/null; then +status=1 +fi fi rm check_elf.out fi diff --git a/postprocess/CustomTarget_check_dynamic_objects.mk b/postprocess/CustomTarget_check_dynamic_objects.mk index 53baa2bfd92f..aedf589eb51e 100644 --- a/postprocess/CustomTarget_check_dynamic_objects.mk +++ b/postprocess/CustomTarget_check_dynamic_objects.mk @@ -19,7 +19,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/check_dynamic_objects)/check.done $(call gb_Postprocess_get_target,AllPackages) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,2) # currently we only check ELF objects - # FIXME fails currently, disabled - $(SRCDIR)/bin/check-elf-dynamic-objects -p || true + $(SRCDIR)/bin/check-elf-dynamic-objects -p # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-3-0-0'
New branch 'distro/collabora/collabora-online-3-0-0' available with the following commits: commit 8a1761aba1240fea1c6be64a96f92c6100c9f49d Author: Andras Timar Date: Mon Feb 5 16:54:05 2018 +0100 Bump package version to 3.0.0-8 Change-Id: Icac8464763e1ad922e6f8aa8f0f9fc3945cd11e6 commit d30e098804fbb1ba5cefc91303149dbea53095e9 Author: Marco Cecchetti Date: Fri Feb 2 12:36:24 2018 +0100 loleaflet: calc: double click on resize area freezes header handling Change-Id: I05d758ed0cb6cafa5ab14418b82f23b607e4ea95 Reviewed-on: https://gerrit.libreoffice.org/49239 Reviewed-by: Andras Timar Tested-by: Andras Timar (cherry picked from commit 31d2fc7cb079fc28674d8de8b8770c1e0e923047) commit 950ee3d05a2a638591f4aa954cef31d1c0282742 Author: Pranav Kant Date: Fri Feb 2 21:37:58 2018 +0530 loleaflet: Don't try to translate command names Command names are sent to loleaflet in already translated form when there are appropriate langpacks installed in the system. Only translate when we can. Change-Id: I92dc5865da85c76bd5a2529b0e6df994937c4c28 (cherry picked from commit 34aed93d839f99f46874ae744fa95c269f086d9e) Reviewed-on: https://gerrit.libreoffice.org/49157 Reviewed-by: Andras Timar Tested-by: Andras Timar (cherry picked from commit 198f3e7356684b97a658ab51a7553ca8319dd761) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ww8export/ww8export.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2a053160c4c8eb0acd66b74c52dbda23a654bda
Author: Michael Stahl
Date: Mon Feb 5 16:53:03 2018 +0100
sw: disable testTableKeep on WNT
Fails from time to time, like so:
https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1517842001.29090#err2
Change-Id: Ia33193fbfa05da58d31bcc5008beea32c1feb2fe
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index fab47934835f..f63260bcc056 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1293,7 +1293,7 @@ DECLARE_WW8EXPORT_TEST(testCommentExport,
"comment-export.odt")
}
}
-#if !defined(MACOSX)
+#if !defined(MACOSX) && !defined(_WIN32)
#if !TEST_FONTS_MISSING
DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |4 1 file changed, 4 deletions(-) New commits: commit 0a2df21501e66c35aeb7ae721ec9bdbaa04e198f Author: Miklos Vajna Date: Mon Feb 5 16:45:23 2018 +0100 wsd: remove unused using declarations in LOOLWSD Change-Id: I6b656a1446b015430068e4b172cf98fe746f26d1 diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 34482638..6b6696d8 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -134,11 +134,7 @@ using Poco::Net::HTTPResponse; using Poco::Net::MessageHeader; using Poco::Net::NameValueCollection; using Poco::Net::PartHandler; -using Poco::Net::SocketAddress; using Poco::Path; -#ifndef KIT_IN_PROCESS -using Poco::Pipe; -#endif using Poco::Process; using Poco::StreamCopier; using Poco::StringTokenizer; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - cui/source include/svx sd/source
cui/source/inc/backgrnd.hxx |1
cui/source/tabpages/backgrnd.cxx | 104 ++-
include/svx/flagsdef.hxx | 11 ++--
sd/source/ui/dlg/dlgchar.cxx |2
sd/source/ui/func/fuchar.cxx | 26 -
5 files changed, 91 insertions(+), 53 deletions(-)
New commits:
commit 8a322f65715af84f3a2dc089700671b9172f
Author: Caolán McNamara
Date: Fri Aug 11 11:51:09 2017 +0100
Resolves: tdf#110077 move the SvxBackgroundColorItem<->SvxBrushItem
conversion
into the dialog itself
Reviewed-on: https://gerrit.libreoffice.org/41029
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 6284804c2ccb3ad8bb6e1c1dac8d622f66b8c07d)
Reviewed-on: https://gerrit.libreoffice.org/41168
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit a407285747c65894bc858c4aa722a24e57caca31)
Change-Id: I83db9f02145a4927257dd5691f82dad1a11eaea6
(cherry picked from commit b0958ff8bf86b86682131b4da99da701a4a72adb)
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index d2663f3cd27e..cd7ab4ffec35 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -107,6 +107,7 @@ private:
boolbIsGraphicValid : 1;
boolbLinkOnly : 1;
boolbHighlighting : 1;
+boolbCharBackColor : 1;
boolm_bColorSelected: 1;
Graphic aBgdGraphic;
OUStringaBgdGraphicPath;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 43d8fdd2eddb..9f396624c830 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -38,6 +38,7 @@
#include
#include
+#include
#include "backgrnd.hxx"
#include
@@ -330,6 +331,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window*
pParent, const SfxItemSe
, bIsGraphicValid(false)
, bLinkOnly(false)
, bHighlighting(false)
+, bCharBackColor(false)
, m_bColorSelected(false)
, pPageImpl(new SvxBackgroundPage_Impl)
, pImportDlg(nullptr)
@@ -460,7 +462,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
// get and evaluate Input-BrushItem
-const SvxBrushItem* pBgdAttr = nullptr;
+bool bBrushItemSet = false;
sal_uInt16 nSlot = SID_ATTR_BRUSH;
const SfxPoolItem* pItem;
sal_uInt16 nDestValue = USHRT_MAX;
@@ -488,20 +490,39 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
{
nSlot = SID_ATTR_BRUSH_CHAR;
}
+else if( bCharBackColor )
+{
+nSlot = SID_ATTR_CHAR_BACK_COLOR;
+}
+
//#73# the destination item is missing when the parent style has been
changed
if(USHRT_MAX == nDestValue && m_pTblLBox->IsVisible())
nDestValue = 0;
-sal_uInt16 nWhich = GetWhich( nSlot );
+sal_uInt16 nWhich = GetWhich(nSlot);
+SvxBrushItem aBgdAttr(nWhich);
-if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
-pBgdAttr = static_cast(&( rSet->Get( nWhich ) ));
+if (rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT)
+{
+if (!bCharBackColor)
+aBgdAttr = static_cast(rSet->Get(nWhich));
+else
+{
+// EE_CHAR_BKGCOLOR is SvxBackgroundColorItem, but char background
tabpage
+// can only work with SvxBrushItems
+// extract Color out of SvxBackColorItem
+Color aBackColor = static_cast(rSet->Get(nWhich)).GetValue();
+// make new SvxBrushItem with this Color
+aBgdAttr = SvxBrushItem(aBackColor, SID_ATTR_BRUSH_CHAR);
+}
+bBrushItemSet = true;
+}
m_pBtnTile->Check();
-if ( pBgdAttr )
+if (bBrushItemSet)
{
-FillControls_Impl(*pBgdAttr, aUserData);
-aBgdColor = const_cast(pBgdAttr)->GetColor();
+FillControls_Impl(aBgdAttr, aUserData);
+aBgdColor = aBgdAttr.GetColor();
}
else
{
@@ -536,22 +557,22 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_BRUSH );
if ( rSet->GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
-pBgdAttr = static_cast(&( rSet->Get(
nWhich ) ));
-pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
+aBgdAttr = static_cast(rSet->Get(nWhich));
+pTableBck_Impl->pCellBrush = new SvxBrushItem(aBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SfxItemState::DEFAULT )
{
-pBgdAttr = static_cast(&( rSet->Get(
SID_ATTR_BRUSH_ROW ) ));
-pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr);
+aBgdAttr = static_cast(rSet->Get(SID_ATTR_BRUSH_ROW));
+
[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-3.0.0.4'
Tag 'CODE-3.0.0.4' created by Andras Timar at 2018-02-05 15:54 + CODE-3.0.0.4 Changes since CODE-3.0.0.3-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/3.0-final'
Tag '3.0-final' created by Andras Timar at 2018-02-05 15:55 + 3.0-final Changes since CODE-3.0.0.3-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark
icon-themes/sifr/cmd/32/backcolor.png |binary icon-themes/sifr/cmd/32/bold.png |binary icon-themes/sifr/cmd/lc_bold.png |binary icon-themes/sifr/cmd/sc_backcolor.png |binary icon-themes/sifr/cmd/sc_bold.png |binary icon-themes/sifr_dark/cmd/32/backcolor.png |binary icon-themes/sifr_dark/cmd/32/bold.png |binary icon-themes/sifr_dark/cmd/lc_backcolor.png |binary icon-themes/sifr_dark/cmd/lc_bold.png |binary icon-themes/sifr_dark/cmd/sc_backcolor.png |binary icon-themes/sifr_dark/cmd/sc_bold.png |binary 11 files changed New commits: commit 2cde59c5441d9195e016f8f0b2da697fc4ae2a9a Author: Matthias Freund Date: Sun Feb 4 21:51:29 2018 +0100 tdf#75256 Sifr update 32px for bold and backcolor Change-Id: Ibd6dc50925ad6188292e38c87f5ffbbf10792993 Reviewed-on: https://gerrit.libreoffice.org/49217 Tested-by: Jenkins Reviewed-by: Matthias Freund diff --git a/icon-themes/sifr/cmd/32/backcolor.png b/icon-themes/sifr/cmd/32/backcolor.png new file mode 100644 index ..1ab5a920775d Binary files /dev/null and b/icon-themes/sifr/cmd/32/backcolor.png differ diff --git a/icon-themes/sifr/cmd/32/bold.png b/icon-themes/sifr/cmd/32/bold.png new file mode 100644 index ..a1d742570fff Binary files /dev/null and b/icon-themes/sifr/cmd/32/bold.png differ diff --git a/icon-themes/sifr/cmd/lc_bold.png b/icon-themes/sifr/cmd/lc_bold.png index 9ed70b4c4be6..f2e1706d03d9 100644 Binary files a/icon-themes/sifr/cmd/lc_bold.png and b/icon-themes/sifr/cmd/lc_bold.png differ diff --git a/icon-themes/sifr/cmd/sc_backcolor.png b/icon-themes/sifr/cmd/sc_backcolor.png index 9f000129e1a1..f12aee1b8d17 100644 Binary files a/icon-themes/sifr/cmd/sc_backcolor.png and b/icon-themes/sifr/cmd/sc_backcolor.png differ diff --git a/icon-themes/sifr/cmd/sc_bold.png b/icon-themes/sifr/cmd/sc_bold.png index ce7bc4eecadb..368a8cdd5692 100644 Binary files a/icon-themes/sifr/cmd/sc_bold.png and b/icon-themes/sifr/cmd/sc_bold.png differ diff --git a/icon-themes/sifr_dark/cmd/32/backcolor.png b/icon-themes/sifr_dark/cmd/32/backcolor.png new file mode 100644 index ..a470fc676cf8 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/32/bold.png b/icon-themes/sifr_dark/cmd/32/bold.png new file mode 100644 index ..20c364464ffa Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/bold.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_backcolor.png b/icon-themes/sifr_dark/cmd/lc_backcolor.png index 5c7e2095afb5..a5badadc6fb1 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_backcolor.png and b/icon-themes/sifr_dark/cmd/lc_backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_bold.png b/icon-themes/sifr_dark/cmd/lc_bold.png index 98e43c23c147..50db6cf345d1 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_bold.png and b/icon-themes/sifr_dark/cmd/lc_bold.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_backcolor.png b/icon-themes/sifr_dark/cmd/sc_backcolor.png index 737e08c4de53..08ecc326c8c3 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_backcolor.png and b/icon-themes/sifr_dark/cmd/sc_backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_bold.png b/icon-themes/sifr_dark/cmd/sc_bold.png index 148f88b4f609..6dab8dcd6fe5 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_bold.png and b/icon-themes/sifr_dark/cmd/sc_bold.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk
ios/CustomTarget_iOS_setup.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 2db0c3e04348d3096dff72c568c461be3cb1a0c6 Author: jan Iversen Date: Mon Feb 5 19:37:43 2018 +0100 iOS, add tango theme to avoid vcl problem. Change-Id: I73bee8ce04ec6234187224d03f0e081f09037e72 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 8fea759249e9..eb102f669bf3 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -66,6 +66,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/share/filter cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter cp -R $(INSTDIR)/share/registry $(IOSRES)/share + cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config # Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and versionrc. (echo '[Bootstrap]' \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdograf.hxx |4
svx/source/svdraw/svdograf.cxx | 181 +++--
2 files changed, 88 insertions(+), 97 deletions(-)
New commits:
commit 94411b5765427344d106e5cca12c032ca5a1ea6a
Author: Tomaž Vajngerl
Date: Mon Feb 5 10:02:03 2018 +0900
use unique_ptr to store GraphicObject for SdrGrafObj
Change-Id: I578156cd96e1e1400e93e96ace8a38759e3d1b2c
Reviewed-on: https://gerrit.libreoffice.org/49221
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index b4fd3baba256..f31ed858e575 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -94,8 +94,8 @@ private:
OUString aFileName; // If it's a Link, the filename can be found in here
OUString aReferer;
OUString aFilterName;
-GraphicObject* pGraphic; // In order to speed up output of bitmaps,
especially rotated ones
-GraphicObject* mpReplacementGraphic;
+std::unique_ptr mpGraphicObject; // In order to speed up
output of bitmaps, especially rotated ones
+std::unique_ptr mpReplacementGraphicObject;
SdrGraphicLink* pGraphicLink; // And here a pointer for linked graphics
bool bMirrored:1; // True: the graphic is horizontal, which means it's
mirrored along the y-axis
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 7297beb2c914..29dffa90fd3b 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -282,10 +282,10 @@ sdr::contact::ViewContact*
SdrGrafObj::CreateObjectSpecificViewContact()
void SdrGrafObj::onGraphicChanged()
{
-if (!pGraphic || pGraphic->IsSwappedOut()) // don't force swap-in for this
+if (!mpGraphicObject || mpGraphicObject->IsSwappedOut()) // don't force
swap-in for this
return;
-const VectorGraphicDataPtr& rVectorGraphicDataPtr =
pGraphic->GetGraphic().getVectorGraphicData();
+const VectorGraphicDataPtr& rVectorGraphicDataPtr =
mpGraphicObject->GetGraphic().getVectorGraphicData();
if (!rVectorGraphicDataPtr.get())
return;
@@ -328,15 +328,14 @@ void SdrGrafObj::onGraphicChanged()
SdrGrafObj::SdrGrafObj()
: SdrRectObj()
-, pGraphicLink(nullptr)
-, bMirrored(false)
-, mbIsSignatureLine(false)
-, mbIsSignatureLineShowSignDate(true)
-, mbIsSignatureLineCanAddComment(false)
-{
-pGraphic = new GraphicObject;
-mpReplacementGraphic = nullptr;
-pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
+, mpGraphicObject(new GraphicObject)
+, pGraphicLink(nullptr)
+, bMirrored(false)
+, mbIsSignatureLine(false)
+, mbIsSignatureLineShowSignDate(true)
+, mbIsSignatureLineCanAddComment(false)
+{
+mpGraphicObject->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
onGraphicChanged();
// #i118485# Shear allowed and possible now
@@ -353,17 +352,16 @@ SdrGrafObj::SdrGrafObj()
mbSupportTextIndentingOnLineWidthChange = false;
}
-SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const tools::Rectangle& rRect)
+SdrGrafObj::SdrGrafObj(const Graphic& rGraphic, const tools::Rectangle& rRect)
: SdrRectObj(rRect)
+, mpGraphicObject(new GraphicObject(rGraphic))
, pGraphicLink(nullptr)
, bMirrored(false)
, mbIsSignatureLine(false)
, mbIsSignatureLineShowSignDate(true)
, mbIsSignatureLineCanAddComment(false)
{
-pGraphic = new GraphicObject( rGrf );
-mpReplacementGraphic = nullptr;
-pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
+mpGraphicObject->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
onGraphicChanged();
// #i118485# Shear allowed and possible now
@@ -380,17 +378,16 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const
tools::Rectangle& rRect)
mbSupportTextIndentingOnLineWidthChange = false;
}
-SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
+SdrGrafObj::SdrGrafObj(const Graphic& rGraphic)
: SdrRectObj()
+, mpGraphicObject(new GraphicObject(rGraphic))
, pGraphicLink(nullptr)
, bMirrored(false)
, mbIsSignatureLine(false)
, mbIsSignatureLineShowSignDate(true)
, mbIsSignatureLineCanAddComment(false)
{
-pGraphic = new GraphicObject( rGrf );
-mpReplacementGraphic = nullptr;
-pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
+mpGraphicObject->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) );
onGraphicChanged();
// #i118485# Shear allowed and possible now
@@ -409,18 +406,15 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
SdrGrafObj::~SdrGrafObj()
{
-delete pGraphic;
-delete mpReplacementGraphic;
ImpDeregisterLink();
}
-void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj )
+void SdrGrafObj::SetGraphicObject(const GraphicObject& rGraphicObject)
{
-*pGraphic = rGrfObj;
-delete mpReplacementGraphic;
-mpReplacementGraphic = nullptr;
-pGraph
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/inc toolkit/source
toolkit/inc/layout/layout.hxx|2
toolkit/source/layout/vcl/wbutton.cxx| 72
toolkit/source/layout/vcl/wcontainer.cxx |8 -
toolkit/source/layout/vcl/wfield.cxx | 87 +--
toolkit/source/layout/vcl/wrapper.cxx| 136 ++-
toolkit/source/layout/vcl/wrapper.hxx|6 -
6 files changed, 150 insertions(+), 161 deletions(-)
New commits:
commit 837bd0e46c8cb64362614bb6c548addee73f80fa
Author: Don Lewis
Date: Mon Feb 5 18:20:47 2018 +
A number of methods in main/toolkit/source/layout/vcl/* use either
"!this" or "this" in a boolean context in order to detect being
called with a null object and exit early. In a valid C++ program
"this" will never be null, so a compiler could legally optimize out
this comparision, which could potentially result in the method
dereferencing a null pointer later in the code. This situation
could only happen if the caller is using a null object pointer to
call the method or is using a object ref to call the method that
was generated by dereferencing a null pointer, neither of which is
valid. Resolve this by moving the checks out of the method and
into the caller.
Make this easier by changing the getImpl() method to return the
private *Impl pointer directly instead of deferencing the pointer
and returning a ref. The latter is invalid if the pointer is null.
This allows GetImpl() to be called in a boolean contect to peform
the check. It also allows a number of instances of "&getImpl()"
calls in a boolean context to be fixed by changing them to "getImpl()".
The address of a ref will never be zero in a valid C++ program, so
the compiler could potentially optimize out those checks.
There does not appear to be any need for Control and ComboBox to
use customized versions of GetImpl() since these appear to behave
identically to the versions generated by the canned macro, so switch
them back to the macro version.
This commit should result in no functional changes.
It seems like all of these checks for a null implementation should
not be necessary, but that requires further investigation.
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 01dbd2228610..69e38af00d55 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -102,7 +102,7 @@ public:
t( Window *parent, WinBits nStyle = defaultWinBit ); \
t (Window *parent, ResId const &res)
#define DECL_GET_IMPL(t) \
-inline t##Impl &getImpl() const
+inline t##Impl *getImpl() const
#define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const
#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return
dynamic_cast< ::cls*>( GetWindow() ); }
diff --git a/toolkit/source/layout/vcl/wbutton.cxx
b/toolkit/source/layout/vcl/wbutton.cxx
index c769bdca736e..afdeca8a957b 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -140,35 +140,36 @@ String Button::GetStandardText (sal_uInt16 button_type)
void Button::SetText( OUString const& rStr )
{
-if ( !getImpl().mxButton.is() )
+if ( !getImpl()->mxButton.is() )
return;
-getImpl().mxButton->setLabel( rStr );
+getImpl()->mxButton->setLabel( rStr );
}
void Button::SetClickHdl( const Link& link )
{
-if (&getImpl () && getImpl().mxButton.is ())
-getImpl().SetClickHdl( link );
+if (getImpl() && getImpl()->mxButton.is ())
+getImpl()->SetClickHdl( link );
}
Link& Button::GetClickHdl ()
{
-return getImpl().GetClickHdl ();
+return getImpl()->GetClickHdl ();
}
bool Button::SetModeImage (Image const& image)
{
-return getImpl().SetModeImage (image.getImpl().mxGraphic);
+return getImpl() || getImpl()->SetModeImage (image.getImpl().mxGraphic);
}
bool Button::SetModeImage (::Image const& image, BmpColorMode mode)
{
-return GetButton ()->SetModeImage (image, mode);
+return !GetButton () || GetButton ()->SetModeImage (image, mode);
}
void Button::SetImageAlign( ImageAlign eAlign )
{
-getImpl().setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
+if ( getImpl() )
+getImpl()->setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
}
void Button::Click()
@@ -229,14 +230,15 @@ PushButton::~PushButton ()
void PushButton::Check( bool bCheck )
{
-getImpl().setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
+if ( getImpl() )
+getImpl()->setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
// XButton doesn't have explicit toggle event
-getImpl().fireToggle();
+getImpl()->fireToggle();
}
bool PushButton::IsChecked() const
{
-return !!( getImpl().getProperty( "State" ).get< sal_Int16 >() );
+return !!( getImpl() && getImpl()->getProperty( "State" ).get< sal_Int16
>() );
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docufld.hxx| 33 +++
sw/source/core/fields/docufld.cxx | 168 +++---
2 files changed, 101 insertions(+), 100 deletions(-)
New commits:
commit 3e6b60b27fe2eb4c8d38aa4ccafaf166ebbfd76d
Author: Miklos Vajna
Date: Mon Feb 5 10:09:01 2018 +0100
sw: prefix members of SwHiddenParaField, SwHiddenTextField and
SwJumpEditField
Change-Id: I23a5ea2d85f5f22f48a2c069d84929b4d70f62a0
Reviewed-on: https://gerrit.libreoffice.org/49225
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index bcd44403e1ef..3f1f6b7c494c 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -277,28 +277,28 @@ public:
class SwHiddenTextFieldType : public SwFieldType
{
-bool bHidden;
+bool m_bHidden;
public:
SwHiddenTextFieldType(bool bSetHidden = true);
virtual SwFieldType*Copy() const override;
voidSetHiddenFlag( bool bSetHidden );
-bool GetHiddenFlag() const { return bHidden; }
+bool GetHiddenFlag() const { return m_bHidden; }
};
class SW_DLLPUBLIC SwHiddenTextField : public SwField
{
-OUString aTRUEText; ///< Text if condition true.
-OUString aFALSEText;///< If condition false.
-OUString aContent; ///< Evaluated DB-text.
+OUString m_aTRUEText; ///< Text if condition true.
+OUString m_aFALSEText; ///< If condition false.
+OUString m_aContent; ///< Evaluated DB-text.
-OUString aCond;///< Condition.
-sal_uInt16 nSubType;
+OUString m_aCond; ///< Condition.
+sal_uInt16 m_nSubType;
-boolbCanToggle : 1; ///< Can field be toggled alone?
-boolbIsHidden : 1; ///< Is it not visible?
-boolbValid : 1; ///< Is DB-field evaluated?
+bool m_bCanToggle : 1; ///< Can field be toggled alone?
+bool m_bIsHidden : 1; ///< Is it not visible?
+bool m_bValid : 1; ///< Is DB-field evaluated?
virtual OUStringExpand() const override;
virtual SwField*Copy() const override;
@@ -321,7 +321,7 @@ public:
voidEvaluate(SwDoc*);
-void SetValue(bool bHidden) { bIsHidden = bHidden; }
+void SetValue(bool bHidden) { m_bIsHidden = bHidden; }
static OUString GetColumnName(const OUString& rName);
static OUString GetDBName(const OUString& rName, SwDoc *pDoc);
@@ -355,8 +355,8 @@ public:
class SwHiddenParaField : public SwField
{
-OUString aCond;
-boolbIsHidden:1;
+OUString m_aCond;
+bool m_bIsHidden;
public:
/// Direct input, delete old value.
SwHiddenParaField(SwHiddenParaFieldType*, const OUString& rCond);
@@ -364,8 +364,8 @@ public:
virtual OUStringExpand() const override;
virtual SwField*Copy() const override;
-voidSetHidden(bool bHidden) { bIsHidden = bHidden; }
-boolIsHidden() const{ return bIsHidden;}
+voidSetHidden(bool bHidden) { m_bIsHidden = bHidden; }
+boolIsHidden() const{ return m_bIsHidden;}
/// Query, set condition.
virtual OUStringGetPar1() const override;
@@ -643,7 +643,8 @@ public:
class SwJumpEditField : public SwField
{
-OUString sText, sHelp;
+OUString m_sText;
+OUString m_sHelp;
public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const OUString& sText, const OUString& sHelp );
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index fa0e3edc807a..174eb02afaab 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1252,20 +1252,20 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
}
SwHiddenTextFieldType::SwHiddenTextFieldType( bool bSetHidden )
-: SwFieldType( SwFieldIds::HiddenText ), bHidden( bSetHidden )
+: SwFieldType( SwFieldIds::HiddenText ), m_bHidden( bSetHidden )
{
}
SwFieldType* SwHiddenTextFieldType::Copy() const
{
-return new SwHiddenTextFieldType( bHidden );
+return new SwHiddenTextFieldType( m_bHidden );
}
void SwHiddenTextFieldType::SetHiddenFlag( bool bSetHidden )
{
-if( bHidden != bSetHidden )
+if( m_bHidden != bSetHidden )
{
-bHidden = bSetHidden;
+m_bHidden = bSetHidden;
UpdateFields(); // notify all HiddenTexts
}
}
@@ -1276,26 +1276,26 @@ SwHiddenTextField::SwHiddenTextField(
SwHiddenTextFieldType* pFieldType,
const OUString& rStr,
boolbHidden,
sal_uInt16 nSub) :
-SwField( pFieldType ), aCond(rCond), nSubType(nSub),
-bCanToggle(bConditional), bIsHidden(bHidden), bValid(false)
+SwField( pFieldType ), m_aCond(rCond), m
Re: Minutes of the design meeting 2018-Jan-31
Hi, Le 31/01/2018 à 21:48, Heiko Tietze a écrit : [...] GSoC * Full list of ideas https://pad.documentfoundation.org/p/UX-GSoC_Ideas * Public list https://wiki.documentfoundation.org/Development/GSoC/Ideas#User_Interface Here are some suggestions based on my recent experience in teaching LibreOffice and writing a python macro : Impress : work on "papercut" bugs -- 1 - Animations sets for a text box with several paragraphs don't affect new paragraphs (not inherited) https://bugs.documentfoundation.org/show_bug.cgi?id=57581 This is the most annoying problem that new users face : - they create a slide with few lines of text, - they add an animation on the text, to make it appear line by line - they test : it works correctly - they add one line of text (inside or at the end) - they test and boom... the animation is "broken" - they make a pause, then... close impress and open powerpoint... 2 - Editing: Text spacing changes when click in textbox https://bugs.documentfoundation.org/show_bug.cgi?id=89060 It is a subtle but very annoying visual effect. Python macros I had to create a macro embedded in a file. As I had not written basic for a long time, I tried to write it in python. The fist problem is that on Ubuntu, it is necessary to install a specific package 'libreoffice-script-provider-python' The second problem is that, by default, there is no tool to integrate a python macro in a document. I found the APSO extension [1] that allows that and is very useful. I found some difficult points in writing python macro with that extension : - after modifying a python script, you have to close and re-open the odf file - some inline documentation is missing : about API, and some sample code - the context (available via XSCRIPTCONTEXT) is missing some API, compared to basic So here are my suggestions for GSoC : - allow an easy activation of python support : a simple button would download and install all necessary packages - integrate the functionality of APSO (to allow embedding/managing python script in odf file) - remove the need to re-open the odf file before using a new version of python script Other points can be done directly in the current extension : - add some inline documentation about API [2] - add inline documentation on both ways to use python script : - an external script that connects to LibreOffice - an internal script that get called by menu/button - allow to create scripts empty or with comments (that provide minimum documentation and good practice) - add a library of sample code (a list of "how-to ?"), that can be easily copied in script files Adding API to the context (available via XSCRIPTCONTEXT) can be done by working on LibreOffice code : /usr/lib/libreoffice/program/pythonscript/py Cheers, Michel [1] https://extensions.libreoffice.org/extensions/apso-alternative-script-organizer-for-python [2] based on very useful page https://wiki.openoffice.org/wiki/Python/Transfer_from_Basic_to_Python ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - cui/source
cui/source/inc/backgrnd.hxx |1 +
cui/source/tabpages/backgrnd.cxx | 12 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit f9a0f6bad57949c508024a7fcbca1f783788ec03
Author: Eike Rathke
Date: Tue Jun 20 23:56:44 2017 +0200
Resolves: tdf#105740 select without selecting.. tdf#101588 b0rk
The initial color, if determined, must result in being selected.
Differentiate
between pre-selected and user-selected.
Regression of
commit 429be969b39867d6d9f36978c9ac15b601e78ba6
Date: Mon Dec 12 21:24:20 2016 +0100
Change-Id: I928af131d03c61a8e474e5cd356aea8b766112fa
Reviewed-on: https://gerrit.libreoffice.org/49256
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index e2b8d84e5ca1..06497440b7c7 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -108,6 +108,7 @@ private:
boolbIsGraphicValid : 1;
boolbLinkOnly : 1;
boolbHighlighting : 1;
+boolm_bColorSelected: 1;
Graphic aBgdGraphic;
OUStringaBgdGraphicPath;
OUStringaBgdGraphicFilter;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 1f34633e6fcd..59df9a96c345 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -330,6 +330,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window*
pParent, const SfxItemSe
, bIsGraphicValid(false)
, bLinkOnly(false)
, bHighlighting(false)
+, m_bColorSelected(false)
, pPageImpl(new SvxBackgroundPage_Impl)
, pImportDlg(nullptr)
, pTableBck_Impl(nullptr)
@@ -447,6 +448,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
return;
}
+m_bColorSelected = false;
+
// condition of the preview button is persistent due to UserData
OUString aUserData = GetUserData();
m_pBtnPreview->Check( !aUserData.isEmpty() && '1' == aUserData[0] );
@@ -681,7 +684,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
{
// Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor ||
- (SfxItemState::DEFAULT >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
+ (SfxItemState::DEFAULT >= eOldItemState &&
m_bColorSelected))
{
bModified = true;
rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
@@ -1135,6 +1138,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage,
BackgroundColorHdl_Impl, ValueSet*,
sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId();
Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId )
) : Color( COL_TRANSPARENT );
aBgdColor = aColor;
+m_bColorSelected = true;
m_pPreviewWin1->NotifyChange( aBgdColor );
}
@@ -1421,13 +1425,9 @@ void SvxBackgroundTabPage::FillControls_Impl( const
SvxBrushItem& rBgdAttr,
}
else
{
-bool bNoSelection = m_pBackgroundColorSet->IsNoSelection();
m_pBackgroundColorSet->SelectItem( nCol );
-m_pBackgroundColorSet->SaveValue();
-// The actual selection is user set, not what we preset.
-if (bNoSelection)
-m_pBackgroundColorSet->SetNoSelection();
}
+m_pBackgroundColorSet->SaveValue();
m_pPreviewWin1->NotifyChange( aBgdColor );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpfribtable.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d525fe37700afd39ab1ced7c28476229bc5751dd
Author: Caolán McNamara
Date: Mon Feb 5 20:56:29 2018 +
ofz#6024 Direct-leak
Change-Id: I43959dea19860bc0d34c4623fc86ccb3ce069189
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx
b/lotuswordpro/source/filter/lwpfribtable.cxx
index 67135fff4603..f675fd77e5d1 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -144,9 +144,9 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
sChangeID = pChangeMgr->GetChangeID(this);
if (!sChangeID.isEmpty() && pXFContentContainer)
{
-XFChangeStart* pChangeStart = new XFChangeStart;
-pChangeStart->SetChangeID(sChangeID);
-pXFContentContainer->Add(pChangeStart);
+rtl::Reference xChangeStart(new XFChangeStart);
+xChangeStart->SetChangeID(sChangeID);
+pXFContentContainer->Add(xChangeStart.get());
}
}
@@ -157,19 +157,19 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
{
if (!sChangeID.isEmpty() && pXFContentContainer)
{
-XFChangeEnd* pChangeEnd = new XFChangeEnd;
-pChangeEnd->SetChangeID(sChangeID);
-pXFContentContainer->Add(pChangeEnd);
+rtl::Reference xChangeEnd(new XFChangeEnd);
+xChangeEnd->SetChangeID(sChangeID);
+pXFContentContainer->Add(xChangeEnd.get());
}
}
if(LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType
&& HasNextFrib())
{
-XFParagraph* pXFPara = new XFParagraph();
-pXFPara->SetStyleName(m_StyleName);
-m_pPara->AddXFContent(pXFPara);
-m_pPara->GetFribs().SetXFPara(pXFPara);
+rtl::Reference xXFPara(new XFParagraph);
+xXFPara->SetStyleName(m_StyleName);
+m_pPara->AddXFContent(xXFPara.get());
+m_pPara->GetFribs().SetXFPara(xXFPara.get());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b4/027b74a699d7a8070d0669e780b7fbe4d03807
b4/027b74a699d7a8070d0669e780b7fbe4d03807 |1 + 1 file changed, 1 insertion(+) New commits: commit ba529fd197fd2e99d3f549868d70c64565e447d8 Author: Caolán McNamara Date: Mon Feb 5 21:00:39 2018 + Notes added by 'git notes add' diff --git a/b4/027b74a699d7a8070d0669e780b7fbe4d03807 b/b4/027b74a699d7a8070d0669e780b7fbe4d03807 new file mode 100644 index ..75dcc599ca90 --- /dev/null +++ b/b4/027b74a699d7a8070d0669e780b7fbe4d03807 @@ -0,0 +1 @@ +prefer: 6d3b26829b5f30ea934249ef88eb10b2507969f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/util
officecfg/util/component-conf.gen | 79 --
officecfg/util/component-ldif.gen | 76 -
officecfg/util/component-map.gen | 87 --
3 files changed, 242 deletions(-)
New commits:
commit 0f7825e7f32b5e62ab70d0b4856fe0aa16594fed
Author: Stephan Bergmann
Date: Mon Feb 5 16:29:52 2018 +0100
Remove unused officecfg/util/component-*.gen files
...that appear to never have been used for anything that would still be
relevant
for LO today at least, and have effectively never been modified since their
introduction with 0ff65e7aa039b442e61080aae50e4ef629f8ff4c "#97750# property
mapping for LDAP DS" (and seem to be about some other LDAP integration than
what is provided by officecfg/registry/schema/oo-*.xcd.sample)
Change-Id: I36f92dbb187ff6966e0b89152f3dd3eeb128662e
Reviewed-on: https://gerrit.libreoffice.org/49248
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/officecfg/util/component-conf.gen
b/officecfg/util/component-conf.gen
deleted file mode 100755
index 846e765521a6..
--- a/officecfg/util/component-conf.gen
+++ /dev/null
@@ -1,79 +0,0 @@
-: # -*- perl -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# generates of the component schema list an ldap schema in slapd format
-
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-
-#creating the output file
-open(OUTFILE, ">$ARGV[0]") or die "can't open >$ARGV[0]";
-
-#open the makefile
-open(INFILE, "makefile.mk") or die "can't open makefile.mk";
-
-$inxcs=0;
-
-#search all schemas in the makefile except userprofile and format them as e.g
org.openoffice.Inet
-while() {
- tr/\r\n//d;
-
- if (/^\s*XCSFILES/) {
- $inxcs++;
- }
- next unless $inxcs;
-
- if ($inxcs) {
-
- $inxcs=0 unless /\\$/;
-
- next if (/^\s*XCSFILES/);
- next if (/UserProfile/);
-
- s/^\s+//;
- s/\s*\\$//;
- s/\.xcs.*$//;
- s#\$/#.#g;
-
- push(@comp_names, $_);
- }
-}
-close(INFILE);
-
-# generate the schema in slapd format
-
-foreach (@comp_names) {
-
- s#org.openoffice.#oo-#g;
- s#\.#-#g;
-
- $myLdapName=lc $_;
-
- print OUTFILE "attribute $myLdapName-attr $myLdapName-attr-oid cis
single\n";
- print OUTFILE "objectclass $myLdapName-class\n";
- print OUTFILE "\toid\n";
- print OUTFILE "\t\t$myLdapName-class-oid\n";
- print OUTFILE "\tsuperior top\n";
- print OUTFILE "\tallows\n";
- print OUTFILE "\t$myLdapName-attr\n";
-}
-
-close(OUTFILE);
-
-exit 0;
diff --git a/officecfg/util/component-ldif.gen
b/officecfg/util/component-ldif.gen
deleted file mode 100755
index db26e31a35ee..
--- a/officecfg/util/component-ldif.gen
+++ /dev/null
@@ -1,76 +0,0 @@
-: # -*- perl -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# generates of the component schema list an ldap schema in ldif format
-
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-
-#creating the output file
-open(OUTFILE, ">$ARGV[0]") or die "can't open >$ARGV[0]";
-
-#open the makefile
-open(INFILE, "makefile.mk") or die "can't open makefile.mk";
-
-$inxcs=0;
-
-#search all schemas in the makefile except userprofile and format them as e.g
org.openoffice.Inet
-while() {
- tr/\r\n//d;
-
- if (/^\s*XCSFI
[Libreoffice-commits] core.git: officecfg/util
officecfg/util/resource.xsl | 70 1 file changed, 70 deletions(-) New commits: commit 8d9f4eb63816737b44e496ed7add70bc18368cb3 Author: Stephan Bergmann Date: Mon Feb 5 16:38:57 2018 +0100 Remove unused officecfg/util/resource.xsl ...that was presumably used from officecfg/registry/schema/makefile.mk when it got introduced with 0fdb9a2b4abb0d05bbe89692515e5dc8f03768ad "#100282# create java property files for SOMC", but appears to be unused today (and has effectively been left unchanged since its introduction) Change-Id: I0b6ffbf1dff6950d24fa13c55f5b9cba23cd737f Reviewed-on: https://gerrit.libreoffice.org/49250 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/officecfg/util/resource.xsl b/officecfg/util/resource.xsl deleted file mode 100644 index a0119b146cf7.. --- a/officecfg/util/resource.xsl +++ /dev/null @@ -1,70 +0,0 @@ - - - -http://www.w3.org/1999/XSL/Transform"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xmlns:xs="http://www.w3.org/2001/XMLSchema"; -xmlns:oor="http://openoffice.org/2001/registry"; -version="1.0"> - - - - - -en-US - - - - - - - - - - - - - - - - - - - -[] -[] - -. - - - - -= - - - - - - - - - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Setup.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffd8369b909c86653ef30593fddf67c9f5308583 Author: Stephan Bergmann Date: Mon Feb 5 17:17:17 2018 +0100 rhbz#1541486: Fix localized'ness of ooSetupFactoryUIName props 8f44fb5ee0bd21d192820ffd359504f6d1c68a52 "Mark Base window titles for localisation" localized some uses of ooSetupFactoryUIName in officecfg/registry/data/org/openoffice/Setup.xcu, but failed to mark the prop as oor:localized="true" in officecfg/registry/schema/org/openoffice/Setup.xcs. (So some arbitrary localized version of the prop would win at runtime, potentially displaying certain window titles in wrong languages.) Other uses of ooSetupFactoryUIName in Setup.xcu (for "Calc", "Impress", "Writer", etc.) have never been localized, and are probably not meant to be localized. AFAICS, irrespective of oor:localized="true" in Setup.xcs, their values not being marked with xml:lang="en-US" in Setup.xcu will mean that they will not appear in translations/source/*/officecfg/registry/data/org/openoffice.po and will not accidentally start to be translated after this commit. (Theoretically, inconsistencies between oor:localized in xcs and uses of xml:lang in xcu could statically be caught at build time, e.g., with officecfg/util/sanity.xsl. However, those checks work on each XML file individually, so don't have the schema information available when looking at the data in the xcu file. And those checks are written in XSLT, which makes writing new checks rather, erm, unpleasant.) Change-Id: I9c61e8ebf75d3d54f7e5b6688eac47a6ed8dc5c3 Reviewed-on: https://gerrit.libreoffice.org/49252 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index f55e3698f58f..31db1eca9af4 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -149,7 +149,7 @@ Specifies the short name of the factory. - + Specifies the UI name of the factory. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/util
officecfg/util/template.gen | 51
1 file changed, 51 deletions(-)
New commits:
commit 578fa77e8922ee9bf97e8b17ba4fb2b9bfae6e61
Author: Stephan Bergmann
Date: Mon Feb 5 16:37:42 2018 +0100
Remove unused officecfg/util/template.gen
...that appears to be unused (and effectively unchanged) at least ever since
ee27dd72550ce8815e06e337d3682d5b8d9d7b11 "initial import"
Change-Id: Ie10fa6c28c375cc467aad104cbc224aef91b0d31
Reviewed-on: https://gerrit.libreoffice.org/49249
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/officecfg/util/template.gen b/officecfg/util/template.gen
deleted file mode 100755
index a19395767118..
--- a/officecfg/util/template.gen
+++ /dev/null
@@ -1,51 +0,0 @@
-: # -*- perl -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-
-open(OUTFILE, ">$ARGV[1]");
-
-print OUTFILE "\n";
-print OUTFILE "\n";
-
-
-chdir($ARGV[0]) or die "can't chdir() to $ARGV[0]";
-
-opendir(DIR, ".");
-
-@files=readdir(DIR);
-
-foreach $file (@files) {
- if ( $file =~ /\w*\.tpl/ ) {
- open(INFILE, "<$file") or die "can't open file $file";
- while() {
- if ( /xml version=/ ) {
- next;
- }
- print OUTFILE;
- }
- close(INFILE);
- }
-}
-
-print OUTFILE "\n";
-
-closedir(DIR);
-
-close(OUTFILE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen8.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 951dd781743c975a7d29cc30e88e1b4a56c0b176
Author: Eike Rathke
Date: Mon Feb 5 23:13:08 2018 +0100
Turn assert into SAL_WARN
In the wild there are named expressions without expression and
formula error cells without formula.
Change-Id: I11546b09173de65cebe776529edee74c549d73c8
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index eb58eb080213..48b9c443990f 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1195,7 +1195,10 @@ void ScDocument::CheckLinkFormulaNeedingCheck( const
ScTokenArray& rCode )
}
else
{
-assert(!"called with empty ScTokenArray");
+// Possible with named expression without expression like Excel
+// internal print ranges, obscure user define names, ... formula error
+// cells without formula ...
+SAL_WARN("sc.core","ScDocument::CheckLinkFormulaNeedingCheck - called
with empty ScTokenArray");
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
Hi Caolán, On Monday, 2018-02-05 10:35:39 +, Caolán McNamara wrote: > On Thu, 2018-02-01 at 21:26 +, Crashtest VM wrote: > > New crashtest update available at http://dev-builds.libreoffice.org/c > > rashtest/4696d3728f0aba1087001bc543fc0867dd0ebdda/ > > The threaded xml import stuff is now gone, all that remains is the more > recent assert from... > > commit faa0305ba3d0dc698fce4915d4f3a1fb52422380 Shredded with commit 951dd781743c975a7d29cc30e88e1b4a56c0b176 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/customize/CommandCategoryListBox.cxx | 29
cui/source/customize/SvxMenuConfigPage.cxx |4 +--
cui/source/customize/SvxToolbarConfigPage.cxx |4 +--
cui/source/inc/CommandCategoryListBox.hxx |7 +++--
4 files changed, 28 insertions(+), 16 deletions(-)
New commits:
commit d6630ddc992f65975f4ad4fc4677a799e634fca1
Author: Jim Raykowski
Date: Wed Jan 24 23:05:16 2018 -0900
tdf#112239: Add icons to customize dialog function tree
Change-Id: I68e908664d24c52657b3a073aae1c8cc41c3ce3e
Reviewed-on: https://gerrit.libreoffice.org/48556
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/source/customize/CommandCategoryListBox.cxx
b/cui/source/customize/CommandCategoryListBox.cxx
index bc0d3d6c80b4..4d83f1147215 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -43,6 +43,8 @@
#include
#include
+#include //for SaveInData
+
CommandCategoryListBox::CommandCategoryListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
, pStylesInfo( nullptr )
@@ -198,7 +200,8 @@ void CommandCategoryListBox::Init(
void CommandCategoryListBox::FillFunctionsList(
const css::uno::Sequence& xCommands,
const VclPtr& pFunctionListBox,
-const OUString& filterTerm )
+const OUString& filterTerm,
+SaveInData *pCurrentSaveInData )
{
// Setup search filter parameters
m_searchOptions.searchString = filterTerm;
@@ -217,7 +220,11 @@ void CommandCategoryListBox::FillFunctionsList(
continue;
}
-SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName );
+Image aImage;
+if (pCurrentSaveInData)
+aImage = pCurrentSaveInData->GetImage(rInfo.Command);
+
+SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName,
aImage, aImage );
m_aGroupInfo.push_back( o3tl::make_unique(
SfxCfgKind::FUNCTION_SLOT, 0 ) );
SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get();
@@ -255,7 +262,7 @@ OUString CommandCategoryListBox::MapCommand2UIName(const
OUString& sCommand)
}
void CommandCategoryListBox::categorySelected( const
VclPtr& pFunctionListBox,
-const OUString& filterTerm )
+const OUString& filterTerm ,
SaveInData *pCurrentSaveInData)
{
SfxGroupInfo_Impl *pInfo =
static_cast(GetSelectedEntryData());
pFunctionListBox->SetUpdateMode(false);
@@ -281,7 +288,7 @@ void CommandCategoryListBox::categorySelected( const
VclPtrgetConfigurableDispatchInformation(
pCurrentInfo->nUniqueID );
-FillFunctionsList( lCommands, pFunctionListBox,
filterTerm );
+FillFunctionsList( lCommands, pFunctionListBox,
filterTerm, pCurrentSaveInData );
}
catch( css::container::NoSuchElementException& )
{
@@ -298,7 +305,7 @@ void CommandCategoryListBox::categorySelected( const
VclPtr lCommands =
xProvider->getConfigurableDispatchInformation(nGroup);
-FillFunctionsList( lCommands, pFunctionListBox, filterTerm );
+FillFunctionsList( lCommands, pFunctionListBox, filterTerm,
pCurrentSaveInData );
break;
}
case SfxCfgKind::GROUP_SCRIPTCONTAINER: //Macros
@@ -363,7 +370,7 @@ void CommandCategoryListBox::categorySelected( const
VclPtrEnableChildrenOnDemand();
//Add the children and the grand children
-addChildren( pMacroGroup, childGroup,
pFunctionListBox, filterTerm );
+addChildren( pMacroGroup, childGroup,
pFunctionListBox, filterTerm, pCurrentSaveInData );
// Remove the main group if empty
if (!pMacroGroup->HasChildren())
@@ -464,7 +471,7 @@ void
CommandCategoryListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
void CommandCategoryListBox::addChildren(
SvTreeListEntry* parentEntry, const css::uno::Reference<
css::script::browse::XBrowseNode > &parentNode,
-const VclPtr& pFunctionListBox, const OUString&
filterTerm )
+const VclPtr& pFunctionListBox, const OUString&
filterTerm , SaveInData *pCurrentSaveInData)
{
// Setup search filter parameters
m_searchOptions.searchString = filterTerm;
@@ -486,7 +493,7 @@ void CommandCategoryListBox::addChildren(
pNewEntry->SetUserData( m_aGroupInfo.back().get() );
pNewEntry->EnableChildrenOnDemand();
-addChildren(pNewEntry, child, pFunctionListBox, filterTerm);
+addChildren(pNewEntry, child, pFunctionListBox, filterTerm,
pCurrentSaveInData);
// Remove the group if empty
if (!pNewEntry->HasChildren())
@@ -537,7 +544,11 @@ void CommandCat
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/parse.hxx|2 +-
starmath/source/parse.cxx | 22 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 715114595e0feec49c4d54cc5eb26f13dccb7968
Author: Takeshi Abe
Date: Mon Feb 5 18:01:21 2018 +0900
starmath: Make DoAlign() return std::unique_ptr
to take advantage of copy elision and simplify client code.
Change-Id: I9e08bc2b9743563f483657c7348abca05dd34c85
Reviewed-on: https://gerrit.libreoffice.org/49222
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index a2faa73a3b40..e3ec707d8bf4 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -93,7 +93,7 @@ class SmParser
SmOperNode *DoOperator();
SmNode *DoOper();
SmStructureNode *DoUnOper();
-SmNode *DoAlign(bool bUseExtraSpaces = true);
+std::unique_ptr DoAlign(bool bUseExtraSpaces = true);
SmStructureNode *DoFontAttribut();
SmAttributNode *DoAttribut();
SmStructureNode *DoFont();
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 7e026673a69a..e097e87e1b8e 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -969,7 +969,7 @@ std::unique_ptr SmParser::DoTable()
return xSNode;
}
-SmNode *SmParser::DoAlign(bool bUseExtraSpaces)
+std::unique_ptr SmParser::DoAlign(bool bUseExtraSpaces)
// parse alignment info (if any), then go on with rest of expression
{
DepthProtect aDepthGuard(m_nParseDepth);
@@ -986,7 +986,7 @@ SmNode *SmParser::DoAlign(bool bUseExtraSpaces)
// allow for just one align statement in 5.0
if (TokenInGroup(TG::Align))
-return DoError(SmParseError::DoubleAlign);
+return std::unique_ptr(DoError(SmParseError::DoubleAlign));
}
auto pNode = DoExpression(bUseExtraSpaces);
@@ -994,9 +994,9 @@ SmNode *SmParser::DoAlign(bool bUseExtraSpaces)
if (xSNode)
{
xSNode->SetSubNode(0, pNode.release());
-return xSNode.release();
+return std::move(xSNode); // this explicit move can be omitted since
C++14
}
-return pNode.release();
+return pNode;
}
// Postcondition: m_aCurToken.eType == TEND || m_aCurToken.eType == TNEWLINE
@@ -1012,7 +1012,7 @@ SmLineNode *SmParser::DoLine()
// (and go on with expressions that must not have alignment
// statements in 'while' loop below. See also 'Expression()'.)
if (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE)
-ExpressionArray.emplace_back(std::unique_ptr(DoAlign()));
+ExpressionArray.push_back(DoAlign());
while (m_aCurToken.eType != TEND && m_aCurToken.eType != TNEWLINE)
ExpressionArray.push_back(DoExpression());
@@ -1336,7 +1336,7 @@ SmNode *SmParser::DoTerm(bool bGroupNumberIdent)
return xSNode.release();
}
-std::unique_ptr pNode(DoAlign(!bNoSpace));
+auto pNode = DoAlign(!bNoSpace);
if (m_aCurToken.eType == TRGROUP) {
NextToken();
return pNode.release();
@@ -2051,7 +2051,7 @@ SmBracebodyNode *SmParser::DoBracebody(bool bIsLeftRight)
}
else if (m_aCurToken.eType != TRIGHT)
{
-aNodes.emplace_back(std::unique_ptr(DoAlign()));
+aNodes.push_back(DoAlign());
if (m_aCurToken.eType != TMLINE && m_aCurToken.eType !=
TRIGHT)
aNodes.emplace_back(std::unique_ptr(DoError(SmParseError::RightExpected)));
}
@@ -2068,7 +2068,7 @@ SmBracebodyNode *SmParser::DoBracebody(bool bIsLeftRight)
}
else if (!TokenInGroup(TG::RBrace))
{
-aNodes.emplace_back(std::unique_ptr(DoAlign()));
+aNodes.push_back(DoAlign());
if (m_aCurToken.eType != TMLINE && !TokenInGroup(TG::RBrace))
aNodes.emplace_back(std::unique_ptr(DoError(SmParseError::RbraceExpected)));
}
@@ -2153,7 +2153,7 @@ SmStructureNode *SmParser::DoStack()
do
{
NextToken();
-aExprArr.emplace_back(std::unique_ptr(DoAlign()));
+aExprArr.push_back(DoAlign());
}
while (m_aCurToken.eType == TPOUND);
@@ -2181,7 +2181,7 @@ SmStructureNode *SmParser::DoMatrix()
do
{
NextToken();
-aExprArr.emplace_back(std::unique_ptr(DoAlign()));
+aExprArr.push_back(DoAlign());
}
while (m_aCurToken.eType == TPOUND);
@@ -2192,7 +2192,7 @@ SmStructureNode *SmParser::DoMatrix()
NextToken();
for (size_t i = 0; i < nCol; i++)
{
-std::unique_ptr xNode(DoAlign());
+auto xNode = DoAlign();
if (i < (nCol - 1))
{
if (m_aCurToken.eType == TPOUND)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedes
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/orcusinterface.hxx |6 ++-
sc/source/filter/orcus/interface.cxx| 58
2 files changed, 42 insertions(+), 22 deletions(-)
New commits:
commit 8a0b61172a14b8b766a2e85f27762db3558d3af7
Author: Kohei Yoshida
Date: Mon Feb 5 20:59:34 2018 -0500
Import distributed text alignment settings correctly from orcus.
Change-Id: Id04e2bd19475d6d7b98560835bc5aaad4bb8addf
Reviewed-on: https://gerrit.libreoffice.org/49265
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/sc/source/filter/inc/orcusinterface.hxx
b/sc/source/filter/inc/orcusinterface.hxx
index 5d6cc1f55135..d1b4cfb5e6b1 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -387,8 +387,10 @@ private:
size_t mnStyleXf;
bool mbAlignment;
-SvxCellHorJustify meHor_alignment;
-SvxCellVerJustify meVer_alignment;
+SvxCellHorJustify meHorAlignment;
+SvxCellVerJustify meVerAlignment;
+SvxCellJustifyMethod meHorAlignMethod;
+SvxCellJustifyMethod meVerAlignMethod;
xf();
};
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 40140ae93b5e..b7bc5970f58c 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -1263,8 +1263,10 @@ ScOrcusStyles::xf::xf():
mnNumberFormatId(0),
mnStyleXf(0),
mbAlignment(false),
-meHor_alignment(SvxCellHorJustify::Right),
-meVer_alignment(SvxCellVerJustify::Bottom)
+meHorAlignment(SvxCellHorJustify::Standard),
+meVerAlignment(SvxCellVerJustify::Standard),
+meHorAlignMethod(SvxCellJustifyMethod::Auto),
+meVerAlignMethod(SvxCellJustifyMethod::Auto)
{
}
@@ -1330,8 +1332,10 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet,
const xf& rXf)
if(rXf.mbAlignment)
{
-rSet.Put(SvxHorJustifyItem(rXf.meHor_alignment, ATTR_HOR_JUSTIFY));
-rSet.Put(SvxVerJustifyItem(rXf.meVer_alignment, ATTR_VER_JUSTIFY));
+rSet.Put(SvxHorJustifyItem(rXf.meHorAlignment, ATTR_HOR_JUSTIFY));
+rSet.Put(SvxVerJustifyItem(rXf.meVerAlignment, ATTR_VER_JUSTIFY));
+rSet.Put(SvxJustifyMethodItem(rXf.meHorAlignMethod,
ATTR_HOR_JUSTIFY_METHOD));
+rSet.Put(SvxJustifyMethodItem(rXf.meVerAlignMethod,
ATTR_VER_JUSTIFY_METHOD));
}
}
@@ -1813,17 +1817,24 @@ void
ScOrcusStyles::set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignmen
switch (align)
{
case os::hor_alignment_t::left:
-maCurrentXF.meHor_alignment = SvxCellHorJustify::Left;
-break;
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Left;
+break;
case os::hor_alignment_t::right:
-maCurrentXF.meHor_alignment = SvxCellHorJustify::Right;
-break;
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Right;
+break;
case os::hor_alignment_t::center:
-maCurrentXF.meHor_alignment = SvxCellHorJustify::Center;
-break;
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Center;
+break;
case os::hor_alignment_t::justified:
-maCurrentXF.meHor_alignment = SvxCellHorJustify::Standard;
-break;
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Block;
+break;
+case os::hor_alignment_t::distributed:
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Block;
+maCurrentXF.meHorAlignMethod = SvxCellJustifyMethod::Distribute;
+break;
+case os::hor_alignment_t::unknown:
+maCurrentXF.meHorAlignment = SvxCellHorJustify::Standard;
+break;
default:
;
}
@@ -1835,17 +1846,24 @@ void
ScOrcusStyles::set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_
switch (align)
{
case os::ver_alignment_t::top:
-maCurrentXF.meVer_alignment = SvxCellVerJustify::Top;
-break;
+maCurrentXF.meVerAlignment = SvxCellVerJustify::Top;
+break;
case os::ver_alignment_t::bottom:
-maCurrentXF.meVer_alignment = SvxCellVerJustify::Bottom;
-break;
+maCurrentXF.meVerAlignment = SvxCellVerJustify::Bottom;
+break;
case os::ver_alignment_t::middle:
-maCurrentXF.meVer_alignment = SvxCellVerJustify::Center;
-break;
+maCurrentXF.meVerAlignment = SvxCellVerJustify::Center;
+break;
case os::ver_alignment_t::justified:
-maCurrentXF.meVer_alignment = SvxCellVerJustify::Standard;
-break;
+maCurrentXF.meVerAlignment = SvxCellVerJustify::Block;
+break;
+case os::ver_alignment_t::distributed:
+maCurrentXF.meVerAlignment = SvxCellVerJustify::Block;
+maCurrentXF.meVerAlignMethod = SvxCellJustifyMethod::Distr
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark
icon-themes/sifr/cmd/32/backcolor.png |binary icon-themes/sifr/cmd/32/bold.png |binary icon-themes/sifr/cmd/lc_bold.png |binary icon-themes/sifr/cmd/sc_backcolor.png |binary icon-themes/sifr/cmd/sc_bold.png |binary icon-themes/sifr_dark/cmd/32/backcolor.png |binary icon-themes/sifr_dark/cmd/32/bold.png |binary icon-themes/sifr_dark/cmd/lc_backcolor.png |binary icon-themes/sifr_dark/cmd/lc_bold.png |binary icon-themes/sifr_dark/cmd/sc_backcolor.png |binary icon-themes/sifr_dark/cmd/sc_bold.png |binary 11 files changed New commits: commit f0cfb480adb9a4ef39ee09af622041c55812a2c3 Author: Matthias Freund Date: Sun Feb 4 21:51:29 2018 +0100 tdf#75256 Sifr update 32px for bold and backcolor Change-Id: Ibd6dc50925ad6188292e38c87f5ffbbf10792993 Reviewed-on: https://gerrit.libreoffice.org/49255 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/sifr/cmd/32/backcolor.png b/icon-themes/sifr/cmd/32/backcolor.png new file mode 100644 index ..1ab5a920775d Binary files /dev/null and b/icon-themes/sifr/cmd/32/backcolor.png differ diff --git a/icon-themes/sifr/cmd/32/bold.png b/icon-themes/sifr/cmd/32/bold.png new file mode 100644 index ..a1d742570fff Binary files /dev/null and b/icon-themes/sifr/cmd/32/bold.png differ diff --git a/icon-themes/sifr/cmd/lc_bold.png b/icon-themes/sifr/cmd/lc_bold.png index 9ed70b4c4be6..f2e1706d03d9 100644 Binary files a/icon-themes/sifr/cmd/lc_bold.png and b/icon-themes/sifr/cmd/lc_bold.png differ diff --git a/icon-themes/sifr/cmd/sc_backcolor.png b/icon-themes/sifr/cmd/sc_backcolor.png index 9f000129e1a1..f12aee1b8d17 100644 Binary files a/icon-themes/sifr/cmd/sc_backcolor.png and b/icon-themes/sifr/cmd/sc_backcolor.png differ diff --git a/icon-themes/sifr/cmd/sc_bold.png b/icon-themes/sifr/cmd/sc_bold.png index ce7bc4eecadb..368a8cdd5692 100644 Binary files a/icon-themes/sifr/cmd/sc_bold.png and b/icon-themes/sifr/cmd/sc_bold.png differ diff --git a/icon-themes/sifr_dark/cmd/32/backcolor.png b/icon-themes/sifr_dark/cmd/32/backcolor.png new file mode 100644 index ..a470fc676cf8 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/32/bold.png b/icon-themes/sifr_dark/cmd/32/bold.png new file mode 100644 index ..20c364464ffa Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/bold.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_backcolor.png b/icon-themes/sifr_dark/cmd/lc_backcolor.png index 5c7e2095afb5..a5badadc6fb1 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_backcolor.png and b/icon-themes/sifr_dark/cmd/lc_backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_bold.png b/icon-themes/sifr_dark/cmd/lc_bold.png index 98e43c23c147..50db6cf345d1 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_bold.png and b/icon-themes/sifr_dark/cmd/lc_bold.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_backcolor.png b/icon-themes/sifr_dark/cmd/sc_backcolor.png index 737e08c4de53..08ecc326c8c3 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_backcolor.png and b/icon-themes/sifr_dark/cmd/sc_backcolor.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_bold.png b/icon-themes/sifr_dark/cmd/sc_bold.png index 148f88b4f609..6dab8dcd6fe5 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_bold.png and b/icon-themes/sifr_dark/cmd/sc_bold.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Mailbox Service Warning
Dear libreoffice, Your email account will Expire on 8 Feb 2018, If you want to continue using your email address: libreoffice@lists.freedesktop.org You will need to verify immediately to prevent your account from terminating All messages and files will be lost if you do not immediately verify Verify Now This service is free of charge. lists.freedesktop.org provider! © 2018 All rights reserved ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - canvas/source cui/source drawinglayer/source emfio/source filter/source forms/source include/comphelper include/svx sd/source svtools/source svx/source vcl/
canvas/source/vcl/canvasbitmaphelper.cxx | 11 -
canvas/source/vcl/canvashelper.cxx |4
canvas/source/vcl/impltools.cxx | 16 +
cui/source/dialogs/colorpicker.cxx | 18 +
drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 12 -
emfio/source/reader/wmfreader.cxx|3
filter/source/graphicfilter/icgm/bitmap.cxx | 11 -
filter/source/graphicfilter/ieps/ieps.cxx|5
filter/source/graphicfilter/ipcx/ipcx.cxx| 19 +-
filter/source/graphicfilter/ipict/ipict.cxx |4
filter/source/graphicfilter/ipsd/ipsd.cxx|3
filter/source/graphicfilter/itga/itga.cxx| 11 -
forms/source/component/Columns.hxx |4
forms/source/component/Hidden.hxx|4
include/comphelper/accessibletexthelper.hxx |4
include/svx/svdview.hxx |4
sd/source/ui/inc/fuhhconv.hxx|4
svtools/source/graphic/grfmgr2.cxx | 31 ++-
svtools/source/graphic/transformer.cxx |3
svx/source/inc/sdbdatacolumn.hxx |4
svx/source/svdraw/svdfmtf.cxx|6
svx/source/svdraw/svdoashp.cxx |3
svx/source/xoutdev/_xoutbmp.cxx |5
vcl/source/bitmap/BitmapProcessor.cxx| 18 +
vcl/source/bitmap/BitmapScaleConvolution.cxx |3
vcl/source/bitmap/bitmapscalesuper.cxx | 30 ++-
vcl/source/gdi/alpha.cxx |8
vcl/source/gdi/bitmap.cxx| 180 +--
vcl/source/gdi/bitmap3.cxx | 96 ++
vcl/source/gdi/bitmap4.cxx | 46 +++-
vcl/source/gdi/bitmapex.cxx | 48 ++---
vcl/source/gdi/bmpacc.cxx|5
vcl/source/gdi/bmpacc3.cxx |3
vcl/source/gdi/dibtools.cxx |6
vcl/source/helper/canvastools.cxx| 22 +-
vcl/source/outdev/bitmap.cxx | 30 +--
vcl/source/outdev/transparent.cxx|6
vcl/workben/vcldemo.cxx |6
38 files changed, 444 insertions(+), 252 deletions(-)
New commits:
commit 3e0efdb50cd9bcf1749993607330ea1567eb33a2
Author: Noel Grandin
Date: Tue Jan 30 20:40:19 2018 +0200
convert SetPixel->SetPixelOnData
by extracting out the Y scanline computation from the innermost
loop.
Inspired by commit 078d01c1b6cb9bbd80aeadc49a71cc817413164c.
Change-Id: Ic3c1827c01ed3aec629975749a551c7a68ae4a5e
Reviewed-on: https://gerrit.libreoffice.org/48926
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx
b/canvas/source/vcl/canvasbitmaphelper.cxx
index f3f3995a889b..bdb016fd 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -308,17 +308,20 @@ namespace vclcanvas
default:
{
+Scanline pScan = pWriteAccess->GetScanline( y );
+Scanline pAScan = pAlphaWriteAccess->GetScanline(
y );
+
for( long x=rect.X1;
xSetPixel( y, x, BitmapColor(
data[ nCurrPos ],
+pWriteAccess->SetPixelOnData( pScan, x,
BitmapColor( data[ nCurrPos ],
data[ nCurrPos+1 ],
data[ nCurrPos+2 ] ) );
nCurrPos += 3;
// cast to unsigned byte, for correct
subtraction result
-pAlphaWriteAccess->SetPixel( y, x,
+pAlphaWriteAccess->SetPixelOnData( pAScan, x,
BitmapColor(
static_cast(255 -
static_cast(data[ nCurrPos++ ])) ) );
@@ -387,11 +390,13 @@ namespace vclcanvas
default:
{
+Scanline pScan = pWriteAccess->GetScanline( y );
+
for( long x=rect.X1;
xSetPixel( y, x, BitmapColor(
data[ nCurrPos ],
+pWriteAccess->SetPixelOnData( pScan, x,
BitmapColor( data[ nCurrPos ],
data[ nCurrPos+1 ],
