[Libreoffice-commits] core.git: 2 commits - chart2/source svx/source
chart2/source/view/charttypes/NetChart.cxx |4 ++--
chart2/source/view/charttypes/NetChart.hxx |2 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx |4 ++--
svx/source/gallery2/gallery1.cxx | 17 -
4 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit b4ef23955e11a90b54bce189c3300406e9cf15b0
Author: Noel Grandin
AuthorDate: Mon Aug 20 11:21:37 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 21 08:36:10 2018 +0200
loplugin:useuniqueptr in NetChart
Change-Id: I095ae98b809c1dc938c12b5fbe4427fb08edc604
Reviewed-on: https://gerrit.libreoffice.org/59353
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/view/charttypes/NetChart.cxx
b/chart2/source/view/charttypes/NetChart.cxx
index d94453ea5e3f..6ebca9bfbebf 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -52,10 +52,10 @@ using namespace ::com::sun::star::chart2;
NetChart::NetChart( const uno::Reference& xChartTypeModel
, sal_Int32 nDimensionCount
, bool bNoArea
- , PlottingPositionHelper* pPlottingPositionHelper
+ , std::unique_ptr
pPlottingPositionHelper
)
: VSeriesPlotter( xChartTypeModel, nDimensionCount, true )
-, m_pMainPosHelper(pPlottingPositionHelper)
+, m_pMainPosHelper(std::move(pPlottingPositionHelper))
, m_bArea(!bNoArea)
, m_bLine(bNoArea)
, m_xSeriesTarget(nullptr)
diff --git a/chart2/source/view/charttypes/NetChart.hxx
b/chart2/source/view/charttypes/NetChart.hxx
index 36d648a4e034..2d948d2e2138 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -35,7 +35,7 @@ public:
NetChart( const css::uno::Reference< css::chart2::XChartType >&
xChartTypeModel
, sal_Int32 nDimensionCount
, bool bNoArea
- , PlottingPositionHelper* pPlottingPositionHelper //takes
ownership
+ , std::unique_ptr pPlottingPositionHelper
//takes ownership
);
virtual ~NetChart() override;
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index b2af514f763c..bad0d71432da 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2601,9 +2601,9 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
else if(
aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
pRet = new PieChart(xChartTypeModel,nDimensionCount,
bExcludingPositioning );
else if(
aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
-pRet = new NetChart(xChartTypeModel,nDimensionCount,true,new
PolarPlottingPositionHelper());
+pRet = new
NetChart(xChartTypeModel,nDimensionCount,true,o3tl::make_unique());
else if(
aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
-pRet = new NetChart(xChartTypeModel,nDimensionCount,false,new
PolarPlottingPositionHelper());
+pRet = new
NetChart(xChartTypeModel,nDimensionCount,false,o3tl::make_unique());
else if(
aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
pRet = new CandleStickChart(xChartTypeModel,nDimensionCount);
else
commit 5779775c6dd831205a296393a2cca26a9120d2ea
Author: Noel Grandin
AuthorDate: Mon Aug 20 09:54:35 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 21 08:35:59 2018 +0200
loplugin:useuniqueptr in GalleryThemeCacheEntry
Change-Id: Ib9f3e604ca889a938cd41dbf3f59dfa7131fe4da
Reviewed-on: https://gerrit.libreoffice.org/59352
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 87a8c7d3e611..813eff0a563e 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -242,8 +242,8 @@ private:
public:
-GalleryThemeCacheEntry( const
GalleryThemeEntry* pThemeEntry, GalleryTheme* pTheme ) :
-mpThemeEntry( pThemeEntry ), mpTheme(
pTheme ) {}
+GalleryThemeCacheEntry( const
GalleryThemeEntry* pThemeEntry, std::unique_ptr pTheme ) :
+mpThemeEntry( pThemeEntry ), mpTheme(
std::move(pTheme) ) {}
const GalleryThemeEntry*GetThemeEntry() const { return mpThemeEntry; }
GalleryTheme* GetTheme() const { return mpTheme.get(); }
@@ -703,6 +703,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const
GalleryThemeEntry* pThemeEntry)
DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid
URL" );
+std::unique_ptr pNewTheme;
if( FileExists( aURL
[Libreoffice-commits] core.git: 2 commits - sfx2/source xmloff/inc xmloff/source
sfx2/source/control/bindings.cxx | 17 +
sfx2/source/control/itemdel.cxx | 10 +-
sfx2/source/control/request.cxx | 15 ---
sfx2/source/control/shell.cxx| 11 ++-
sfx2/source/inc/itemdel.hxx |4 +++-
xmloff/inc/txtflde.hxx |2 +-
xmloff/source/text/txtflde.cxx |4 ++--
xmloff/source/text/txtparae.cxx |3 ++-
8 files changed, 32 insertions(+), 34 deletions(-)
New commits:
commit b1da360e9230f5a1d1d5e03bd8f83f65e7e14edc
Author: Noel Grandin
AuthorDate: Mon Aug 20 09:53:56 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 21 08:35:43 2018 +0200
loplugin:useuniqueptr in XMLTextFieldExport
Change-Id: Ib525cc596429f61740f567445296dcf71c19acf2
Reviewed-on: https://gerrit.libreoffice.org/59350
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 909da05499ca..16f6c799ed06 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -161,7 +161,7 @@ public:
XMLTextFieldExport( SvXMLExport& rExp,
/// XMLPropertyState for the combined characters field
-XMLPropertyState* pCombinedCharState );
+std::unique_ptr pCombinedCharState );
~XMLTextFieldExport();
/// Export this field and the surrounding span element with the formatting.
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index f65f26943a62..55a4368eadc1 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -273,7 +273,7 @@ inline Sequence const GetStringSequenceProperty(
XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
-XMLPropertyState* pCombinedCharState)
+std::unique_ptr
pCombinedCharState)
: rExport(rExp),
sServicePrefix("com.sun.star.text.textfield."),
sFieldMasterPrefix("com.sun.star.text.FieldMaster."),
@@ -346,7 +346,7 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
sPropertyHelp("Help"),
sPropertyTooltip("Tooltip"),
sPropertyTextRange("TextRange"),
- pCombinedCharactersPropertyState(pCombinedCharState)
+ pCombinedCharactersPropertyState(std::move(pCombinedCharState))
{
SetExportOnlyUsedFieldDeclarations();
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 1f06a8eec257..93d5fe16424c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1312,7 +1313,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sal_Int32 nIndex = xTextPropMapper->getPropertySetMapper()->FindEntryIndex(
"", XML_NAMESPACE_STYLE,
GetXMLToken(XML_TEXT_COMBINE));
-pFieldExport.reset( new XMLTextFieldExport( rExp, new XMLPropertyState(
nIndex, uno::makeAny(true) ) ) );
+pFieldExport.reset( new XMLTextFieldExport( rExp,
o3tl::make_unique( nIndex, uno::makeAny(true) ) ) );
PushNewTextListsHelper();
}
commit 06765e45cbf83a865cabb3ce6c418f497e87e099
Author: Noel Grandin
AuthorDate: Mon Aug 20 09:53:33 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 21 08:35:33 2018 +0200
loplugin:useuniqueptr in DeleteItemOnIdle
Change-Id: I6a72417bcab1ac48b5d8a73005104c8627dde32b
Reviewed-on: https://gerrit.libreoffice.org/59349
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index f6454d2a31f3..b65ccbf08892 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -925,14 +925,15 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16
nId, const SfxPoolItem*
// cache binds to an external dispatch provider
sal_Int16 eRet = pCache->Dispatch( aReq.GetArgs(), nCallMode ==
SfxCallMode::SYNCHRON );
-SfxPoolItem *pPool;
+std::unique_ptr pPool;
if ( eRet == css::frame::DispatchResultState::DONTKNOW )
-pPool = new SfxVoidItem( nId );
+pPool.reset( new SfxVoidItem( nId ) );
else
-pPool = new SfxBoolItem( nId, eRet ==
css::frame::DispatchResultState::SUCCESS);
+pPool.reset( new SfxBoolItem( nId, eRet ==
css::frame::DispatchResultState::SUCCESS) );
-DeleteItemOnIdle( pPool );
-return pPool;
+auto pTemp = pPool.get();
+DeleteItemOnIdle( std::move(pPool) );
+return pTemp;
}
// slot is handled internally by SfxDispatcher
@@ -976,9 +977,9 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16
nId, const SfxPoolItem*
const SfxPoolItem* pRet = aReq.GetReturnValue();
if ( !pRet )
{
-SfxPoolItem *pVoid = new SfxVoidItem( nId );
-Delete
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/dropdownfielddialog.ui | 24 sw/uiconfig/swriter/ui/inputfielddialog.ui| 26 +- 2 files changed, 17 insertions(+), 33 deletions(-) New commits: commit 1188bebbc53d0519733cfe98cfab4d83474e8ddf Author: heiko tietze AuthorDate: Thu Jul 26 16:39:18 2018 +0200 Commit: Heiko Tietze CommitDate: Tue Aug 21 08:10:19 2018 +0200 tdf#118742 - Input field dialog workflow Buttons reverted to gtk-media-previous and gtk-media-next Dialog title changed to "Review Fields" Change-Id: If2bac95ccd36fc14a4c0b4e7789a3cf81db3bc0f Reviewed-on: https://gerrit.libreoffice.org/58132 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui index dcc60a36a026..de07077e4efa 100644 --- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui +++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui @@ -1,17 +1,7 @@ - + - -True -False -gtk-go-back - - -True -False -gtk-go-forward - @@ -26,6 +16,9 @@ Choose Item: False dialog + + + False @@ -43,9 +36,10 @@ True +gtk-media-previous True True -image1 +True right @@ -55,9 +49,10 @@ +gtk-media-next True True -image2 +True 1 @@ -230,8 +225,5 @@ cancel help - - - diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui b/sw/uiconfig/swriter/ui/inputfielddialog.ui index c5c41ade7a76..eae47fd16955 100644 --- a/sw/uiconfig/swriter/ui/inputfielddialog.ui +++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui @@ -1,25 +1,18 @@ - + - -True -False -gtk-go-back - - -True -False -gtk-go-forward - False 6 -Input Field +Review Fields True 0 0 dialog + + + False @@ -37,10 +30,11 @@ True +gtk-media-previous True True True -image1 +True right @@ -50,10 +44,11 @@ +gtk-media-next True True True -image2 +True 1 @@ -194,8 +189,5 @@ cancel help - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/mysql-connector-cpp include/rtl sal/osl sal/qa
external/mysql-connector-cpp/Library_mysqlcppconn.mk |2 +
include/rtl/stringutils.hxx | 21 ---
sal/osl/unx/nlsupport.cxx|1
sal/qa/rtl/strings/test_oustring_stringliterals.cxx |3 ++
4 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit fd71427f6502f4540053c10d8eb9b495451d959d
Author: Stephan Bergmann
AuthorDate: Mon Aug 20 21:41:26 2018 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 21 07:36:00 2018 +0200
external/mysql-connector-cpp uses std::auto_ptr, must not be compiled as
C++17
But gb_CXX03FLAGS may contain -Werror=c++11-extensions and would thus fail
with
> [CXX]
workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_connection.cpp
> In file included from
workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_connection.cpp:44:
> In file included from
workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_util.h:30:
> In file included from
workdir/UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_private_iface.h:63:
> workdir/UnpackedTarball/mariadb-connector-c/include/mysql.h:223:45:
error: commas at the end of enumerator lists are a C++11 extension
[-Werror,-Wc++11-extensions]
> MYSQL_STATUS_QUIT_SENT, /* object is "destroyed" at
this stage */
> ^
(And otherwise the code appears to build fine with gb_CXX03FLAGS, so just
stick
with that instead of coming up with yet another way of compiling as >=
C++11 and
< C++17.)
Change-Id: I924d906e34c073672f2038072743197d3f7fef5f
Reviewed-on: https://gerrit.libreoffice.org/59368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
index 152aee8c0764..8efe63be8b05 100644
--- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
+++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_externals,mysqlcppconn,\
endif
endif
+$(eval $(call gb_Library_add_cxxflags,mysqlcppconn,$(filter-out
-Werror=%,$(gb_CXX03FLAGS
+
$(eval $(call gb_Library_set_external_code,mysqlcppconn))
$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
commit f0fcbcadac148a5bfd36b2a26795d45aef8eace4
Author: Stephan Bergmann
AuthorDate: Mon Aug 20 20:20:22 2018 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 21 07:35:50 2018 +0200
Make OUStringLiteral ctor actually constexpr
...which had accidentally been broken with
87707670c993794ab12b0fad0f048f11429269c2 "Make OUStringLiteral more useful".
(std::strlen unfortunately isn't constexpr, so need to use an explicit loop
instead.)
Change-Id: I9a820e2940b99a0c37124477810ef879d82c8325
Reviewed-on: https://gerrit.libreoffice.org/59344
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index c6a5fcb64917..53f7554ee132 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -13,10 +13,13 @@
#include "sal/config.h"
#include
-#include
#include "sal/types.h"
+#if defined LIBO_INTERNAL_ONLY
+#include "config_global.h"
+#endif
+
// The unittest uses slightly different code to help check that the proper
// calls are made. The class is put into a different namespace to make
// sure the compiler generates a different (if generating also non-inline)
@@ -165,8 +168,20 @@ struct ConstCharArrayDetector< const char[ N ], T >
typedef T Type;
static const std::size_t length = N - 1;
static const bool ok = true;
-static bool isValid(char const (& literal)[N])
-{ return std::strlen(literal) == length; }
+#if defined LIBO_INTERNAL_ONLY && HAVE_CXX14_CONSTEXPR
+constexpr
+#endif
+static bool isValid(char const (& literal)[N]) {
+for (std::size_t i = 0; i != N - 1; ++i) {
+if (literal[i] == '\0') {
+return false;
+}
+}
+return literal[N - 1] == '\0';
+}
+#if defined LIBO_INTERNAL_ONLY
+constexpr
+#endif
static char const * toPointer(char const (& literal)[N]) { return literal;
}
};
#if defined LIBO_INTERNAL_ONLY
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index e1d7e393822c..c9377040894a 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 58a938ae9328..687f6b3e5146 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -41,6 +41,9 @@ private:
void testcall( const char str[] );
+// Check that OUStr
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8
writerfilter/source/ooxml/OOXMLPropertySet.cxx| 15 +++
3 files changed, 23 insertions(+)
New commits:
commit 7d01ce4021bafde8184355f46d1cbe2c370767e1
Author: Justin Luth
AuthorDate: Sat Aug 18 19:35:01 2018 +0300
Commit: Justin Luth
CommitDate: Tue Aug 21 06:36:05 2018 +0200
tdf#57589 writerfilter: support hash-encoded colors
Previously, a hash-encoded value would simply fail to zero
and thus the color would be dark black.
The unit test covers two conditions. Paragraph 1 has a valid
encoding, and pararaph 2 has an invalid coding (which is
ignored and fails to COL_AUTO).
Change-Id: I68940f5c4b0975a87feb6cab8fb3572b7546a077
Reviewed-on: https://gerrit.libreoffice.org/59295
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx
b/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx
new file mode 100644
index ..d12b85b2da9c
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf57589_hashColor.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 6974cb776550..263959520851 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -45,6 +45,14 @@ protected:
}
};
+DECLARE_OOXMLEXPORT_TEST(testTdf57589_hashColor, "tdf57589_hashColor.docx")
+{
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(getParagraph(1), "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTMAGENTA,
Color(getProperty(getParagraph(1), "ParaBackColor")));
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty(getParagraph(2), "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(COL_AUTO,
Color(getProperty(getParagraph(2), "ParaBackColor")));
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, "tdf92524_autoColor.doc")
{
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty(getParagraph(1), "FillStyle"));
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index f35379e529a6..79b53849c054 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
namespace writerfilter {
@@ -592,6 +593,20 @@ OOXMLHexColorValue::OOXMLHexColorValue(const char * pValue)
if (strcmp(pValue, "auto"))
{
mnValue = rtl_str_toUInt32(pValue, 16);
+
+// Convert hash-encoded values (like #FF0080)
+const sal_Int32 nLen = strlen(pValue);
+if ( !mnValue && nLen > 1 && pValue[0] == '#' )
+{
+sal_Int32 nColor(COL_AUTO);
+// Word appears to require strict 6 digit length, else it ignores
it
+if ( nLen == 7 )
+{
+const OUString sHashColor(pValue, nLen,
RTL_TEXTENCODING_ASCII_US);
+sax::Converter::convertColor( nColor, sHashColor );
+}
+mnValue = nColor;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/builder.hxx |6 +
vcl/source/window/builder.cxx | 199 ++
vcl/source/window/window2.cxx |9 +
3 files changed, 198 insertions(+), 16 deletions(-)
New commits:
commit 5732db01795df90df95944cffc8566ea11e6c389
Author: Samuel Thibault
AuthorDate: Wed Mar 21 15:30:00 2018 +0100
Commit: Thorsten Behrens
CommitDate: Tue Aug 21 03:12:21 2018 +0200
tdf#116542 a11y: Implement .ui ways of setting widget role
Atk-LO correspondance in getRoleFromName() was built on
vcl/unx/gtk/a11y/atkwrapper.cxx's correspondance, with the same "?"
uncertainties, plus some approximations.
Change-Id: I2e3a5042d4c9dabbab5407397373a373ee1caa6d
Reviewed-on: https://gerrit.libreoffice.org/58767
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index ed62d61eb397..25380a6ec5af 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -354,7 +354,8 @@ private:
voidapplyPackingProperty(vcl::Window *pCurrent, vcl::Window
*pParent, xmlreader::XmlReader &reader);
voidcollectProperty(xmlreader::XmlReader &reader, stringmap &rVec)
const;
static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap
&rMap);
-static void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap
&rMap);
+static void collectAtkRelationAttribute(xmlreader::XmlReader &reader,
stringmap &rMap);
+static void collectAtkRoleAttribute(xmlreader::XmlReader &reader,
stringmap &rMap);
static void collectAccelerator(xmlreader::XmlReader &reader, accelmap
&rMap);
voidinsertMenuObject(
@@ -411,6 +412,9 @@ namespace BuilderUtils
//Helpers to retrofit all the existing code to the builder
VCL_DLLPUBLIC void reorderWithinParent(std::vector< vcl::Window*>&
rChilds, bool bIsButtonBox);
VCL_DLLPUBLIC void reorderWithinParent(vcl::Window &rWindow, sal_uInt16
nNewPosition);
+
+//Convert an accessibility role name to accessibility role number
+VCL_DLLPUBLIC sal_Int16 getRoleFromName(const OString& roleName);
}
template
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b08d84a28cc6..0394261e0248 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -380,7 +381,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const
OUString& sUIDir, const OUStr
pOne->set_mnemonic_widget(pOther);
}
-//Set a11y relations when everything has been imported
+//Set a11y relations and role when everything has been imported
for (auto const& elemAtk : m_pParserState->m_aAtkInfo)
{
vcl::Window *pSource = elemAtk.first;
@@ -388,21 +389,30 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const
OUString& sUIDir, const OUStr
for (auto const& elemMap : rMap)
{
-const OUString &rTarget = elemMap.second;
-vcl::Window *pTarget = get(rTarget.toUtf8());
-SAL_WARN_IF(!pTarget, "vcl", "missing member of a11y relation: "
<< rTarget);
-if (!pTarget)
-continue;
const OString &rType = elemMap.first;
-if (rType == "labelled-by")
-pSource->SetAccessibleRelationLabeledBy(pTarget);
-else if (rType == "label-for")
-pSource->SetAccessibleRelationLabelFor(pTarget);
-else if (rType == "member-of")
-pSource->SetAccessibleRelationMemberOf(pTarget);
+const OUString &rParam = elemMap.second;
+if (rType == "role")
+{
+sal_Int16 role =
BuilderUtils::getRoleFromName(rParam.toUtf8());
+if (role !=
com::sun::star::accessibility::AccessibleRole::UNKNOWN)
+pSource->SetAccessibleRole(role);
+}
else
{
-SAL_INFO("vcl.layout", "unhandled a11y relation :" << rType);
+vcl::Window *pTarget = get(rParam.toUtf8());
+SAL_WARN_IF(!pTarget, "vcl", "missing parameter of a11y
relation: " << rParam);
+if (!pTarget)
+continue;
+if (rType == "labelled-by")
+pSource->SetAccessibleRelationLabeledBy(pTarget);
+else if (rType == "label-for")
+pSource->SetAccessibleRelationLabelFor(pTarget);
+else if (rType == "member-of")
+pSource->SetAccessibleRelationMemberOf(pTarget);
+else
+{
+SAL_WARN("vcl.layout", "unhandled a11y relation :" <<
rType);
+}
}
}
}
@@ -2096,6 +2106,143 @@ namespace BuilderUtils
rChilds[i]->SetStyle(nBits);
}
}
+
+sal_Int16 getRoleFromName(const OString& roleN
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/source
wizards/source/gimmicks/ReadDir.xba | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3d3594a2c542fef7c78936f8528eba4595f2768e
Author: Matthias Seidel
AuthorDate: Mon Aug 20 22:37:02 2018 +
Commit: Matthias Seidel
CommitDate: Mon Aug 20 22:37:02 2018 +
Deleted whitespace, fixed missing paranthesis
diff --git a/wizards/source/gimmicks/ReadDir.xba
b/wizards/source/gimmicks/ReadDir.xba
index 991d1e4dd1ed..8e5ae47e9e34 100644
--- a/wizards/source/gimmicks/ReadDir.xba
+++ b/wizards/source/gimmicks/ReadDir.xba
@@ -90,7 +90,7 @@ Dim FileNames() as String
ToggleDialogControls(False)
oProgressBar.ProgressValueMin = 0
oProgressBar.ProgressValueMax = 100
- bStartUpRun = True
+ bStartUpRun = True
nOldHeight = 200
nOldY = SBPAGEY
nOldX = SBPAGEX
@@ -159,7 +159,7 @@ Dim FileNames() as String
nOldLevel = iCurLevel
Next i
ToggleDialogControls(True)
- DlgReadDir.Model.cmdGoOn.Enabled = False
+ DlgReadDir.Model.cmdGoOn.Enabled = False
End Sub
@@ -169,7 +169,7 @@ Dim aPoint As New com.sun.star.awt.Point
aPoint.X = CalculateXPoint()
aPoint.Y = nOldY + SBRELDIST * nOldHeight
- nOldY = aPoint.Y
+ nOldY = aPoint.Y
oTextShape =
oDocument.createInstance("com.sun.star.drawing.TextShape")
oTextShape.LineStyle = 1
@@ -180,7 +180,7 @@ Dim aPoint As New com.sun.star.awt.Point
oTextShape.TextAutoGrowHeight = TRUE
oTextShape.String = FileName
- ' Configure Size And Position of the TextShape according to its
Scripting
+ ' Configure Size And Position of the TextShape according to its
Scripting
aPoint.X = iLevelPos(iCurLevel,SBBASEX)
oTextShape.Position = aPoint
CreateTextShape() = oTextShape
@@ -249,7 +249,7 @@ Dim MaxFileIndex as Integer
m = m + 1
DirContent() = oUcbObject.GetFolderContents(Source,True)
If Ubound(DirContent()) <> -1 Then
- MaxFileIndex = Ubound(DirContent())
+ MaxFileIndex = Ubound(DirContent())
For i = 0 to MaxFileIndex
FileName = DirContent(i)
FileNameList(n,0) = FileName
@@ -266,7 +266,7 @@ Dim MaxFileIndex as Integer
End If
Next i
End If
- Loop Until m > Ubound(DirList()
+ Loop Until m > Ubound(DirList())
ReDim Preserve FileNameList(n-1,1) as String
ReadSourceDirectory() = FileNameList()
End Function
@@ -277,16 +277,16 @@ Sub CloseDialog
End Sub
-SubAdjustPageHeight(lShapeHeight, FileCount)
+Sub AdjustPageHeight(lShapeHeight, FileCount)
Dim lNecHeight as Long
Dim lBorders as Long
oDocument.LockControllers
lBorders = oPage.BorderTop + oPage.BorderBottom
lNecHeight = SBPAGEY + (FileCount * SBRELDIST * lShapeHeight)
If lNecHeight > (oPage.Height - lBorders) Then
- oPage.Height = lNecHeight + lBorders + 500
+ oPage.Height = lNecHeight + lBorders + 500
End If
- oDocument.UnlockControllers
+ oDocument.UnlockControllers
End Sub
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/res/menu/main.xml | 18 +++--- android/source/src/java/org/libreoffice/LOKitTileProvider.java | 11 -- android/source/src/java/org/libreoffice/ToolbarController.java | 10 + 3 files changed, 24 insertions(+), 15 deletions(-) New commits: commit 1c08deed080e46478d6aac198e0b2f8f1ff54fe5 Author: Mert Tumer AuthorDate: Sat Aug 18 06:22:57 2018 -0700 Commit: Tomaž Vajngerl CommitDate: Tue Aug 21 00:09:55 2018 +0200 Fix listing all options (presentation and spreadsheet) on all documents Change-Id: I2f43818dbf490de10a54da7f36c6bae3d4d62e39 Signed-off-by: Mert Tumer Reviewed-on: https://gerrit.libreoffice.org/59289 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml index d5f1ae8e4274..b442878cbf51 100644 --- a/android/source/res/menu/main.xml +++ b/android/source/res/menu/main.xml @@ -50,11 +50,11 @@ + - + + + + + + https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/res/drawable/ic_format_clear_black_24dp.xml|9 + android/source/res/layout/toolbar_bottom.xml | 10 ++ android/source/src/java/org/libreoffice/FormattingController.java |6 +- 3 files changed, 24 insertions(+), 1 deletion(-) New commits: commit 414ef6cb187dd3bbcc917dbedf3c0c1cc8668f60 Author: Mert Tumer AuthorDate: Sat Aug 18 07:57:40 2018 -0700 Commit: Tomaž Vajngerl CommitDate: Tue Aug 21 00:10:10 2018 +0200 Added Clear Formatting button on Android Viewer Change-Id: If576aaf3e5095e660219fed9f5e11971c9a73469 Signed-off-by: Mert Tumer Reviewed-on: https://gerrit.libreoffice.org/59293 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/android/source/res/drawable/ic_format_clear_black_24dp.xml b/android/source/res/drawable/ic_format_clear_black_24dp.xml new file mode 100644 index ..4c903c7163e0 --- /dev/null +++ b/android/source/res/drawable/ic_format_clear_black_24dp.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android"; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24.0" +android:viewportHeight="24.0"> + + diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index ca842842625b..bfe5f74828b3 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -107,6 +107,16 @@ android:paddingTop="12dp" android:src="@drawable/ic_format_strikethrough" /> + + https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit b262e4e691d71defa5aa45e6bd647f112e1513c4
Author: Eike Rathke
AuthorDate: Mon Aug 20 20:03:43 2018 +0200
Commit: Eike Rathke
CommitDate: Mon Aug 20 22:16:51 2018 +0200
Avoid searching "[DBNum" if not inserted, tdf#73063 prep
Change-Id: I731f2813a2b29d3d7013d559c481f9b59fe7fa43
Reviewed-on: https://gerrit.libreoffice.org/59343
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 7667e200fb31..e682b63cb161 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -5012,13 +5012,13 @@ static void lcl_SvNumberformat_AddLimitStringImpl(
OUString& rStr,
rStr += "]";
}
-void lcl_insertLCID( OUStringBuffer& rFormatStr, sal_uInt32 nLCID, sal_Int32
nPosInsertLCID )
+void lcl_insertLCID( OUStringBuffer& rFormatStr, sal_uInt32 nLCID, sal_Int32
nPosInsertLCID, bool bDBNumInserted )
{
if ( nLCID == 0 )
return;
OUStringBuffer aLCIDString = OUString::number( nLCID , 16
).toAsciiUpperCase();
// Search for only last DBNum which is the last element before insertion
position
-if ( nPosInsertLCID >= 8
+if ( bDBNumInserted && nPosInsertLCID >= 8
&& aLCIDString.getLength() > 4
&& rFormatStr.indexOf( "[DBNum", nPosInsertLCID-8) == nPosInsertLCID-8
)
{ // remove DBNumX code if long LCID
@@ -5142,6 +5142,7 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
}
SvNumberNatNum aNatNum = NumFor[n].GetNatNum();
+bool bDBNumInserted = false;
if (aNatNum.IsComplete() && (aNatNum.GetDBNum() > 0 || nOriginalLang
!= LANGUAGE_DONTKNOW))
{ // GetFormatStringForExcel() may have changed language to en_US
if (aNatNum.GetLang() == LANGUAGE_ENGLISH_US && nOriginalLang !=
LANGUAGE_DONTKNOW)
@@ -5151,6 +5152,7 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
aPrefix += "[DBNum";
aPrefix += OUString::number( aNatNum.GetDBNum() );
aPrefix += "]";
+bDBNumInserted = true;
}
}
@@ -5367,7 +5369,8 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
if ( nLanguageID == LANGUAGE_SYSTEM && nOriginalLang !=
LANGUAGE_DONTKNOW )
nLanguageID = nOriginalLang;
}
-lcl_insertLCID( aStr, nAlphabetID + nCalendarID +
static_cast(nLanguageID), nPosInsertLCID );
+lcl_insertLCID( aStr, nAlphabetID + nCalendarID +
static_cast(nLanguageID), nPosInsertLCID,
+bDBNumInserted);
}
for ( ; nSub<4 && bDefault[nSub]; ++nSub )
{ // append empty subformats
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/PhysicalFontFamily.hxx |2 +-
vcl/source/font/PhysicalFontFamily.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f34747e39ae034bb7bbfef6fd071662f1abcfa98
Author: Caolán McNamara
AuthorDate: Mon Aug 20 12:13:45 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 22:10:43 2018 +0200
FindBestFontFace can take FontSelectPatternAttributes instead
Change-Id: I96d4a69c8530b9a80f6110666f4cc841f1812e23
Reviewed-on: https://gerrit.libreoffice.org/59319
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 990256590c88..8944c0d410ff 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -69,7 +69,7 @@ public:
voidAddFontFace( PhysicalFontFace* );
-PhysicalFontFace* FindBestFontFace( const FontSelectPattern& rFSD )
const;
+PhysicalFontFace* FindBestFontFace( const FontSelectPatternAttributes&
rFSD ) const;
voidUpdateDevFontList( ImplDeviceFontList& ) const;
voidUpdateCloneFontList(PhysicalFontCollection&) const;
diff --git a/vcl/source/font/PhysicalFontFamily.cxx
b/vcl/source/font/PhysicalFontFamily.cxx
index 6953d259798f..9d3107fa461c 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -195,7 +195,7 @@ void PhysicalFontFamily::InitMatchData( const
utl::FontSubstConfiguration& rFont
mnMatchType |= lcl_IsCJKFont( maFamilyName );
}
-PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const
FontSelectPattern& rFSD ) const
+PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const
FontSelectPatternAttributes& rFSD ) const
{
if( maFontFaces.empty() )
return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/online_transform.xsl
help3xsl/online_transform.xsl | 96 +- 1 file changed, 50 insertions(+), 46 deletions(-) New commits: commit 5969bd167aa7abb317dcbef5420c8d36d8780cc3 Author: Olivier Hallot AuthorDate: Mon Aug 20 14:17:56 2018 -0300 Commit: Olivier Hallot CommitDate: Mon Aug 20 21:39:28 2018 +0200 Fix logic for screenshots in help pages better handling of image dimensions Change-Id: Iefceb9fa391d564c8920ab53160f70110a7abb8a Reviewed-on: https://gerrit.libreoffice.org/59338 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index b3b5ce140..06fe3c0ef 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -1043,48 +1043,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1195,20 +1199,20 @@ - + - + - + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bdfc1960edd57aca36c7d1399a613c97f5b71d7 Author: Olivier Hallot AuthorDate: Mon Aug 20 14:17:56 2018 -0300 Commit: Gerrit Code Review CommitDate: Mon Aug 20 21:39:28 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix logic for screenshots in help pages better handling of image dimensions Change-Id: Iefceb9fa391d564c8920ab53160f70110a7abb8a Reviewed-on: https://gerrit.libreoffice.org/59338 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c823daa3858c..5969bd167aa7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c823daa3858c14f444927ab313c28fc2d4dc3d5e +Subproject commit 5969bd167aa7abb317dcbef5420c8d36d8780cc3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk
mysqlc/Library_mysqlc.mk |4
1 file changed, 4 insertions(+)
New commits:
commit a191075ee1bd103a57c935e47026337a5e2340e9
Author: Stephan Bergmann
AuthorDate: Mon Aug 20 18:29:41 2018 +0200
Commit: Stephan Bergmann
CommitDate: Mon Aug 20 21:15:40 2018 +0200
On macOS Library_mysqlc needs _iconv{,_close,_open}
...presumably since 3478d7453a3d65b3d8d164e8f898a0b79f005c58 "Switch from
mysql
to MariaDB C API". (And see
external/mysql-connector-cpp/Library_mysqlcppconn.mk
for a similar case.)
Change-Id: I146bf83a71c59a59f7694552a31923eb1e7fe664
Reviewed-on: https://gerrit.libreoffice.org/59336
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 39c6230d2f05..8e1205c2fdb8 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
mariadb-connector-c \
))
+ifeq ($(OS)-$(SYSTEM_MARIADB_CONNECTOR_C),MACOSX-)
+$(eval $(call gb_Library_use_external,mysqlc,iconv))
+endif
+
ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
$(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz
-lm,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
64-bit Windows build failure after MSVC Update
After I updated from MSVC 15.7.6 to 15.8.1, I started seeing the following build failure: [build CXX] sc/source/ui/docshell/docsh8.cxx c:\core\sc\source\ui\docshell\docsh8.cxx(996) : error C2220: warning treated as error - no 'object' file generated c:\core\sc\source\ui\docshell\docsh8.cxx(996) : warning C4702: unreachable code c:\core\sc\source\ui\docshell\docsh8.cxx(1054) : warning C4702: unreachable code c:\core\sc\source\ui\docshell\docsh8.cxx(1063) : warning C4702: unreachable code make[1]: *** [C:/core/solenv/gbuild/LinkTarget.mk:293: C:/core/workdir/CxxObject/sc/source/ui/docshell/docsh8.o] Error 2 make[1]: *** Waiting for unfinished jobs make: *** [Makefile:286: build] Error 2 This only seems to affect 64-bit release builds. 32-bit release builds are working. This is similar to http://document-foundation-mail-archive.969070.n3.nabble.com/Windows-32-bit-build-failure-unreachable-code-td4243848.html#a4244013 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Changes to 'refs/tags/3.4-rc1'
Tag '3.4-rc1' created by Andras Timar at 2018-08-20 18:12 + 3.4-rc1 Changes since 3.3.1-final-120: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'refs/tags/3.4-rc1' - 0 commits -
Rebased ref, commits from common ancestor: ___ 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-6.0' - vcl/win
vcl/win/window/salframe.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit e56cb5f08694fc7cc7cc8c85c843085ce1b83631
Author: Ilhan Yesil
AuthorDate: Mon Jul 30 11:56:22 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 19:59:47 2018 +0200
tdf#118994 JAWS has no access to accessibility objects
According to the MSDN, lParam must be cast to DWORD when examining
WM_GETOBJECT messages on 64-bit Windows. The MSDN example also
casts wParam, so in this solution, lParam and wParam are cast to
the appropriate types sal_Int32 and sal_uInt32.
Change-Id: I1edc00778c7da91d2baf5784e4c3f8c441e42eab
Reviewed-on: https://gerrit.libreoffice.org/58312
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 200fafc341c9ac5cedb0e3e8a38fcc4e88fce77c)
Reviewed-on: https://gerrit.libreoffice.org/59342
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index f34c9d0936cc..7b47cca4c029 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5248,12 +5248,15 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM
wParam, LRESULT & nRet)
uno::Reference< accessibility::XMSAAService > xMSAA(
pSVData->mxAccessBridge, uno::UNO_QUERY );
if ( xMSAA.is() )
{
+sal_Int32 lParam32 = (sal_Int32)lParam;
+sal_uInt32 wParam32 = (sal_uInt32)wParam;
+
// mhOnSetTitleWnd not set to reasonable value anywhere...
-if ( lParam == OBJID_CLIENT )
+if ( lParam32 == OBJID_CLIENT )
{
nRet = xMSAA->getAccObjectPtr(
-reinterpret_cast(hWnd), lParam, wParam);
-if( nRet != 0 )
+reinterpret_cast(hWnd), lParam32, wParam32);
+if (nRet != 0)
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/window/salframe.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 200fafc341c9ac5cedb0e3e8a38fcc4e88fce77c
Author: Ilhan Yesil
AuthorDate: Mon Jul 30 11:56:22 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 19:58:31 2018 +0200
tdf#118994 JAWS has no access to accessibility objects
According to the MSDN, lParam must be cast to DWORD when examining
WM_GETOBJECT messages on 64-bit Windows. The MSDN example also
casts wParam, so in this solution, lParam and wParam are cast to
the appropriate types sal_Int32 and sal_uInt32.
Change-Id: I1edc00778c7da91d2baf5784e4c3f8c441e42eab
Reviewed-on: https://gerrit.libreoffice.org/58312
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 334b518cb340..6fcb54638628 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5255,12 +5255,15 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM
wParam, LRESULT & nRet)
uno::Reference< accessibility::XMSAAService > xMSAA(
pSVData->mxAccessBridge, uno::UNO_QUERY );
if ( xMSAA.is() )
{
+sal_Int32 lParam32 = (sal_Int32)lParam;
+sal_uInt32 wParam32 = (sal_uInt32)wParam;
+
// mhOnSetTitleWnd not set to reasonable value anywhere...
-if ( lParam == OBJID_CLIENT )
+if ( lParam32 == OBJID_CLIENT )
{
nRet = xMSAA->getAccObjectPtr(
-reinterpret_cast(hWnd), lParam, wParam);
-if( nRet != 0 )
+reinterpret_cast(hWnd), lParam32, wParam32);
+if (nRet != 0)
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforlist.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0281aa380a20672d55d1d672fd4a43bdcb6c224d Author: Eike Rathke AuthorDate: Mon Aug 20 16:56:29 2018 +0200 Commit: Eike Rathke CommitDate: Mon Aug 20 19:49:51 2018 +0200 One more "do not reorder date particles", tdf#113889 tdf#119013 follow-up commit 5b8007afdb97d416ee7c22bf9226e927d61e9bd3 CommitDate: Thu Aug 16 18:54:31 2018 +0200 Resolves: tdf#119013 do not over-aggressively reorder date particles negated logic from bForExcelExport to bConvertDateOrder. This somehow slipped through in that commit. Change-Id: Ibe7e7f7dc669292f38136ceeced1ead120641a20 Reviewed-on: https://gerrit.libreoffice.org/59330 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index f3af3ac13418..9d4a630df51b 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -820,7 +820,7 @@ OUString SvNumberFormatter::GetFormatStringForExcel( sal_uInt32 nKey, const NfKe SvNumFormatType nType = SvNumFormatType::DEFINED; sal_uInt32 nTempKey; OUString aTemp( pEntry->GetFormatstring()); -rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US, true); +rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US, false); SAL_WARN_IF( nCheckPos != 0, "svl.numbers", "SvNumberFormatter::GetFormatStringForExcel - format code not convertible"); if (nTempKey != NUMBERFORMAT_ENTRY_NOT_FOUND) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-54'
Tag 'cd-5.3-54' created by Andras Timar at 2018-08-20 17:45 + cd-5.3-54 Changes since cd-5.3-49-48: --- 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/cd-3.4.0-1'
Tag 'cd-3.4.0-1' created by Andras Timar at 2018-08-20 17:14 + cd-3.4.0-1 Changes since 3.4-rc1-23: --- 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 'distro/collabora/collabora-online-cd-3-4'
New branch 'distro/collabora/collabora-online-cd-3-4' available with the following commits: commit e21f347b06f3317dc47370aa0d33e2952528fa35 Author: Andras Timar Date: Tue May 29 21:55:40 2018 +0200 [cd] missing dependencies (cherry picked from commit 0d5abf9189e2614305fa05361009af7e982ed91c) Change-Id: I6d7b248c2f583a6c8fbfde8937a0bf6d30358f7b commit 0fb0b00996e71873c49f97442d8310fb8c3d8b31 Author: Ashod Nakashian Date: Mon Mar 19 20:58:40 2018 -0400 [cd] leaflet: don't show 'failed to load doc' error Change-Id: I5219a1f78f22dceb193d8a1856b3bd208e5ebbcf (cherry picked from commit 19dd3f8d17fbfa7cb95ac879ebecc3e1b6d8a585) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Undefined symbols for architecture x86_64 in libmariadb-connector-c - build failure on master, with macOS
can you try if this helps: https://gerrit.libreoffice.org/#/c/59337/ On 20.08.2018 18:31, Alexander Thurgood wrote: Le 20/08/2018 à 18:24, Drew Jensen a écrit : Yep, that's almost certainly the culprit, as it appears to have been committed just after I started my last successful build. Noticed over on the QA IRC channel some talk about Mac and a recent change to the MySQL sdbc code: "Switch from mysql to MariaDB C API" : https://cgit.freedesktop.org/libreoffice/core/commit/?id=3478d7453a3d65b3d8d164e8f898a0b79f005c58 for the change record. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 18 commits - loleaflet/dist loleaflet/po loleaflet/src loleaflet/unocommands.js scripts/unocommands.py scripts/untransl
loleaflet/dist/l10n/locore/ja.json|9 + loleaflet/dist/l10n/locore/ko.json|3 loleaflet/dist/l10n/uno/ja.json | 20 ++ loleaflet/dist/l10n/uno/ko.json | 105 - loleaflet/dist/loleaflet-help.html|2 loleaflet/po/help-ja.po | 27 +-- loleaflet/po/ui-de.po | 182 --- loleaflet/po/ui-es.po | 182 --- loleaflet/po/ui-fr.po | 182 --- loleaflet/po/ui-it.po | 182 --- loleaflet/po/ui-ja.po | 200 +- loleaflet/po/ui-ko.po | 188 +--- loleaflet/po/ui-pt.po | 182 --- loleaflet/po/ui-pt_BR.po | 182 --- loleaflet/src/control/Control.PartsPreview.js | 83 ++ loleaflet/src/control/Parts.js|2 loleaflet/src/control/Toolbar.js |4 loleaflet/unocommands.js |8 - scripts/unocommands.py|8 - scripts/untranslated.py | 156 wsd/Storage.cpp |5 21 files changed, 1193 insertions(+), 719 deletions(-) New commits: commit d1cd27ccd67242e57c7085764db853c8f67dd507 Author: Andras Timar AuthorDate: Mon Aug 6 11:33:11 2018 +0200 Commit: Andras Timar CommitDate: Mon Aug 20 19:03:04 2018 +0200 loleaflet: add two more missing Japanese translations Change-Id: I8d725825f03da16c89126da2068ad59a281b7556 (cherry picked from commit 40be2265dcf08240a2a45abf5bf446fb2c0e9d7e) diff --git a/loleaflet/po/help-ja.po b/loleaflet/po/help-ja.po index db041f816..4aecacff6 100644 --- a/loleaflet/po/help-ja.po +++ b/loleaflet/po/help-ja.po @@ -663,7 +663,7 @@ msgstr "Alt + Insert" #: dist/loleaflet-help.html+div.div.table.tr.td:110-58 msgid "3 seconds in Insert mode, Arrow Key inserts row/column, Ctrl + Arrow Key inserts cell" -msgstr "" +msgstr "挿入モードで3秒、矢印キーで行/列を挿入、Ctrl +矢印キーでセルを挿入" #: dist/loleaflet-help.html+div.div.table.tr.td:111-18 msgid "Alt + Del" @@ -671,7 +671,7 @@ msgstr "Alt + Del" #: dist/loleaflet-help.html+div.div.table.tr.td:111-55 msgid "3 seconds in Delete mode, Arrow key deletes row/column, Ctrl + Arrow key merges cell with neighboring cell" -msgstr "" +msgstr "削除モードで3秒、矢印キーで行/列を削除、Ctrl +矢印キーで隣接するセルとマージ" #: dist/loleaflet-help.html+div.div.table.tr.td:112-18 msgid "Shift + Ctrl + Del" @@ -770,7 +770,7 @@ msgstr "Ctrl + Shift + Enter" #: dist/loleaflet-help.html+div.div.table.tr.td:130-18 msgid "Insert new paragraph directly before or after a section, or before a table" -msgstr "" +msgstr "セクションの前後に新しい段落を直接挿入するか、テーブルの前に挿入する" #: dist/loleaflet-help.html+div.div.table.tr.td:130-119 #: dist/loleaflet-help.html+div.div.table.tr.td:131-155 @@ -851,7 +851,7 @@ msgstr "Ctrl + Shift + 6" #: dist/loleaflet-help.html+div.div.table.tr.td:176-18 msgid "Demote list item (list item has to be selected)" -msgstr "" +msgstr "リスト項目のレベルを下げる（リスト項目を選択する必要があります）" #: dist/loleaflet-help.html+div.div.table.tr.td:176-92 #: dist/loleaflet-help.html+div.div.table.tr.td:210-99 @@ -860,7 +860,7 @@ msgstr "Tab" #: dist/loleaflet-help.html+div.div.table.tr.td:177-18 msgid "Promote list item (list item has to be selected)" -msgstr "" +msgstr "リスト項目のレベルを上げる（リスト項目を選択する必要があります）" #: dist/loleaflet-help.html+div.div.table.tr.td:177-93 #: dist/loleaflet-help.html+div.div.table.tr.td:211-107 @@ -868,27 +868,24 @@ msgid "Shift + Tab" msgstr "Shift + Tab" #: dist/loleaflet-help.html+div.div.h2:179-9 -#, fuzzy msgid "Text selection and navigation in a textbox" -msgstr "ドキュメント内のテキスト選択と移動" +msgstr "テキストボックス内のテキストの選択とナビゲーション" #: dist/loleaflet-help.html+div.div.table.tr.td:201-18 -#, fuzzy msgid "Go and select text to start of textbox" -msgstr "ドキュメントの始めまで選択" +msgstr "テキストボックスの先頭までテキストを選択する" #: dist/loleaflet-help.html+div.div.table.tr.td:205-18 -#, fuzzy msgid "Go and select text to end of textbox" -msgstr "ドキュメント末まで選択" +msgstr "テキストボックスの最後までテキストを選択する" #: dist/loleaflet-help.html+div.div.h2:207-9 msgid "Slide / draw page keyboard shortcuts" -msgstr "" +msgstr "スライド/ページのキーボードショートカットを描画する" #: dist/loleaflet-help.html+div.div.table.tr.td:209-18 msgid "Escape current mode, i.e. from edit mode switch to object selection mode, from object selection mode switch to view mode." -msgstr "" +msgstr "現在のモードからエスケープする。すなわち、編集モードからオブジェクト選択モード、若しくはオブジェクト選択モードからビューモードへの切り替え。" #: dist/loleaflet-help.html+div.div.table.tr.td:209-166 msgid "Esc" @@ -904,8 +901,8 @@ msgstr "オブジェクトを、作成した逆順に選択します。" #: dist/loleaflet-help.html+div.div.table.tr.td:212-18 msgid "Move to next text object on slide / drawing page" -msgstr "" +msgstr "スライド/ページのキーボードショートカットを描画する"
Re: Undefined symbols for architecture x86_64 in libmariadb-connector-c - build failure on master, with macOS
Le 20/08/2018 à 18:24, Drew Jensen a écrit : Yep, that's almost certainly the culprit, as it appears to have been committed just after I started my last successful build. > Noticed over on the QA IRC channel some talk about Mac and a recent > change to the MySQL sdbc code: > "Switch from mysql to MariaDB C API" : > https://cgit.freedesktop.org/libreoffice/core/commit/?id=3478d7453a3d65b3d8d164e8f898a0b79f005c58 > for the change record. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Undefined symbols for architecture x86_64 in libmariadb-connector-c - build failure on master, with macOS
Noticed over on the QA IRC channel some talk about Mac and a recent change to the MySQL sdbc code: "Switch from mysql to MariaDB C API" : https://cgit.freedesktop.org/libreoffice/core/commit/?id=3478d7453a3d65b3d8d164e8f898a0b79f005c58 for the change record. On Mon, Aug 20, 2018 at 11:38 AM Alexander Thurgood wrote: > Le 20/08/2018 à 17:24, Alexander Thurgood a écrit : > > The last change I see when git grepping mariadb is a commit from Miklos > relating to fixing the Windows build...but this was back in May, and I > have been successfully building from master on MacOS, including after > make clean, git pull and make using an export in my environment to the > mysql-connector-c source since well before May 30th, 2018... > > > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a3fa44c0f373af8c434efc2d0d087932a5770a00
Author: Tamás Zolnai
AuthorDate: Mon Aug 20 18:07:16 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 18:20:25 2018 +0200
Crash: Check whether we still have requested tiles
Change-Id: I2a8b9ced09ff624ce925b52a60352e6fa50af25e
Reviewed-on: https://gerrit.libreoffice.org/59334
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit fd87e1e315fad5c3017f79f832d639bc5ea9dc29)
Reviewed-on: https://gerrit.libreoffice.org/59335
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 189db3ac3..eb0c1f522 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1408,7 +1408,8 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
if (!requestedTiles.empty())
{
std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit)
+while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit &&
+ !requestedTiles.empty())
{
TileDesc& tile = *(requestedTiles.begin());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit fd87e1e315fad5c3017f79f832d639bc5ea9dc29
Author: Tamás Zolnai
AuthorDate: Mon Aug 20 18:07:16 2018 +0200
Commit: Aron Budea
CommitDate: Mon Aug 20 18:19:54 2018 +0200
Crash: Check whether we still have requested tiles
Change-Id: I2a8b9ced09ff624ce925b52a60352e6fa50af25e
Reviewed-on: https://gerrit.libreoffice.org/59334
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2bd5b5d02..cfd288507 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1385,7 +1385,8 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
if (!requestedTiles.empty())
{
std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit)
+while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit &&
+ !requestedTiles.empty())
{
TileDesc& tile = *(requestedTiles.begin());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/svtools svtools/source
include/svtools/hyperlabel.hxx|4 -
svtools/source/control/hyperlabel.cxx | 75 --
svtools/source/control/roadmap.cxx| 34 +++
3 files changed, 46 insertions(+), 67 deletions(-)
New commits:
commit 89e913cfbfd46b2579eede3c392ae360c3a0afcb
Author: Jan-Marek Glogowski
AuthorDate: Fri Aug 10 19:46:59 2018 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 20 18:17:25 2018 +0200
Fix wizard step text styling
Moves all the SetTextColor handing into ApplySettings and just
changes the ControlBackground depending on step state.
Change-Id: I96234b6353afada7bc77e2f641a160c1cf25f48d
Reviewed-on: https://gerrit.libreoffice.org/58857
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit a6a2cc8f0e6501b92988accee2c3674dcfb05a2f)
Reviewed-on: https://gerrit.libreoffice.org/59320
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index e7bc9d6c30b5..bd86801724ae 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -42,9 +42,6 @@ namespace svt
virtual voidGetFocus() override;
virtual voidLoseFocus() override;
-voidDeactivateHyperMode(vcl::Font aFont, const Color
aColor);
-voidActivateHyperMode(vcl::Font aFont, const Color
aColor);
-
voidimplInit();
using FixedText::CalcMinimumSize;
@@ -55,6 +52,7 @@ namespace svt
virtual void dispose() override;
virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
+virtual voidApplySettings(vcl::RenderContext& rRenderContext)
override;
voidSetID( sal_Int16 ID );
sal_Int16 GetID() const;
diff --git a/svtools/source/control/hyperlabel.cxx
b/svtools/source/control/hyperlabel.cxx
index 2cebdc20d27a..0552bdb54ea7 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -77,56 +77,33 @@ namespace svt
void HyperLabel::ToggleBackgroundColor( const Color& _rGBColor )
{
-const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
SetControlBackground( _rGBColor );
-if (_rGBColor == COL_TRANSPARENT)
-SetTextColor( rStyleSettings.GetFieldTextColor( ) );
-else
-SetTextColor( rStyleSettings.GetHighlightTextColor( ) );
}
-
void HyperLabel::MouseMove( const MouseEvent& rMEvt )
{
vcl::Font aFont = GetControlFont( );
-const Color aColor = GetTextColor();
-if (rMEvt.IsLeaveWindow())
-{
-DeactivateHyperMode(aFont, aColor);
-}
-else
+bool bHyperMode = false;
+if (!rMEvt.IsLeaveWindow() && IsEnabled() && m_pImpl->bInteractive)
{
Point aPoint = GetPointerPosPixel();
if (aPoint.X() < m_pImpl->m_aMinSize.Width())
-{
-if ( IsEnabled() && (m_pImpl->bInteractive) )
-{
-ActivateHyperMode( aFont, aColor);
-return;
-}
-}
-DeactivateHyperMode(aFont, aColor);
+bHyperMode = true;
}
-}
-void HyperLabel::ActivateHyperMode(vcl::Font aFont, const Color aColor)
-{
-aFont.SetUnderline(LINESTYLE_SINGLE);
-m_pImpl->m_bHyperMode = true;
-SetPointer( PointerStyle::RefHand );
-SetControlFont( aFont);
-SetTextColor( aColor);
-
-}
-
-void HyperLabel::DeactivateHyperMode(vcl::Font aFont, const Color aColor)
-{
-m_pImpl->m_bHyperMode = false;
-aFont.SetUnderline(LINESTYLE_NONE);
-SetPointer( PointerStyle::Arrow );
-SetControlFont( aFont);
-SetTextColor( aColor);
+m_pImpl->m_bHyperMode = bHyperMode;
+if (bHyperMode)
+{
+aFont.SetUnderline(LINESTYLE_SINGLE);
+SetPointer(PointerStyle::RefHand);
+}
+else
+{
+aFont.SetUnderline(LINESTYLE_NONE);
+SetPointer(PointerStyle::Arrow);
+}
+SetControlFont(aFont);
}
void HyperLabel::MouseButtonDown( const MouseEvent& )
@@ -193,28 +170,32 @@ namespace svt
SetText(_rText);
}
+void HyperLabel::ApplySettings(vcl::RenderContext& rRenderContext)
+{
+FixedText::ApplySettings(rRenderContext);
+
+const StyleSettings& rStyleSettings =
rRenderContext.GetSettings().GetStyleSettings();
+if (GetControlBackground() == COL_TRANSPARENT)
+rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor());
+else
+
rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
+}
void HyperLabel::DataChanged( const DataChangedEvent& rDCEvt )
{
-const StyleSettings& rStyleSettings = Ge
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/text.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ae814d8b00364da8c1d3b12d91fd781081033ce8 Author: Caolán McNamara AuthorDate: Mon Aug 20 12:55:39 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 20 18:07:44 2018 +0200 can use FontSelectPatternAttributes here Change-Id: I7702c8a763ff9c624ef9c64f80c3e8457a027d40 Reviewed-on: https://gerrit.libreoffice.org/59324 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 9568b3b50eb2..a331a204e449 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -218,7 +218,7 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) if( !pVDev->SetOutputSizePixel( aBoundRect.GetSize() ) ) return false; -const FontSelectPattern& rPattern = mpFontInstance->GetFontSelectPattern(); +const FontSelectPatternAttributes& rPattern = mpFontInstance->GetFontSelectPattern(); vcl::Font aFont( GetFont() ); aFont.SetOrientation( 0 ); aFont.SetFontSize( Size( rPattern.mnWidth, rPattern.mnHeight ) ); ___ 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' - loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 89d005986733f8b5f7d6d4fef3d0603cc8c4eb95
Author: Tamás Zolnai
AuthorDate: Wed Aug 15 18:41:46 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 18:03:28 2018 +0200
Update visibla area first before requesting new tiles
Change-Id: I379e4d92adf34bf16a1990123328b75c50f13df2
(cherry picked from commit eb448a6dd9b5d9f6558d2c3fd9510757ec77537e)
Reviewed-on: https://gerrit.libreoffice.org/59325
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 720fc2697..a337e3835 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -541,6 +541,10 @@ L.GridLayer = L.Layer.extend({
}
}
+ this._sendClientVisibleArea();
+
+ this._sendClientZoom();
+
if (queue.length !== 0) {
if (newView) {
// we know that a new set of tiles that cover
the whole view has been requested
@@ -558,10 +562,6 @@ L.GridLayer = L.Layer.extend({
this._addTiles(queue, fragment);
this._level.el.appendChild(fragment);
}
-
- this._sendClientVisibleArea();
-
- this._sendClientZoom();
},
_updateOnChangePart: function () {
___
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' - wsd/ClientSession.hpp wsd/DocumentBroker.cpp
wsd/ClientSession.hpp |7 +++
wsd/DocumentBroker.cpp | 26 +-
2 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit 648c662d231d63053ac18b077301395c43ddb68b
Author: Tomaž Vajngerl
AuthorDate: Fri Aug 3 14:25:21 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 17:49:12 2018 +0200
get rid of boost::optional
We don't check if boost is available in the configure phase so we
can't use it. It is possible to add it but as we only use it in
one place and it is actually not really needed, it is better to
remove the usage.
This change also moves the std::list to std::deque.
Change-Id: I4c661a2fb8995bf756a0815a6e30bb304f22d3c8
Reviewed-on: https://gerrit.libreoffice.org/58640
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit cfab70c48bd954bd7707f00f262788194185e018)
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 824f7adc4..4c86e87a1 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -17,8 +17,7 @@
#include "DocumentBroker.hpp"
#include
#include
-#include
-#include
+#include
#include
#include
@@ -111,7 +110,7 @@ public:
void setWopiFileInfo(std::unique_ptr&
wopiFileInfo) { _wopiFileInfo = std::move(wopiFileInfo); }
/// Get requested tiles waiting for sending to the client
-boost::optional>& getRequestedTiles() { return
_requestedTiles; }
+std::deque& getRequestedTiles() { return _requestedTiles; }
/// Mark a new tile as sent
void addTileOnFly(const TileDesc& tile);
@@ -229,7 +228,7 @@ private:
std::unordered_set _tilesBeingRendered;
/// Requested tiles are stored in this list, before we can send them to
the client
-boost::optional> _requestedTiles;
+std::deque _requestedTiles;
/// Store wireID's of the sent tiles inside the actual visible area
std::map _oldWireIds;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 0fe8e1878..189db3ac3 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1343,17 +1343,17 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
// Accumulate tiles
-boost::optional>& requestedTiles =
session->getRequestedTiles();
-if(requestedTiles == boost::none)
+std::deque& requestedTiles = session->getRequestedTiles();
+if (requestedTiles.empty())
{
-requestedTiles = std::list(tileCombined.getTiles().begin(),
tileCombined.getTiles().end());
+requestedTiles = std::deque(tileCombined.getTiles().begin(),
tileCombined.getTiles().end());
}
// Drop duplicated tiles, but use newer version number
else
{
for (const auto& newTile : tileCombined.getTiles())
{
-const TileDesc& firstOldTile = *(requestedTiles.get().begin());
+const TileDesc& firstOldTile = *(requestedTiles.begin());
if(newTile.getPart() != firstOldTile.getPart() ||
newTile.getWidth() != firstOldTile.getWidth() ||
newTile.getHeight() != firstOldTile.getHeight() ||
@@ -1364,7 +1364,7 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
bool tileFound = false;
-for (auto& oldTile : requestedTiles.get())
+for (auto& oldTile : requestedTiles)
{
if(oldTile.getTilePosX() == newTile.getTilePosX() &&
oldTile.getTilePosY() == newTile.getTilePosY() )
@@ -1377,7 +1377,7 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
}
if(!tileFound)
-requestedTiles.get().push_back(newTile);
+requestedTiles.push_back(newTile);
}
}
@@ -1404,14 +1404,13 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
// All tiles were processed on client side what we sent last time, so we
can send a new banch of tiles
// which was invalidated / requested in the meantime
-boost::optional>& requestedTiles =
session->getRequestedTiles();
-if(requestedTiles != boost::none && !requestedTiles.get().empty())
+std::deque& requestedTiles = session->getRequestedTiles();
+if (!requestedTiles.empty())
{
std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit
- && !requestedTiles.get().empty())
+while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit)
{
-TileDesc& tile = *(requestedTiles.get().begin());
+TileDesc& tile = *(requestedTiles.begin());
// Satisfy as many tiles from the cache.
std::unique_ptr cachedTile =
_tileCache->lookupTile(tile);
@@ -1449,7 +1448,7 @@ void DocumentBroker::sendReque
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/fontmanager/fontsubst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ea4fe606687876e8dc3e160be4a238cc66193b27
Author: Caolán McNamara
AuthorDate: Mon Aug 20 12:31:48 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 17:48:06 2018 +0200
uselessmatch can take FontSelectPatternAttributes
Change-Id: Ic441d8795133b0332011ce8d19fcc9f644046dda
Reviewed-on: https://gerrit.libreoffice.org/59321
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx
b/vcl/unx/generic/fontmanager/fontsubst.cxx
index 0ff321be7806..11586ad21382 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -64,7 +64,7 @@ static FontSelectPattern GetFcSubstitute(const
FontSelectPattern &rFontSelData,
namespace
{
-bool uselessmatch(const FontSelectPattern &rOrig, const FontSelectPattern
&rNew)
+bool uselessmatch(const FontSelectPatternAttributes &rOrig, const
FontSelectPatternAttributes &rNew)
{
return
(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/ClientSession.hpp wsd/DocumentBroker.cpp
wsd/ClientSession.hpp |7 +++
wsd/DocumentBroker.cpp | 26 +-
2 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit cfab70c48bd954bd7707f00f262788194185e018
Author: Tomaž Vajngerl
AuthorDate: Fri Aug 3 14:25:21 2018 +0200
Commit: Ashod Nakashian
CommitDate: Mon Aug 20 17:43:44 2018 +0200
get rid of boost::optional
We don't check if boost is available in the configure phase so we
can't use it. It is possible to add it but as we only use it in
one place and it is actually not really needed, it is better to
remove the usage.
This change also moves the std::list to std::deque.
Change-Id: I4c661a2fb8995bf756a0815a6e30bb304f22d3c8
Reviewed-on: https://gerrit.libreoffice.org/58640
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 997058f68..52855abf9 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -17,8 +17,7 @@
#include "DocumentBroker.hpp"
#include
#include
-#include
-#include
+#include
#include
#include
@@ -122,7 +121,7 @@ public:
void setWopiFileInfo(std::unique_ptr&
wopiFileInfo) { _wopiFileInfo = std::move(wopiFileInfo); }
/// Get requested tiles waiting for sending to the client
-boost::optional>& getRequestedTiles() { return
_requestedTiles; }
+std::deque& getRequestedTiles() { return _requestedTiles; }
/// Mark a new tile as sent
void addTileOnFly(const TileDesc& tile);
@@ -240,7 +239,7 @@ private:
std::unordered_set _tilesBeingRendered;
/// Requested tiles are stored in this list, before we can send them to
the client
-boost::optional> _requestedTiles;
+std::deque _requestedTiles;
/// Store wireID's of the sent tiles inside the actual visible area
std::map _oldWireIds;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index be5c3aae4..2bd5b5d02 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1320,17 +1320,17 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
// Accumulate tiles
-boost::optional>& requestedTiles =
session->getRequestedTiles();
-if(requestedTiles == boost::none)
+std::deque& requestedTiles = session->getRequestedTiles();
+if (requestedTiles.empty())
{
-requestedTiles = std::list(tileCombined.getTiles().begin(),
tileCombined.getTiles().end());
+requestedTiles = std::deque(tileCombined.getTiles().begin(),
tileCombined.getTiles().end());
}
// Drop duplicated tiles, but use newer version number
else
{
for (const auto& newTile : tileCombined.getTiles())
{
-const TileDesc& firstOldTile = *(requestedTiles.get().begin());
+const TileDesc& firstOldTile = *(requestedTiles.begin());
if(newTile.getPart() != firstOldTile.getPart() ||
newTile.getWidth() != firstOldTile.getWidth() ||
newTile.getHeight() != firstOldTile.getHeight() ||
@@ -1341,7 +1341,7 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
bool tileFound = false;
-for (auto& oldTile : requestedTiles.get())
+for (auto& oldTile : requestedTiles)
{
if(oldTile.getTilePosX() == newTile.getTilePosX() &&
oldTile.getTilePosY() == newTile.getTilePosY() )
@@ -1354,7 +1354,7 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
}
if(!tileFound)
-requestedTiles.get().push_back(newTile);
+requestedTiles.push_back(newTile);
}
}
@@ -1381,14 +1381,13 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
// All tiles were processed on client side what we sent last time, so we
can send a new banch of tiles
// which was invalidated / requested in the meantime
-boost::optional>& requestedTiles =
session->getRequestedTiles();
-if(requestedTiles != boost::none && !requestedTiles.get().empty())
+std::deque& requestedTiles = session->getRequestedTiles();
+if (!requestedTiles.empty())
{
std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit
- && !requestedTiles.get().empty())
+while(session->getTilesOnFlyCount() +
session->getTilesBeingRenderedCount() < tilesOnFlyUpperLimit)
{
-TileDesc& tile = *(requestedTiles.get().begin());
+TileDesc& tile = *(requestedTiles.begin());
// Satisfy as many tiles from the cache.
std::unique_ptr cachedTile =
_tileCache->lookupTile(tile);
@@ -1425,7 +1424,7 @@ void DocumentBroker::sendRequestedTiles(const
std::shared_ptr& se
_debugRenderedTi
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source svx/source
oox/source/drawingml/shape.cxx |8
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 11 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 591b7a689928cf428f63cb31adc5bbe6b56da231
Author: Szymon Kłos
AuthorDate: Tue Aug 14 13:22:33 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 17:42:25 2018 +0200
tdf#116350 Better text layout for big shapes
Added some horizontal padding - for bigger shapes
and vertical adjustment for multi-line labels.
Change-Id: I665b238b0d08a499cd846952d831fe449f72f575
Reviewed-on: https://gerrit.libreoffice.org/58975
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
(cherry picked from commit a643c8353754c6ce8b318e37cbbc60c3425e9d32)
Reviewed-on: https://gerrit.libreoffice.org/59163
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 984b159e3dfa..2926614b8efc 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -527,6 +527,14 @@ static inline void lcl_createPresetShape(
uno::Reference& xShap
}
}
+// Apply vertical adjustment for text on arc
+SvxShape* pShape = SvxShape::getImplementation(xShape);
+assert(pShape);
+if (rClass == "fontwork-arch-up-curve")
+pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem(
SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ) );
+else if (rClass == "fontwork-arch-down-curve")
+pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem(
SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ) );
+
// Apply preset shape
xDefaulter->createCustomShapeDefaults( rClass );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 0419038f0fda..c59daeba68e6 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -251,6 +251,10 @@ void CalculateHorizontalScalingFactor(
if (nFontSize > 1)
rFWData.fVerticalTextScaling = static_cast(nFontSize) /
rFontHeight.GetHeight();
+// Add some padding
+if (rFWData.bScaleX)
+fScalingFactor *= 1.1;
+
rFWData.fHorizontalTextScaling = fScalingFactor;
}
@@ -530,11 +534,16 @@ bool GetFontWorkOutline(
}
else if (rFWData.bScaleX)
{
+const SdrTextVertAdjust nVertJustify =
rSdrObjCustomShape.GetMergedItem( SDRATTR_TEXT_VERTADJUST ).GetValue();
+double fFactor = nVertJustify ==
SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ? -0.5 : ( nVertJustify ==
SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ? 0.5 : 0 );
+
std::vector< FWParagraphData >::iterator aParagraphIter(
aTextAreaIter->vParagraphs.begin() );
std::vector< FWParagraphData >::const_iterator aParagraphIEnd(
aTextAreaIter->vParagraphs.end() );
while ( aParagraphIter != aParagraphIEnd )
{
sal_Int32 nHorzDiff = 0;
+sal_Int32 nVertDiff = static_cast(
rFWData.nSingleLineHeight ) * fFactor * ( aTextAreaIter->vParagraphs.size() - 1
);
+
if ( eHorzAdjust == SDRTEXTHORZADJUST_CENTER )
nHorzDiff = ( rFWData.fHorizontalTextScaling *
aTextAreaIter->aBoundRect.GetWidth() - aParagraphIter->aBoundRect.GetWidth() )
/ 2;
else if ( eHorzAdjust == SDRTEXTHORZADJUST_RIGHT )
@@ -550,7 +559,7 @@ bool GetFontWorkOutline(
std::vector< tools::PolyPolygon >::const_iterator
aOutlineIEnd = aCharacterIter->vOutlines.end();
while( aOutlineIter != aOutlineIEnd )
{
-aOutlineIter->Move( nHorzDiff, 0 );
+aOutlineIter->Move( nHorzDiff, nVertDiff );
++aOutlineIter;
}
++aCharacterIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Undefined symbols for architecture x86_64 in libmariadb-connector-c - build failure on master, with macOS
Le 20/08/2018 à 17:24, Alexander Thurgood a écrit : The last change I see when git grepping mariadb is a commit from Miklos relating to fixing the Windows build...but this was back in May, and I have been successfully building from master on MacOS, including after make clean, git pull and make using an export in my environment to the mysql-connector-c source since well before May 30th, 2018... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2f5a0a18b5e62b45c9080c89a717c9507e1556a Author: Andras Timar AuthorDate: Mon Aug 20 17:27:01 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Aug 20 17:28:48 2018 +0200 Update git submodules * Update helpcontent2 from branch 'distro/collabora/cp-6.0' - [cp] Collabora favicon Change-Id: I00bfc8fff17435356f393de32b585d12c37fea5e diff --git a/helpcontent2 b/helpcontent2 index cef6bdec37d8..2ab792f865c7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cef6bdec37d8001d8f8c2c0f30c3a44500e38ec6 +Subproject commit 2ab792f865c7b9157985cd617c7c5b3822066133 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.0' - source/media
source/media/navigation/favicon.ico |binary 1 file changed New commits: commit 2ab792f865c7b9157985cd617c7c5b3822066133 Author: Andras Timar AuthorDate: Mon Aug 20 17:27:01 2018 +0200 Commit: Andras Timar CommitDate: Mon Aug 20 17:27:01 2018 +0200 [cp] Collabora favicon Change-Id: I00bfc8fff17435356f393de32b585d12c37fea5e diff --git a/source/media/navigation/favicon.ico b/source/media/navigation/favicon.ico index b890a56a8..10c055775 100644 Binary files a/source/media/navigation/favicon.ico and b/source/media/navigation/favicon.ico differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Undefined symbols for architecture x86_64 in libmariadb-connector-c - build failure on master, with macOS
HI all, In my usually uneventful master builds, last built on August 13th, I am now seeing the following build failure in mysqlc.uno.dylib : Undefined symbols for architecture x86-64: "_iconv", referenced from _mariadb_convert_string in libmariadb-connector-c.a "_iconv_close", referenced from _mariadb_convert_string in libmariadb-connector-c.a "_iconv_open", referenced from _mariadb_convert_string in libmariadb-connector-c.a clang: error: linker command failed with exit code 1 What gives ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basctl/source cli_ure/source configmgr/source connectivity/source extensions/source reportdesign/source sal/osl sal/qa scripting/source sc/source sd/source shell/source
basctl/source/basicide/basides1.cxx |6
cli_ure/source/climaker/climaker_emit.cxx |7
configmgr/source/modifications.cxx|6
connectivity/source/drivers/postgresql/pq_tools.cxx |7
extensions/source/ole/unoobjw.cxx | 12
reportdesign/source/filter/xml/xmlExport.cxx |6
sal/osl/w32/procimpl.cxx |7
sal/qa/osl/process/osl_process.cxx| 30 -
sc/source/core/data/documen2.cxx |4
sc/source/core/tool/rangelst.cxx | 49 -
sc/source/filter/ftools/fapihelper.cxx|8
sc/source/filter/oox/formulaparser.cxx|7
sc/source/filter/oox/pivotcachebuffer.cxx |8
sc/source/ui/miscdlgs/conflictsdlg.cxx| 107 +---
scripting/source/provider/BrowseNodeFactoryImpl.cxx |7
scripting/source/stringresource/stringresource.cxx| 59 --
sd/source/ui/animations/CustomAnimationDialog.cxx | 12
sd/source/ui/dlg/RemoteDialogClientBox.cxx|6
sd/source/ui/sidebar/MasterPageObserver.cxx |8
sd/source/ui/view/ToolBarManager.cxx | 24
shell/source/tools/lngconvex/lngconvex.cxx|7
shell/source/unix/sysshell/recently_used_file_handler.cxx |7
stoc/source/javavm/javavm.cxx |3
stoc/source/uriproc/UriReferenceFactory.cxx | 14
svx/source/dialog/framelinkarray.cxx |8
sw/source/filter/ww8/writerhelper.cxx |7
sw/source/filter/ww8/wrtw8esh.cxx | 21
sw/source/filter/ww8/wrtw8nds.cxx |7
sw/source/filter/ww8/wrtw8sty.cxx |5
sw/source/filter/ww8/ww8atr.cxx | 21
sw/source/filter/ww8/ww8graf2.cxx | 12
sw/source/filter/ww8/ww8par5.cxx |9
sw/source/ui/index/cnttab.cxx | 23
sw/source/ui/misc/glosbib.cxx | 57 --
vcl/source/edit/textdoc.cxx | 12
vcl/source/window/splitwin.cxx| 267 --
xmloff/source/text/txtimp.cxx |6
xmlsecurity/source/dialogs/resourcemanager.cxx| 12
xmlsecurity/source/helper/documentsignaturehelper.cxx | 14
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 22
40 files changed, 380 insertions(+), 534 deletions(-)
New commits:
commit 0787ce8814e37972a0c968f60008d4e8722b6e27
Author: Arkadiy Illarionov
AuthorDate: Wed Aug 15 21:32:27 2018 +0300
Commit: Noel Grandin
CommitDate: Mon Aug 20 17:12:11 2018 +0200
Simplify containers iterations, tdf#96099 follow-up
Use range-based loop or replace with std::any_of, std::find and
std::find_if where applicable.
Change-Id: I2f80788c49d56094c29b102eb96a7a7c079567c6
Reviewed-on: https://gerrit.libreoffice.org/59143
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index f3ee0773e6d1..9cef7bdd41ec 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -154,10 +154,8 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
{
// search other modules...
bool bChangeCurWindow = false;
-auto it = aWindowTable.cbegin();
-for ( ; it != aWindowTable.cend(); ++it)
-if (it->second == pCurWin)
-break;
+auto it = std::find_if(aWindowTable.cbegin(),
aWindowTable.cend(),
+ [this](const
WindowTable::value_type& item) { return item.second == pCurWin; });
if (it != aWindowTable.cend())
++it;
BaseWindow* pWin = it != aWindowTable.cend() ?
it->second.get() : nullptr;
diff --git a/cli_ure/source/climaker/climaker_emit.cxx
b/cli_ure/source/climaker/climaker_emit.cxx
index bfd0b88a05f7..24eb3e455754 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -723,8 +723,11 @@ Assembly ^ TypeEmitter::type_resolve(
gcnew array< ::System::Type^>( vecBaseTypes.size() );
int index = 0;
-for (auto i = vecBaseTypes.begin(); i != vecBaseTypes.end(); ++i,
++index)
-base_inte
[Libreoffice-commits] online.git: 2 commits - configure.ac
configure.ac |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit fc9f722a46f2f4a467f6bf0250161b81fd9d9640
Author: Tor Lillqvist
AuthorDate: Mon Aug 20 17:59:31 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Aug 20 17:59:31 2018 +0300
Revert "Look for libpng16, too, and link with -lz (in case static build)"
Nah. Let's not pretend. The configure script approach is for Linux
only.
This reverts commit db5a57308ba8d0a9be903c04ab05bd7df74c3d1a.
diff --git a/configure.ac b/configure.ac
index 2822e6fe5..421fdd686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,10 +283,9 @@ AS_IF([test `uname -s` != Darwin],
[AC_MSG_ERROR([dlopen not found])])])
AC_SEARCH_LIBS([png_create_write_struct],
- [png png16],
+ [png],
[],
- [AC_MSG_ERROR([libpng not available?])],
- [-lz])
+ [AC_MSG_ERROR([libpng not available?])])
AS_IF([test `uname -s` = Linux],
[AC_SEARCH_LIBS([cap_get_proc],
commit a03512009584277ae7789bdf49d2f527a89d6622
Author: Tor Lillqvist
AuthorDate: Mon Aug 20 17:59:06 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Aug 20 17:59:06 2018 +0300
Revert "Hopefully just 'readlink' (without the -f option) is enough"
Nah. Let's not pretend. The configure script approach is for Linux
only.
This reverts commit 574f769317dfb09f86a1b145eb2209969c5f2232.
diff --git a/configure.ac b/configure.ac
index f7b94f9b0..2822e6fe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,7 @@ else
AC_MSG_ERROR(no)
fi
-with_lokit_path=`readlink $with_lokit_path`
+with_lokit_path=`readlink -f $with_lokit_path`
AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
lokit_msg="$with_lokit_path"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/PhysicalFontCollection.hxx |2 +-
vcl/source/font/PhysicalFontCollection.cxx | 14 +++---
vcl/source/gdi/virdev.cxx |2 +-
vcl/source/outdev/font.cxx |2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d2c9c60fefb9687adbde4be61ed66a5123a2587f
Author: Caolán McNamara
AuthorDate: Mon Aug 20 14:23:12 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 16:41:51 2018 +0200
make PhysicalFontCollection::Close return std::shared_ptr
Change-Id: Iefa9df1d40c11cc56831467a03e0274475c50ed1
Reviewed-on: https://gerrit.libreoffice.org/59327
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/PhysicalFontCollection.hxx
b/vcl/inc/PhysicalFontCollection.hxx
index 46caab87c7c7..08ce6dcf98c1 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -63,7 +63,7 @@ public:
voidSetFallbackHook(
ImplGlyphFallbackFontSubstitution* );
// misc utilities
-PhysicalFontCollection* Clone() const;
+std::shared_ptr Clone() const;
std::unique_ptr GetDeviceFontList() const;
std::unique_ptr GetDeviceFontSizeList( const
OUString& rFontName ) const;
diff --git a/vcl/source/font/PhysicalFontCollection.cxx
b/vcl/source/font/PhysicalFontCollection.cxx
index 8df6104c97f9..38dedaf09645 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -866,22 +866,22 @@ PhysicalFontFamily*
PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co
return pFoundData;
}
-PhysicalFontCollection* PhysicalFontCollection::Clone() const
+std::shared_ptr PhysicalFontCollection::Clone() const
{
-PhysicalFontCollection* pClonedCollection = new PhysicalFontCollection;
-pClonedCollection->mpPreMatchHook = mpPreMatchHook;
-pClonedCollection->mpFallbackHook = mpFallbackHook;
+std::shared_ptr xClonedCollection(new
PhysicalFontCollection);
+xClonedCollection->mpPreMatchHook = mpPreMatchHook;
+xClonedCollection->mpFallbackHook = mpFallbackHook;
// TODO: clone the config-font attributes too?
-pClonedCollection->mbMatchData= false;
+xClonedCollection->mbMatchData= false;
for (auto const& family : maPhysicalFontFamilies)
{
const PhysicalFontFamily* pFontFace = family.second.get();
-pFontFace->UpdateCloneFontList(*pClonedCollection);
+pFontFace->UpdateCloneFontList(*xClonedCollection);
}
-return pClonedCollection;
+return xClonedCollection;
}
std::unique_ptr
PhysicalFontCollection::GetDeviceFontList() const
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index f48d9b3b1473..7a7c3b7d855c 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -499,7 +499,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode
i_eRefDevMode, sal_Int32
// get font list with scalable fonts only
AcquireGraphics();
-mxFontCollection.reset(pSVData->maGDIData.mxScreenFontList->Clone());
+mxFontCollection = pSVData->maGDIData.mxScreenFontList->Clone();
// prepare to use new font lists
mxFontCache.reset(new ImplFontCache);
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 81a825fe17f8..72338d32bac1 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -581,7 +581,7 @@ void OutputDevice::ImplRefreshFontData( const bool
bNewFontLists )
{
if( mpPDFWriter )
{
-
mxFontCollection.reset(pSVData->maGDIData.mxScreenFontList->Clone());
+mxFontCollection =
pSVData->maGDIData.mxScreenFontList->Clone();
mxFontCache.reset(new ImplFontCache);
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Victor Walker licence statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/PhysicalFontFace.hxx |2 +-
vcl/source/font/PhysicalFontFace.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c1a06ec8779ffb6fe442379735bcdeab5fb3532e
Author: Caolán McNamara
AuthorDate: Mon Aug 20 11:45:25 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 16:37:20 2018 +0200
IsBetterMatch just uses FontSelectPatternAttributes
Change-Id: I5d0ca9059bc5717b345332e18ef983db982a2966
Reviewed-on: https://gerrit.libreoffice.org/59316
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index c350a6c81649..b0eb23cc2889 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -60,7 +60,7 @@ public:
int GetWidth() const{ return mnWidth; }
virtual sal_IntPtr GetFontId() const = 0;
-boolIsBetterMatch( const FontSelectPattern&,
FontMatchStatus& ) const;
+boolIsBetterMatch( const FontSelectPatternAttributes&,
FontMatchStatus& ) const;
sal_Int32 CompareWithSize( const PhysicalFontFace& ) const;
sal_Int32 CompareIgnoreSize( const PhysicalFontFace& ) const;
diff --git a/vcl/source/font/PhysicalFontFace.cxx
b/vcl/source/font/PhysicalFontFace.cxx
index 1b0940c8fb76..a244e7966eb6 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -89,7 +89,7 @@ sal_Int32 PhysicalFontFace::CompareWithSize( const
PhysicalFontFace& rOther ) co
return 0;
}
-bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD,
FontMatchStatus& rStatus ) const
+bool PhysicalFontFace::IsBetterMatch( const FontSelectPatternAttributes& rFSD,
FontMatchStatus& rStatus ) const
{
int nMatch = 0;
___
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/tool/interpr1.cxx | 16 1 file changed, 16 insertions(+) New commits: commit 7d785183dda20942459616110bab041f9293a399 Author: Eike Rathke AuthorDate: Mon Aug 20 12:59:59 2018 +0200 Commit: Eike Rathke CommitDate: Mon Aug 20 16:13:45 2018 +0200 Resolves: tdf#119137 treat scalar non-reference non-array argument as matrix ... of size 1x1 so all further checks are applicable as for any other array. Change-Id: I0c8926bc56f5e451ca4847e0f0c76a1be97418f2 Reviewed-on: https://gerrit.libreoffice.org/59317 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 2e2b1dc7b265..71f95a3ecd55 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6220,7 +6220,23 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf nMainTab2 = 0; } break; +// Treat a scalar value as 1x1 matrix. +case svDouble: +pMainMatrix = GetNewMat(1,1); +nMainCol1 = nMainCol2 = 0; +nMainRow1 = nMainRow2 = 0; +nMainTab1 = nMainTab2 = 0; +pMainMatrix->PutDouble( GetDouble(), 0, 0); +break; +case svString: +pMainMatrix = GetNewMat(1,1); +nMainCol1 = nMainCol2 = 0; +nMainRow1 = nMainRow2 = 0; +nMainTab1 = nMainTab2 = 0; +pMainMatrix->PutString( GetString(), 0, 0); +break; default: +PopError(); PushError( FormulaError::IllegalParameter); return; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c8589ca9fad5ecda988b6c15b5cdd2560405278 Author: Sophia Schröder AuthorDate: Sat Jul 7 15:48:03 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Aug 20 15:48:51 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Cleanups in /shared/00/ Change-Id: I54fc724adac9d08ac6f705933c4b3fc0cf9ffa0b Reviewed-on: https://gerrit.libreoffice.org/57134 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 5c78f56bc417..c823daa3858c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5c78f56bc417b0be078f84303ab4895c9e1f7daf +Subproject commit c823daa3858c14f444927ab313c28fc2d4dc3d5e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0001.xhp | 298 + 1 file changed, 142 insertions(+), 156 deletions(-) New commits: commit c823daa3858c14f444927ab313c28fc2d4dc3d5e Author: Sophia Schröder AuthorDate: Sat Jul 7 15:48:03 2018 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Aug 20 15:48:51 2018 +0200 Cleanups in /shared/00/ Change-Id: I54fc724adac9d08ac6f705933c4b3fc0cf9ffa0b Reviewed-on: https://gerrit.libreoffice.org/57134 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index 278ddbe9f..17bb2cb75 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -1,6 +1,5 @@ - - - - Frequently-Used Buttons - /text/shared/00/0001.xhp - - - - Frequently-Used Buttons - + +Frequently-Used Buttons +/text/shared/00/0001.xhp + + + +Frequently-Used Buttons + @@ -39,47 +37,46 @@ Cancel - Clicking Cancel closes a dialog without saving any changes made. - - + Clicking Cancel closes a dialog without saving any changes made. + + Finish - Applies all changes and closes the wizard. - - - Toolbars - By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing View - Toolbars - (toolbar name). - - - Spin button - - - - In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally. - - - In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols. - - - You can type a numerical value into the field next to the spin button, or select the value with the up-arrow or down-arrow symbols on the spin button. On the keyboard you can press the up arrow and down arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value. - If the field next to the spin button defines numerical values, you can also define a measurement unit, for example, 1 cm or 5 mm, 12 pt or 2". - - - - Convert - If you click forward through the dialog, this button is called Next. On the last page the button has the name Convert. The conversion is then performed by clicking the button. - - - Context Menu - - To activate the context menu of an object, first click the object with the -left mouse button to select it, and then, while holding down the Ctrl key or the Command and Option keys, click the mouse button again - click the right mouse button. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename]. - - - - + Applies all changes and closes the wizard. + + +Toolbars + By clicking the arrow next to some icons you open a toolbar. To move a toolbar, drag the title bar. As soon as you release the mouse button, the toolbar remains at the new position. Drag the title bar to another position, or drag to an edge of the window, where the toolbar will dock. Close a toolbar by clicking the Close Window icon. Make the toolbar visible again by choosing View - Toolbars - (toolbar name). + + +Spin button + + + + In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally. + + + In the Basic IDE, a spin button is the name used for the numerical field together with the two arrow symbols. + + +You can type a numerical value into the field next to the spin button, or select the value with the Up Arrow or Down Arrow symbols on the spin button. On the keyboard you can press the Up Arrow and Down Arrow keys to increase or reduce the value. You can press the Page Up and Page Down keys to set the maximum and minimum value. +If the field next to the spin button defines numerical values, you can also define a measurement unit, for example, 1 cm or 5 mm, 12 pt or 2". + + + +Convert + If you click forward through the dialog, this butt
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/vcl
include/vcl/layout.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b88053ffeed1f9fb2dda8b3bffe6353d67312e5d
Author: Caolán McNamara
AuthorDate: Fri Aug 17 11:39:05 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 15:21:02 2018 +0200
Resolves: tdf#119325 tooltip position should be relative to widget
Change-Id: I244f2d6cd89fd53d7a874cac593f3759d75966da
Reviewed-on: https://gerrit.libreoffice.org/59257
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 4d9702d04c38..d33a942c8717 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -675,7 +675,7 @@ private:
{
if (rHelpEvent.GetMode() & (HelpEventMode::QUICK |
HelpEventMode::BALLOON))
{
-Point aPos(rHelpEvent.GetMousePosPixel());
+Point aPos(ScreenToOutputPixel(rHelpEvent.GetMousePosPixel()));
tools::Rectangle aHelpArea(aPos.X(), aPos.Y());
OUString sHelpTip = m_aQueryTooltipHdl.Call(aHelpArea);
if (sHelpTip.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/win
include/vcl/outdev.hxx |2 +- vcl/inc/svdata.hxx |2 +- vcl/inc/window.h |2 +- vcl/source/app/svmain.cxx|5 ++--- vcl/source/gdi/print.cxx | 12 +--- vcl/source/gdi/virdev.cxx|7 +++ vcl/source/outdev/font.cxx | 42 -- vcl/source/outdev/outdev.cxx | 11 +-- vcl/source/window/window.cxx |8 vcl/win/gdi/salfont.cxx |2 +- 10 files changed, 39 insertions(+), 54 deletions(-) New commits: commit d9ab7be6c2e4494846081b089710f4dd0b1d2ad3 Author: Caolán McNamara AuthorDate: Sun Aug 19 21:17:52 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 20 15:20:45 2018 +0200 TODO: refcount ImplFontList Change-Id: Ie125f1ac9c14a41e25c3e54beafca2f9e34e4c6f Reviewed-on: https://gerrit.libreoffice.org/59310 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 28dab9a0df9c..ff37b971b344 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -340,7 +340,7 @@ private: GDIMetaFile*mpMetaFile; mutable rtl::Reference mpFontInstance; mutable std::shared_ptr mxFontCache; -mutable PhysicalFontCollection* mpFontCollection; +mutable std::shared_ptr mxFontCollection; mutable std::unique_ptr mpDeviceFontList; mutable std::unique_ptr mpDeviceFontSizeList; std::unique_ptr mpOutDevStateStack; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 7b35a0283e93..52980ec3260b 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -184,7 +184,7 @@ struct ImplSVGDIData VclPtr mpFirstPrinter; // First Printer VclPtr mpLastPrinter; // Last Printer ImplPrnQueueList* mpPrinterQueueList = nullptr; // List of all printer queue -PhysicalFontCollection* mpScreenFontList = nullptr; // Screen-Font-List +std::shared_ptr mxScreenFontList; // Screen-Font-List std::shared_ptr mxScreenFontCache; // Screen-Font-Cache ImplDirectFontSubstitution* mpDirectFontSubst = nullptr; // Font-Substitutions defined in Tools->Options->Fonts GraphicConverter* mpGrfConverter = nullptr; // Converter for graphics diff --git a/vcl/inc/window.h b/vcl/inc/window.h index f1a5f66ef830..21448efd9496 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -128,7 +128,7 @@ struct ImplFrameData VclPtr mpMouseMoveWin; //< last window, where MouseMove() called VclPtr mpMouseDownWin; //< last window, where MouseButtonDown() called std::vector > maOwnerDrawList;//< List of system windows with owner draw decoration -PhysicalFontCollection* mpFontCollection; //< Font-List for this frame +std::shared_ptr mxFontCollection; //< Font-List for this frame std::shared_ptr mxFontCache; //< Font-Cache for this frame sal_Int32 mnDPIX; //< Original Screen Resolution sal_Int32 mnDPIY; //< Original Screen Resolution diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index dcd049cd86b8..a91b5c6686db 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -360,7 +360,7 @@ bool InitVCL() pSVData->maAppData.mpAppFileName = new OUString( aNativeFileName ); // Initialize global data -pSVData->maGDIData.mpScreenFontList = new PhysicalFontCollection; +pSVData->maGDIData.mxScreenFontList.reset(new PhysicalFontCollection); pSVData->maGDIData.mxScreenFontCache.reset(new ImplFontCache); pSVData->maGDIData.mpGrfConverter = new GraphicConverter; @@ -615,8 +615,7 @@ void DeInitVCL() pSVData->maWinData.mpAutoScrollWin = nullptr; pSVData->maWinData.mpLastWheelWindow = nullptr; -delete pSVData->maGDIData.mpScreenFontList; -pSVData->maGDIData.mpScreenFontList = nullptr; +pSVData->maGDIData.mxScreenFontList.reset(); pSVData->maGDIData.mxScreenFontCache.reset(); // Deinit Sal diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 877c85e45315..4f62d062f8a2 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -677,9 +677,9 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) // Init data ImplUpdatePageData(); -mpFontCollection = new PhysicalFontCollection(); +mxFontCollection.reset(new PhysicalFontCollection); mxFontCache.reset(new ImplFontCache); -mpGraphics->GetDevFontList( mpFontCollection ); +mpGraphics->GetDevFontList(mxFontCollection.get()); } void Printer::ImplInitDisplay() @@ -691,7 +691,7 @@ void Printer::ImplInitDisplay() mpJobGraphics = nullptr; mpDisplayDev = VclPtr::Create(); -mpFontCollection = pSVData->maGDIData.mpScreenFontList; +mxFontCollection= pSVData->maGDIData.mxScreenFon
[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/SenderQueue.hpp
wsd/ClientSession.cpp |5 -
wsd/ClientSession.hpp |2 --
wsd/DocumentBroker.cpp |1 -
wsd/SenderQueue.hpp|9 -
4 files changed, 17 deletions(-)
New commits:
commit 7d98b5f01567af9625eaacbf25da671362a27c56
Author: Tamás Zolnai
AuthorDate: Mon Aug 20 15:03:57 2018 +0200
Commit: Tamás Zolnai
CommitDate: Mon Aug 20 15:13:59 2018 +0200
Revert "Get back "Cancel tiles also in wsd's senderqueue""
This reverts commit f1a385be98aba7191de79606d1cfdfa6973dfc39.
It's not easy, it can interfere the tile tracking.
Change-Id: I1e4ec9b4d66e5e912873f673fd5cb71ba55a9332
Reviewed-on: https://gerrit.libreoffice.org/59326
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 3f27a435c..90e099d38 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1001,11 +1001,6 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
return forwardToClient(payload);
}
-void ClientSession::cancelTilesInQueue()
-{
-_senderQueue.cancelTiles();
-}
-
bool ClientSession::forwardToClient(const std::shared_ptr& payload)
{
if (isCloseFrame())
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 4037d81a2..997058f68 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -99,8 +99,6 @@ public:
}
}
-void cancelTilesInQueue();
-
/// Set the save-as socket which is used to send convert-to results.
void setSaveAsSocket(const std::shared_ptr& socket)
{
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index cf5c8eb84..be5c3aae4 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1448,7 +1448,6 @@ void DocumentBroker::cancelTileRequests(const
std::shared_ptr& se
// Clear tile requests
session->clearTilesOnFly();
session->getRequestedTiles() = boost::none;
-session->cancelTilesInQueue();
session->clearTileSubscription();
diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index 927e3e735..fc3464b3f 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -84,15 +84,6 @@ public:
}
}
-void cancelTiles()
-{
-std::remove_if(_queue.begin(), _queue.end(),
-[](const queue_item_t& cur)
-{
-return cur->firstToken() == "tile:";
-});
-}
-
private:
/// Deduplicate messages based on the new one.
/// Returns true if the new message should be
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Product team minutes ....
On 20/08/18 13:29, Michael Meeks wrote: > Present: Apologies; wrong list - and overly terse / not so helpful minutes as normal. Sigh, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/PhysicalFontCollection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fe7805f0fe7924bb0e190207d8ea320353d2810
Author: Caolán McNamara
AuthorDate: Mon Aug 20 12:45:42 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 14:45:25 2018 +0200
FindMetricCompatibleFont can take FontSelectPatternAttributes
Change-Id: I2a42c469d2ab009c5823fc654912fd20c649d2df
Reviewed-on: https://gerrit.libreoffice.org/59323
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/font/PhysicalFontCollection.cxx
b/vcl/source/font/PhysicalFontCollection.cxx
index 7c5745a3a829..8df6104c97f9 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -928,7 +928,7 @@ static const std::map
aMetricCompatibleMap =
{ "Calibri", "Carlito" },
};
-static bool FindMetricCompatibleFont(FontSelectPattern& rFontSelData)
+static bool FindMetricCompatibleFont(FontSelectPatternAttributes& rFontSelData)
{
for (const auto& aSub : aMetricCompatibleMap)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impfontcache.hxx |6 +++---
vcl/source/font/fontcache.cxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 29ff7fbbcc3cdd077458356b06cf7e8120fb4e95
Author: Caolán McNamara
AuthorDate: Mon Aug 20 11:12:36 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 14:40:48 2018 +0200
these just use the base FontSelectPatternAttributes
Change-Id: I0c5ffe571c2cf37ec7d20d4d3ae965227cd72b7e
Reviewed-on: https://gerrit.libreoffice.org/59314
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx
index 6cb05b39d9b3..47314d4ffeaf 100644
--- a/vcl/inc/impfontcache.hxx
+++ b/vcl/inc/impfontcache.hxx
@@ -37,9 +37,9 @@ private:
LogicalFontInstance* mpLastHitCacheEntry; ///< keeps the last hit cache
entry
// cache of recently used font instances
-struct IFSD_Equal { bool operator()( const FontSelectPattern&, const
FontSelectPattern& ) const; };
-struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; };
-typedef std::unordered_map, IFSD_Hash, IFSD_Equal> FontInstanceList;
+struct IFSD_Equal { bool operator()( const FontSelectPatternAttributes&,
const FontSelectPatternAttributes& ) const; };
+struct IFSD_Hash { size_t operator()( const FontSelectPatternAttributes& )
const; };
+typedef std::unordered_map, IFSD_Hash, IFSD_Equal> FontInstanceList;
FontInstanceListmaFontInstanceList;
rtl::Reference GetFontInstance(PhysicalFontCollection
const*, FontSelectPattern&);
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 080521c771c9..5355fb3b97f0 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -26,12 +26,12 @@
#include
#include
-size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD )
const
+size_t ImplFontCache::IFSD_Hash::operator()( const
FontSelectPatternAttributes& rFSD ) const
{
return rFSD.hashCode();
}
-bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const
FontSelectPattern& rB) const
+bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPatternAttributes&
rA, const FontSelectPatternAttributes& rB) const
{
// check normalized font family name
if( rA.maSearchName != rB.maSearchName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/outdev.hxx |2 +-
vcl/inc/svdata.hxx |2 +-
vcl/inc/window.h |4 ++--
vcl/source/app/svmain.cxx|5 ++---
vcl/source/gdi/print.cxx | 13 +
vcl/source/gdi/virdev.cxx|7 +++
vcl/source/outdev/font.cxx | 20 +---
vcl/source/outdev/outdev.cxx | 10 +-
vcl/source/window/window.cxx |6 +++---
9 files changed, 27 insertions(+), 42 deletions(-)
New commits:
commit 7d44fb6d97f629839bb896142ccb4ce0c55db707
Author: Caolán McNamara
AuthorDate: Sun Aug 19 18:21:01 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 20 14:40:05 2018 +0200
TODO: refcount ImplFontCache
Change-Id: Ia4499c2a1515aebaff9edf0e843fc66c7fb1414e
Reviewed-on: https://gerrit.libreoffice.org/59309
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 553baf20e591..28dab9a0df9c 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -339,7 +339,7 @@ private:
mutable VclPtrmpNextGraphics; ///< Next output
device in list
GDIMetaFile*mpMetaFile;
mutable rtl::Reference mpFontInstance;
-mutable ImplFontCache* mpFontCache;
+mutable std::shared_ptr mxFontCache;
mutable PhysicalFontCollection* mpFontCollection;
mutable std::unique_ptr mpDeviceFontList;
mutable std::unique_ptr mpDeviceFontSizeList;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 407f1ceff165..7b35a0283e93 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -185,7 +185,7 @@ struct ImplSVGDIData
VclPtr mpLastPrinter; // Last Printer
ImplPrnQueueList* mpPrinterQueueList = nullptr; // List of all
printer queue
PhysicalFontCollection* mpScreenFontList = nullptr; // Screen-Font-List
-ImplFontCache* mpScreenFontCache = nullptr;//
Screen-Font-Cache
+std::shared_ptr mxScreenFontCache; //
Screen-Font-Cache
ImplDirectFontSubstitution* mpDirectFontSubst = nullptr; //
Font-Substitutions defined in Tools->Options->Fonts
GraphicConverter* mpGrfConverter = nullptr; // Converter for
graphics
longmnAppFontX = 0; // AppFont
X-Numenator for 40/tel Width
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 0e2ee4a7cb6f..f1a5f66ef830 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -127,9 +127,9 @@ struct ImplFrameData
VclPtr mpFocusWin; //< focus window (is also set,
when frame doesn't have the focus)
VclPtr mpMouseMoveWin; //< last window, where
MouseMove() called
VclPtr mpMouseDownWin; //< last window, where
MouseButtonDown() called
-::std::vector > maOwnerDrawList;//< List of system
windows with owner draw decoration
+std::vector > maOwnerDrawList;//< List of system
windows with owner draw decoration
PhysicalFontCollection* mpFontCollection; //< Font-List for this frame
-ImplFontCache* mpFontCache;//< Font-Cache for this frame
+std::shared_ptr mxFontCache; //< Font-Cache for this frame
sal_Int32 mnDPIX; //< Original Screen Resolution
sal_Int32 mnDPIY; //< Original Screen Resolution
ImplSVEvent * mnFocusId; //< FocusId for PostUserLink
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 432d6335db54..dcd049cd86b8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -361,7 +361,7 @@ bool InitVCL()
// Initialize global data
pSVData->maGDIData.mpScreenFontList = new PhysicalFontCollection;
-pSVData->maGDIData.mpScreenFontCache= new ImplFontCache;
+pSVData->maGDIData.mxScreenFontCache.reset(new ImplFontCache);
pSVData->maGDIData.mpGrfConverter = new GraphicConverter;
g_bIsLeanException = getenv("LO_LEAN_EXCEPTION") != nullptr;
@@ -617,8 +617,7 @@ void DeInitVCL()
delete pSVData->maGDIData.mpScreenFontList;
pSVData->maGDIData.mpScreenFontList = nullptr;
-delete pSVData->maGDIData.mpScreenFontCache;
-pSVData->maGDIData.mpScreenFontCache = nullptr;
+pSVData->maGDIData.mxScreenFontCache.reset();
// Deinit Sal
if (pSVData->mpDefInst)
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b11b453395c8..877c85e45315 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -678,7 +678,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
// Init data
ImplUpdatePageData();
mpFontCollection = new PhysicalFontCollection();
-mpFontCache = new ImplFontCache();
+mxFontCache.reset(new ImplFontCache);
mpGraphics->GetDevFontList( mpFontCollection );
}
@@ -692,7 +692,7 @@ void Printer::ImplInitDisplay()
mpDisplayDev = VclPtr::Create();
mpF
Product team minutes ....
Present: • Henry, Tamas Z, Tor, Michael, Ash, Henry, Tomas V, Marco, Andras Releasing • Dell ◦ branch (distro/collabora/cd-5.3-3.2, distro/collabora/collabora-online-cd-3.2) ◦ Working on a 3.4 build … ◦ Patches on gerrit for dell-3.2 branch – but need to include these too … ◦ Adding tile-cache disabling – pain with automated tests. ◦ Fix remaining anonymization issues. ◦ Join the Dell call later (Ash) ◦ Status (Timar) ▪ pushed the core branch already distro/collabora/cd-5.3-3.4 ▪ will create the online branch from the top of collabora-online-3 • the work is already in there (Timar) • AMX ◦ Ash: WP6 - Routing of the Impress sidebars to Online ▪ Main side-bars are fully visible, functional, interactive • with child windows & drop-downs etc. ▪ Known issues: • entering text from the K/B – is busted in some way: ◦ need to get focus & events • Fixing flicker on invalidations … • Dialogs disappearing. • Extend side-bar downwards with a grey background. • Side-bar can’t be re-sized currently. • Add side-bar options / tabs to the code. ◦ Henry: WP5.3 – Mobile UX ▪ Trying to finish copy/paste on mobile • Finally found a solution – a focus problem. • Can call the function to copy-text • Example works – how to show this to the user … ◦ cannot use the toolbar that appears on-top. ◦ Have to select an element – don’t use that in Collabora online ◦ question: ▪ how to do this (?) ▪ show a popup with two buttons: copy/paste – for clip event. • Or show in the status bar – copy & paste … ◦ status bar is ~pointless - lets show a popup instead (Michael) ▪ Need to look at scrolling pieces for Mobile. ▪ Anything for the 3.4 / Dell branch from last week ? • No – all done. ◦ Kendy: ▪ WP8 – Help • All of the JS help backported to cp-6.0 • We have an own help instance: https://help.collaboraoffice.com • Given some bits to Aaron but he’s on vacation soon too. ◦ Marco: WP5 - HiDPI in Calc and in dialogs ▪ Fixing problems with position caching • invalidation rectangles are wrong in some cases. • found a solution – but still problems ◦ invalidation messages sent to all views. ◦ Need them to go to views with the same zoom factor. ◦ Adding more parameters to tile invalidation callback. ◦ to grok zoom factor for these rectangles. ▪ to use / discard depending on need. ▪ Tiles joining nicely at all zoom levels ▪ Still todo: • Not started working on dialogs … • Charts, images are getting mis-placed. • Cursor position – mis-placed ... • Working on any zoom level – generic work here … • FormulaDialog bits ▪ by next week: • expect to fix invalidation problem; polish existing fixes. • Fix cursor bits, start on mis-placed images. ◦ Tamas Z.: Latency improvements [not AMX specific] ▪ Still testing latency changes in the team meetings ▪ Pushed one commit last week, fixing one bug. • Doing page-down & page-up, sometimes 1-2 tiles are not sent. • One user doing page-down & up – somewhere, 2 users have the same view – some tiles not updated; just grey tiles. • Works fine for just 1 user … • Tested it today too – still see a problem. ▪ Handling the non-interactive users • TCP_NODELAY has only a small effect. • Interactive user detection – later can use something more effective. • Will push this. ▪ Next: • Two AMX bugs next: flickering opening a doc. ◦ Tomaz V.: WP3 - Widget theming ▪ continued to add new widgets and drawing them. ▪ Now added check-box and a combo-box. ▪ Working now on a radio-button. ▪ Finished with the scrollbar & spin-box. ▪ Demo … [!?] … great to have a screenshot. ▪ Trying to follow mockups from the AMX design team. ▪ Doing basic drawing initially. ▪ Next: • Push changes internally ... • Screenshot of the latest work. • Need CSS for browser-side matched theming. ◦ Tor: WP1 - Thumbnailing API ▪
Looking for reviewer
Hi all, I'm looking for a reviewer for https://gerrit.libreoffice.org/#/c/59269/ It is about reading/writing attributes draw:display and draw:protect for element in Draw and Impress. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fbde4ecf18a75730f45d1f6c4bc0dc3f5111c6b2 Author: Andras Timar AuthorDate: Mon Aug 20 14:01:00 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Aug 20 14:01:31 2018 +0200 Update git submodules * Update helpcontent2 from branch 'distro/collabora/cp-6.0' - [cp] Collabora purple in css Change-Id: I6295a5d7e83731f7ccf3ca3e0f85ca6778dbe224 diff --git a/helpcontent2 b/helpcontent2 index e305269e65b6..cef6bdec37d8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e305269e65b66d90c70ddbc558e3495b2691874e +Subproject commit cef6bdec37d8001d8f8c2c0f30c3a44500e38ec6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.0' - help3xsl/default.css
help3xsl/default.css | 40
1 file changed, 20 insertions(+), 20 deletions(-)
New commits:
commit cef6bdec37d8001d8f8c2c0f30c3a44500e38ec6
Author: Andras Timar
AuthorDate: Mon Aug 20 14:01:00 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 14:01:00 2018 +0200
[cp] Collabora purple in css
Change-Id: I6295a5d7e83731f7ccf3ca3e0f85ca6778dbe224
diff --git a/help3xsl/default.css b/help3xsl/default.css
index ea3e2aff8..bf5b3610b 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -191,7 +191,7 @@ table, th, td {
margin-top: 0px;
}
.tableheadcell {
-background: #148603;
+background: #5c3de2;
color: white;
vertical-align:top;
}
@@ -203,7 +203,7 @@ h4,
h5,
h6 {
margin-bottom: 0.67rem;
-color: #148603;
+color: #5c3de2;
}
p,
ol,
@@ -214,7 +214,7 @@ td {
h1 {
font-size: 1.83rem;
font-weight: 300;
-border-bottom: 2px solid #148603;
+border-bottom: 2px solid #5c3de2;
padding-bottom: 6px;
}
h1 a {
@@ -244,7 +244,7 @@ h6 {
}
.howtoget {
background: #CCF4C6;
-border-left: 4px solid #148603;
+border-left: 4px solid #5c3de2;
border-radius: 0 4px 4px 0;
box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
padding: 0.3em;
@@ -330,7 +330,7 @@ h6 {
font-size: 1rem;
font-weight: bold;
padding: 1px;
-border: solid 1px #148603;
+border: solid 1px #5c3de2;
}
#DisplayArea {
overflow: auto;
@@ -418,7 +418,7 @@ header {
white-space: nowrap;
}
footer {
-border-top: 2px solid #148603;
+border-top: 2px solid #5c3de2;
background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0)
100%);
padding: 15px 10px 0 10px;
margin: 25px 0 0 0;
@@ -437,7 +437,7 @@ footer p {
opacity: 0;
}
label[for=accordion-1] {
-color: #148603;
+color: #5c3de2;
display: block;
padding: 10px 0 10px 20px;
font-size: 22px;
@@ -458,7 +458,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
}
.index-label {
font-size: 22px;
-color: #148603;
+color: #5c3de2;
padding-left: 20px;
margin: 20px 0 0 0;
}
@@ -478,70 +478,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
#Bookmarks p {
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#WRITER::before {
content: "WRITER";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#CALC::before {
content: "CALC";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#IMPRESS::before {
content: "IMPRESS";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#DRAW::before {
content: "DRAW";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#BASE::before {
content: "BASE";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#MATH::before {
content: "MATH";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#CHART::before {
content: "CHART";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#BASIC::before {
content: "BASIC";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
#SHARED::before {
content: "GLOBAL";
display: block;
font-size: 22px;
font-weight: bold;
-color: #148603;
+color: #5c3de2;
}
.pagination {
padding: 0;
@@ -679,7 +679,7 @@ li.disabled a {
}
.contents-treeview label:before {
content: "⊞";
-color: #148603;
+color: #5c3de2;
width: 16px;
margin: 0 5px 0 0;
display: inline-block;
@@ -755,7 +755,7 @@ li.disabled a {
background-color: #F4F7F7;
border-right: 1px solid rgba(0,0,0,0.04);
float: left;
-width: 320px;
+width: 320px;
}
.leftside {
grid-area: leftside;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source
oox/source/drawingml/shape.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit eb20fd85ddd25026a1b814d75fac6b5aa4ec0ef7 Author: Caolán McNamara AuthorDate: Sun Aug 5 10:33:02 2018 +0100 Commit: Andras Timar CommitDate: Mon Aug 20 13:49:41 2018 +0200 coverity#1438224 Dereference null return value Change-Id: I794c54867b83d738a075f9fa0dbd31fe62de49b9 Reviewed-on: https://gerrit.libreoffice.org/58610 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit e5c3b913cc5b656710677e3597079e0cd5040f82) Reviewed-on: https://gerrit.libreoffice.org/58842 Reviewed-by: Andras Timar diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 5483dcc06ff1..984b159e3dfa 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -521,6 +521,7 @@ static inline void lcl_createPresetShape( uno::Reference& xShap eAdjust = pParagraph->getProperties().getParaAdjust().get(); xSet->setPropertyValue( "ParaAdjust", uno::makeAny( eAdjust ) ); SvxShape* pShape = SvxShape::getImplementation( xShape ); +assert(pShape); SdrTextHorzAdjust eHorzAdjust = lcl_convertAdjust( eAdjust ); pShape->GetSdrObject()->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source
oox/source/export/shapes.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d6dda0acb8bb6ca0fba607e1d566fca960b78cf8
Author: Szymon Kłos
AuthorDate: Fri Aug 10 11:46:59 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 13:49:11 2018 +0200
tdf#119160 remove fill from all fontwork shapes
Change-Id: I66cd5ab39c3f3b8635eb4e9b5261e100a8037abf
Reviewed-on: https://gerrit.libreoffice.org/58817
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/58843
Reviewed-by: Andras Timar
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8c4b2daaaff0..1e134babf2c7 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1011,7 +1011,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
if( rXPropSet.is() )
{
// Preset shape with text has no fill
-if( sShapeType.isEmpty() || !sShapeType.startsWith( "fontwork" ) )
+if( m_presetWarp.isEmpty() || !m_presetWarp.startsWith( "text" ) ||
m_presetWarp == "textNoShape" )
WriteFill( rXPropSet );
WriteOutline( rXPropSet );
WriteShapeEffects( rXPropSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/source filter/source include/svtools include/svx include/vcl sfx2/source starmath/inc starmath/source svtools/source svx/source sw/sourc
cui/source/dialogs/insdlg.cxx | 28 +++---
cui/source/options/optlingu.cxx|6 -
cui/source/tabpages/transfrm.cxx | 10 +-
dbaccess/source/ui/uno/composerdialogs.cxx |2
dbaccess/source/ui/uno/unoDirectSql.cxx|2
dbaccess/source/ui/uno/unosqlmessage.cxx |4
filter/source/pdf/pdfdialog.cxx|4
include/svtools/genericunodialog.hxx |4
include/svtools/inettbc.hxx|2
include/svtools/valueset.hxx |2
include/svx/SvxColorValueSet.hxx |2
include/svx/charmap.hxx|2
include/svx/colorbox.hxx |2
include/svx/frmdirlbox.hxx |4
include/svx/hexcolorcontrol.hxx|2
include/svx/langbox.hxx|2
include/svx/pagenumberlistbox.hxx |2
include/svx/papersizelistbox.hxx |2
include/svx/relfld.hxx |2
include/svx/searchcharmap.hxx |2
include/svx/txencbox.hxx |2
include/vcl/weld.hxx | 101 ++-
sfx2/source/dialog/tabdlg.cxx |6 -
starmath/inc/dialog.hxx|2
starmath/inc/utility.hxx |2
starmath/source/dialog.cxx |6 -
starmath/source/utility.cxx|4
svtools/source/control/inettbc.cxx |4
svtools/source/control/valueset.cxx|4
svtools/source/dialogs/restartdialog.cxx | 22 ++---
svx/source/dialog/charmap.cxx |4
svx/source/dialog/compressgraphicdialog.cxx| 34 +++
svx/source/dialog/hdft.cxx |8 -
svx/source/dialog/hexcolorcontrol.cxx |4
svx/source/dialog/langbox.cxx |4
svx/source/dialog/pagenumberlistbox.cxx|4
svx/source/dialog/papersizelistbox.cxx |4
svx/source/dialog/relfld.cxx |4
svx/source/dialog/searchcharmap.cxx|4
svx/source/dialog/txencbox.cxx |4
svx/source/tbxctrls/SvxColorValueSet.cxx |4
svx/source/tbxctrls/tbcontrl.cxx |4
sw/source/ui/envelp/envprt.cxx | 24 ++---
sw/source/ui/index/swuiidxmrk.cxx |6 -
sw/source/ui/table/tabledlg.cxx| 12 +-
sw/source/uibase/inc/numberingtypelistbox.hxx |2
sw/source/uibase/inc/prcntfld.hxx |2
sw/source/uibase/misc/numberingtypelistbox.cxx |4
sw/source/uibase/utlui/prcntfld.cxx|4
vcl/source/app/salvtables.cxx | 108 -
vcl/unx/gtk3/gtk3gtkinst.cxx | 104
51 files changed, 306 insertions(+), 281 deletions(-)
New commits:
commit ae1139f5b8474bd3056ddc1e25173dc0882b944a
Author: Noel Grandin
AuthorDate: Sun Aug 19 12:47:17 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Aug 20 08:19:55 2018 +0200
loplugin:useuniqueptr in svt::Dialog
Change-Id: Ib13cd74f186de0db1be4414e893b2d4f66048b44
Reviewed-on: https://gerrit.libreoffice.org/59304
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx
b/dbaccess/source/ui/uno/composerdialogs.cxx
index 20cc13839470..48d3ce5a6a79 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -119,7 +119,7 @@ namespace dbaui
if ( !xConnection.is() || !xColumns.is() || !m_xComposer.is() )
{
// can't create the dialog if I have improper settings
-return svt::OGenericUnoDialog::Dialog(nullptr);
+return svt::OGenericUnoDialog::Dialog();
}
return svt::OGenericUnoDialog::Dialog(createComposerDialog(_pParent,
xConnection, xColumns));
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx
b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 0ad0fce4166d..eb9b92f9159b 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -97,7 +97,7 @@ namespace dbaui
if (!xConnection.is())
{
// can't create the dialog if I have improper settings
-return svt::OGenericUnoDialog::Dialog(nullptr);
+return svt::OGenericUnoDialog::Dialog();
}
return
svt::OGenericUnoDialog::Dialog(VclPtr::Create(_pParent,
xConnection));
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx
b/dbaccess/source/ui/uno/unosqlmessage.cxx
index c5b849bdd241..b7d0a5ce4fe0 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -148,10 +148,10 @@ svt::OGenericUnoDialog::Dialog
OSQLMessageDialog::createDialog(vcl
[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/cd-5.3-3.4'
New branch 'distro/collabora/cd-5.3-3.4' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'distro/collabora/cd-5.3-3.4'
New branch 'distro/collabora/cd-5.3-3.4' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'distro/collabora/cd-5.3-3.4'
New branch 'distro/collabora/cd-5.3-3.4' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sw/source
oox/source/vml/vmlformatting.cxx |2 +-
sw/source/core/edit/edfcol.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 67ac2e8adc708480aa4e28a81cec464938e43c86
Author: Szymon Kłos
AuthorDate: Thu Aug 16 14:32:19 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Aug 20 12:22:57 2018 +0200
tdf#118385 Avoid crash on loading document
Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9
Reviewed-on: https://gerrit.libreoffice.org/59173
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
(cherry picked from commit 308fbd8cdf9ce0fc3921b6c4c58707609b486fb9)
Reviewed-on: https://gerrit.libreoffice.org/59247
Reviewed-by: Michael Stahl
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 17a730a2f8d8..c015157fdd8a 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -960,7 +960,7 @@ void TextpathModel::pushToPropMap(ShapePropertyMap&
rPropMap, const uno::Referen
if (!moTrim.has() || !moTrim.get())
{
OUString sText = moString.get();
-VclPtr pDevice = VclPtr::Create();
+ScopedVclPtrInstance pDevice;
vcl::Font aFont = pDevice->GetFont();
aFont.SetFamilyName(sFont);
aFont.SetFontSize(Size(0, 96));
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index a9e7d1d05ad1..6486de18a102 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1483,7 +1483,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem&
rWatermark,
// Calc the ratio.
double fRatio = 0;
-VclPtr pDevice = VclPtr::Create();
+ScopedVclPtrInstance pDevice;
vcl::Font aFont = pDevice->GetFont();
aFont.SetFamilyName(sFont);
aFont.SetFontSize(Size(0, 96));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - configure.ac
configure.ac |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit db5a57308ba8d0a9be903c04ab05bd7df74c3d1a
Author: Tor Lillqvist
AuthorDate: Thu Jun 7 21:16:19 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Aug 20 13:15:00 2018 +0300
Look for libpng16, too, and link with -lz (in case static build)
diff --git a/configure.ac b/configure.ac
index c5c5200d0..f7b94f9b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,9 +283,10 @@ AS_IF([test `uname -s` != Darwin],
[AC_MSG_ERROR([dlopen not found])])])
AC_SEARCH_LIBS([png_create_write_struct],
- [png],
+ [png png16],
[],
- [AC_MSG_ERROR([libpng not available?])])
+ [AC_MSG_ERROR([libpng not available?])],
+ [-lz])
AS_IF([test `uname -s` = Linux],
[AC_SEARCH_LIBS([cap_get_proc],
commit 574f769317dfb09f86a1b145eb2209969c5f2232
Author: Tor Lillqvist
AuthorDate: Thu Jun 7 19:59:34 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Aug 20 13:15:00 2018 +0300
Hopefully just 'readlink' (without the -f option) is enough
diff --git a/configure.ac b/configure.ac
index 421fdd686..c5c5200d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,7 @@ else
AC_MSG_ERROR(no)
fi
-with_lokit_path=`readlink -f $with_lokit_path`
+with_lokit_path=`readlink $with_lokit_path`
AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
lokit_msg="$with_lokit_path"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/filter/ww8/ww8scan.cxx | 39 +--
sw/source/filter/ww8/ww8scan.hxx |2 +-
2 files changed, 14 insertions(+), 27 deletions(-)
New commits:
commit 121ebbf097045c0dbb3eb8cb2b0cf2ffc1c4cd09
Author: Caolán McNamara
AuthorDate: Wed Aug 15 17:28:41 2018 +0100
Commit: Michael Stahl
CommitDate: Mon Aug 20 12:14:27 2018 +0200
ofz#9917 use a WW8SprmIter to find the sprm
extend WW8SprmIter to support the needed paramater match feature and
drop the custom WW8PLCFx_SEPX::HasSprm logic
Change-Id: I5893e04402ed03493add398f0939a578807561ef
Reviewed-on: https://gerrit.libreoffice.org/59119
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a7e91b17aadd..16cc14b4132d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -916,7 +916,7 @@ void WW8SprmIter::UpdateMyMembers()
}
}
-SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId)
+SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch)
{
while (GetSprms())
{
@@ -924,7 +924,13 @@ SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId)
{
sal_uInt16 nFixedLen = mrSprmParser.DistanceToData(nId);
sal_uInt16 nL = mrSprmParser.GetSprmSize(nId, GetSprms(),
GetRemLen());
-return SprmResult(GetCurrentParams(), nL - nFixedLen); // SPRM
found!
+SprmResult aRet(GetCurrentParams(), nL - nFixedLen); // SPRM found!
+// typically pNextByteMatch is nullptr and we just return the
first match
+if (!pNextByteMatch)
+return aRet;
+// very occasionally we want one with a specific following byte
+if (aRet.nRemainingData >= 1 && *aRet.pSprm == *pNextByteMatch)
+return aRet;
}
advance();
}
@@ -3834,32 +3840,13 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16
nId1,sal_uInt16 nId2,sal_uInt16 nId3,s
SprmResult WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const
{
-if (!pPLCF)
-return SprmResult();
-
-sal_uInt8* pSp = pSprms.get();
-size_t i = 0;
-while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
+SprmResult aRet;
+if (pPLCF)
{
-// Sprm found?
-const sal_uInt16 nCurrentId = maSprmParser.GetSprmId(pSp);
-const sal_uInt16 x = maSprmParser.GetSprmSize(nCurrentId, pSp,
nSprmSiz - i);
-if (nCurrentId == nId)
-{
-sal_uInt16 nFixedLen = maSprmParser.DistanceToData(nId);
-const sal_uInt8 *pRet = pSp + nFixedLen;
-SprmResult aRet(pRet, x - nFixedLen);
-if (aRet.nRemainingData >= 1 && *aRet.pSprm == n2nd)
-{
-return aRet;
-}
-}
-// increment pointer so that it points to next SPRM
-i += x;
-pSp += x;
+WW8SprmIter aIter(pSprms.get(), nSprmSiz, maSprmParser);
+aRet = aIter.FindSprm(nId, &n2nd);
}
-
-return SprmResult(); // Sprm not found
+return aRet;
}
WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, const WW8Fib& rFib,
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 69ff529233a2..e3331305e5a2 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -282,7 +282,7 @@ public:
explicit WW8SprmIter(const sal_uInt8* pSprms_, sal_Int32 nLen_,
const wwSprmParser &rSprmParser);
void SetSprms(const sal_uInt8* pSprms_, sal_Int32 nLen_);
-SprmResult FindSprm(sal_uInt16 nId);
+SprmResult FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch = nullptr);
void advance();
const sal_uInt8* GetSprms() const
{ return ( pSprms && (0 < nRemLen) ) ? pSprms : nullptr; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/core/layout/trvlfrm.cxx |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 81818670fe90fca438dfb0c22903474745112cfe Author: Caolán McNamara AuthorDate: Thu Aug 16 14:24:46 2018 +0100 Commit: Michael Stahl CommitDate: Mon Aug 20 11:58:19 2018 +0200 tdf#119224 start and end are expected to exist for the scope of this function Change-Id: I771bce68a2ac923af6a7d54646a2c59ce6f10f7e Reviewed-on: https://gerrit.libreoffice.org/59179 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 22273e0173e6..14887a9e274f 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2040,13 +2040,15 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) //First obtain the ContentFrames for the start and the end - those are needed //anyway. -SwContentFrame const* pStartFrame = pStartPos->nNode.GetNode(). +SwContentFrame* pStartFrame = pStartPos->nNode.GetNode(). GetContentNode()->getLayoutFrame( this, &rCursor.GetSttPos(), pStartPos ); -SwContentFrame const* pEndFrame = pEndPos->nNode.GetNode(). +SwContentFrame* pEndFrame = pEndPos->nNode.GetNode(). GetContentNode()->getLayoutFrame( this, &rCursor.GetEndPos(), pEndPos ); -OSL_ENSURE( (pStartFrame && pEndFrame), "No ContentFrames found." ); +assert(pStartFrame && pEndFrame && "No ContentFrames found."); +//tdf#119224 start and end are expected to exist for the scope of this function +SwFrameDeleteGuard aStartFrameGuard(pStartFrame), aEndFrameGuard(pEndFrame); //Do not subtract the FlyFrames in which selected Frames lie. SwSortedObjs aSortObjs; ___ 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' - loleaflet/src
loleaflet/src/core/Socket.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 259db2527721caa4df8d6084e902136493e4e7dc
Author: Andras Timar
AuthorDate: Mon Aug 20 11:29:08 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 11:29:08 2018 +0200
leaflet: enable l10n of IE11 connection limit message
Change-Id: I4799c448fd7c843a5cae5eef2eac0bb096f1395f
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 27095b9ad..cc7f94257 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -39,12 +39,12 @@ L.Socket = L.Class.extend({
}
this.socket = new WebSocket(websocketURI);
} catch (e) {
- // On IE 11 there is a limiation on the number of
WebSockets open to a single domain (6 by default and can go to 128).
+ // On IE 11 there is a limitation on the number of
WebSockets open to a single domain (6 by default and can go to 128).
// Detect this and hint the user.
var msgHint = '';
var isIE11 = !!window.MSInputMethodContext &&
!!document.documentMode; //
https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
if (isIE11)
- msgHint = 'IE11 has reached its maximum number
of connections. Please see this document to increase this limit if needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+ msgHint = _('IE11 has reached its maximum
number of connections. Please see this document to increase this limit if
needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections');
this._map.fire('error', {msg: _('Oops, there is a
problem connecting to LibreOffice Online : ').replace('LibreOffice Online',
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice
Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
___
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-6.0' - oox/source svx/source
oox/source/drawingml/shape.cxx |8
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 11 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit bc294ef0a06c54cf8bbd4955123b8023f9cbc1cb
Author: Szymon Kłos
AuthorDate: Tue Aug 14 13:22:33 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 09:53:18 2018 +0200
tdf#116350 Better text layout for big shapes
Added some horizontal padding - for bigger shapes
and vertical adjustment for multi-line labels.
Change-Id: I665b238b0d08a499cd846952d831fe449f72f575
Reviewed-on: https://gerrit.libreoffice.org/58975
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/59161
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 320f4a5c1287..1d73cdaa38f6 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -525,6 +525,14 @@ static inline void lcl_createPresetShape(
uno::Reference& xShap
}
}
+// Apply vertical adjustment for text on arc
+SvxShape* pShape = SvxShape::getImplementation(xShape);
+assert(pShape);
+if (rClass == "fontwork-arch-up-curve")
+pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem(
SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ) );
+else if (rClass == "fontwork-arch-down-curve")
+pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem(
SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ) );
+
// Apply preset shape
xDefaulter->createCustomShapeDefaults( rClass );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 6d618a7f669d..f34babb4d2d0 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -245,6 +245,10 @@ void CalculateHorizontalScalingFactor( const SdrObject*
pCustomShape,
if (nFontSize > 1)
rFWData.fVerticalTextScaling = static_cast(nFontSize) /
rFontHeight.GetHeight();
+// Add some padding
+if (rFWData.bScaleX)
+fScalingFactor *= 1.1;
+
rFWData.fHorizontalTextScaling = fScalingFactor;
}
@@ -513,11 +517,16 @@ bool GetFontWorkOutline(FWData& rFWData, const SdrObject*
pCustomShape)
}
else if (rFWData.bScaleX)
{
+const SdrTextVertAdjust nVertJustify =
pCustomShape->GetMergedItem( SDRATTR_TEXT_VERTADJUST ).GetValue();
+double fFactor = nVertJustify ==
SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ? -0.5 : ( nVertJustify ==
SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ? 0.5 : 0 );
+
std::vector< FWParagraphData >::iterator aParagraphIter(
aTextAreaIter->vParagraphs.begin() );
std::vector< FWParagraphData >::const_iterator aParagraphIEnd(
aTextAreaIter->vParagraphs.end() );
while ( aParagraphIter != aParagraphIEnd )
{
sal_Int32 nHorzDiff = 0;
+sal_Int32 nVertDiff = static_cast(
rFWData.nSingleLineHeight ) * fFactor * ( aTextAreaIter->vParagraphs.size() - 1
);
+
if ( eHorzAdjust == SDRTEXTHORZADJUST_CENTER )
nHorzDiff = ( rFWData.fHorizontalTextScaling *
aTextAreaIter->aBoundRect.GetWidth() - aParagraphIter->aBoundRect.GetWidth() )
/ 2;
else if ( eHorzAdjust == SDRTEXTHORZADJUST_RIGHT )
@@ -533,7 +542,7 @@ bool GetFontWorkOutline(FWData& rFWData, const SdrObject*
pCustomShape)
std::vector< tools::PolyPolygon >::const_iterator
aOutlineIEnd = aCharacterIter->vOutlines.end();
while( aOutlineIter != aOutlineIEnd )
{
-aOutlineIter->Move( nHorzDiff, 0 );
+aOutlineIter->Move( nHorzDiff, nVertDiff );
++aOutlineIter;
}
++aCharacterIter;
___
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-6.0' - oox/source sw/source
oox/source/vml/vmlformatting.cxx |2 +-
sw/source/core/edit/edfcol.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 343f0a37534a4c1c92d11ea548ed18d524cbc2cf
Author: Szymon Kłos
AuthorDate: Thu Aug 16 14:32:19 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 09:53:45 2018 +0200
tdf#118385 Avoid crash on loading document
Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9
Reviewed-on: https://gerrit.libreoffice.org/59173
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/59250
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 5861ed88bbe3..5bc4a8b238b9 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -961,7 +961,7 @@ void TextpathModel::pushToPropMap(ShapePropertyMap&
rPropMap, const uno::Referen
{
OUString sText = moString.get();
double fRatio = 0;
-VclPtr pDevice = VclPtr::Create();
+ScopedVclPtrInstance pDevice;
vcl::Font aFont = pDevice->GetFont();
aFont.SetFamilyName(sFont);
aFont.SetFontSize(Size(0, 96));
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 1ec98d87bb0f..bf12303ba2c7 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1481,7 +1481,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem&
rWatermark,
// Calc the ratio.
double fRatio = 0;
-VclPtr pDevice = VclPtr::Create();
+ScopedVclPtrInstance pDevice;
vcl::Font aFont = pDevice->GetFont();
aFont.SetFamilyName(sFont);
aFont.SetFontSize(Size(0, 96));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.4' - 34 commits - chart2/source configmgr/source connectivity/source desktop/CppunitTest_desktop_lokinit.mk desktop/inc desktop/Module
chart2/source/controller/main/ChartController_Window.cxx | 14 chart2/source/tools/ResourceManager.cxx | 13 configmgr/source/winreg.cxx | 17 connectivity/source/commontools/DateConversion.cxx |2 desktop/CppunitTest_desktop_lokinit.mk | 49 ++ desktop/Module_desktop.mk|1 desktop/inc/lib/init.hxx |6 desktop/qa/unit/desktop-lok-init.cxx | 140 +++ desktop/source/lib/init.cxx | 85 download.lst |6 editeng/qa/unit/core-test.cxx|2 editeng/source/editeng/impedit3.cxx | 11 extensions/Library_ldapbe2.mk|1 extensions/source/config/ldap/ldapuserprofilebe.cxx | 41 +- external/curl/CVE-2017-8816.patch| 67 --- external/curl/CVE-2018-105.patch | 36 - external/curl/CVE-2018-107.patch | 110 - external/curl/ExternalPackage_curl.mk|8 external/curl/ExternalProject_curl.mk| 48 +- external/curl/UnpackedTarball_curl.mk| 17 external/curl/clang-cl.patch.0 | 11 external/curl/curl-7.26.0_mingw.patch| 24 - external/curl/curl-7.26.0_win-proxy.patch| 49 +- external/curl/curl-msvc-disable-protocols.patch.1| 11 external/curl/curl-msvc-schannel.patch.1 | 22 - external/curl/curl-msvc.patch.1 | 48 +- external/curl/curl-osx.patch.1 | 285 --- external/curl/curl-xp.patch.1| 12 external/curl/zlib.patch.0 | 100 + external/python3/ExternalPackage_python3.mk |1 include/sfx2/shell.hxx |8 include/tools/fileutil.hxx | 27 + include/vcl/ppdparser.hxx|2 sc/CppunitTest_sc_tiledrendering.mk |2 sc/inc/colorscale.hxx|6 sc/inc/scabstdlg.hxx |3 sc/qa/unit/screenshots/screenshots.cxx |2 sc/qa/unit/tiledrendering/tiledrendering.cxx | 43 ++ sc/sdi/scalc.sdi |2 sc/source/core/data/colorscale.cxx |4 sc/source/ui/app/scmod.cxx | 32 - sc/source/ui/attrdlg/scdlgfact.cxx |5 sc/source/ui/attrdlg/scdlgfact.hxx |3 sc/source/ui/formdlg/formula.cxx |6 sc/source/ui/inc/anyrefdg.hxx|4 sc/source/ui/miscdlgs/anyrefdg.cxx | 32 - sc/source/ui/unoobj/filtuno.cxx |2 sc/source/ui/view/cellsh1.cxx| 92 +++- sc/source/ui/view/cellsh2.cxx|2 sc/source/ui/view/viewfun5.cxx | 87 ++-- scripting/examples/python/NamedRanges.py |2 sd/qa/unit/data/ppt/tdf116899.ppt|binary sd/qa/unit/import-tests.cxx | 25 + sd/source/filter/ppt/pptinanimations.cxx | 15 sfx2/source/control/dispatch.cxx | 18 sfx2/source/control/shell.cxx| 15 sfx2/source/dialog/dinfdlg.cxx | 14 sfx2/source/doc/docfile.cxx | 14 sw/CppunitTest_sw_uiwriter.mk|1 sw/inc/swtypes.hxx |8 sw/inc/view.hxx |2 sw/qa/extras/ooxmlexport/data/tdf116976.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|7 sw/qa/extras/rtfimport/data/tdf117246.rtf| 11 sw/qa/extras/rtfimport/rtfimport.cxx |6 sw/qa/extras/uiwriter/data2/tdf101534.fodt | 28 + sw/qa/extras/uiwriter/uiwriter2.cxx | 60 +++ sw/source/core/doc/DocumentContentOperationsManager.cxx |4 sw/source/core/doc/DocumentStylePoolManager.cxx |8 sw/source/core/doc/SwStyleNameMapper.cxx |4 sw/source/core/doc/doclay.cxx|8 sw/source/core/docnode/ndsect.cxx|2 sw/source/core/docnode/ndtbl.cxx |2 sw/source/core/tox/tox.cxx | 33 - sw/source/ui/dialog/swdialmgr.cxx
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e16f22b75f84695c58d6612be27364cc5814f51f
Author: Caolán McNamara
AuthorDate: Mon Aug 13 17:22:43 2018 +0100
Commit: Michael Stahl
CommitDate: Mon Aug 20 12:17:48 2018 +0200
ofz: Null-deference
Change-Id: I339cfb54379b1c98a04747046ed599a23d49c220
Reviewed-on: https://gerrit.libreoffice.org/58950
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index c529c255beb1..a5b31b1b4ebe 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1665,8 +1665,13 @@ namespace emfplushelper
SAL_INFO("drawinglayer", "EMF+ SetClipPath combine
mode: " << combineMode);
SAL_INFO("drawinglayer", "EMF+\tpath in slot: " <<
(flags & 0xff));
-EMFPPath& path =
*static_cast(maEMFPObjects[flags & 0xff].get());
-::basegfx::B2DPolyPolygon&
clipPoly(path.GetPolygon(*this));
+EMFPPath *path =
static_cast(maEMFPObjects[flags & 0xff].get());
+if (!path)
+{
+break;
+}
+
+::basegfx::B2DPolyPolygon&
clipPoly(path->GetPolygon(*this));
// clipPoly.transform(rState.mapModeTransform);
HandleNewClipRegion(
combineClip(mrPropertyHolders.Current().getClipPolyPolygon(), combineMode,
clipPoly), mrTargetHolders, mrPropertyHolders);
@@ -1678,6 +1683,10 @@ namespace emfplushelper
SAL_INFO("drawinglayer", "EMF+ SetClipRegion");
SAL_INFO("drawinglayer", "EMF+\tregion in slot: " <<
(flags & 0xff) << " combine mode: " << combineMode);
EMFPRegion *region =
static_cast(maEMFPObjects[flags & 0xff].get());
+if (!region)
+{
+break;
+}
HandleNewClipRegion(combineClip(mrPropertyHolders.Current().getClipPolyPolygon(),
combineMode, region->regionPolyPolygon), mrTargetHolders, mrPropertyHolders);
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source vcl/win
sw/inc/IDocumentTimerAccess.hxx | 40 ++-
sw/source/core/doc/DocumentTimerManager.cxx | 24
sw/source/core/inc/DocumentTimerManager.hxx |2 -
sw/source/core/inc/docfld.hxx |2 -
sw/source/core/inc/rootfrm.hxx |4 +-
vcl/win/app/salinst.cxx | 41 +---
vcl/win/window/salframe.cxx |9 +-
7 files changed, 71 insertions(+), 51 deletions(-)
New commits:
commit 401cba4c20fbc930f034168872642428d7459218
Author: Jan-Marek Glogowski
AuthorDate: Fri Aug 17 23:10:00 2018 +0200
Commit: Jan-Marek Glogowski
CommitDate: Mon Aug 20 09:35:59 2018 +0200
tdf#116370 cleanup Writer idle job handing
This prevents the start of the idle job, while processing itself,
so the fixed WinSalInstance::AnyInput of commit 3bf6c97029d2
("tdf#112975 WIN correctly handle VclInputFlags::OTHER") won't
report the timer events of the re-started idle job to process.
Fixes the early abort of the background job, which resulted in
the busy loop of the reported bug and this strange printing
behaviour.
P.S. I'm not sure, why this was just broken on Windows.
Change-Id: I6503dcd925c9a0ed843e794a31eea32a4a4b2889
Reviewed-on: https://gerrit.libreoffice.org/59279
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index 6efe1a114963..1ed8679c00ac 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -20,42 +20,44 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
#define INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
-/** Manipulate background jobs of the document. It starts with a mode of
- 'started' and a block count of 0.
+/**
+ * Handle the background job of the Writer document.
+ *
+ * Initially it's disabled and unblocked.
+ *
+ * Jobs include:
+ * * grammar checking
+ * * field updating
+ * * document layouting
*/
class IDocumentTimerAccess
{
public:
/**
-Set mode to 'start'.
-*/
+ * Start the idle job depending on the block count.
+ */
virtual void StartIdling() = 0;
/**
-Set mode to 'stopped'.
-*/
+ * Stop idle processing.
+ */
virtual void StopIdling() = 0;
/**
-Increment block count.
-*/
+ * Increment block count.
+ *
+ * Prevents further background idle processing.
+ */
virtual void BlockIdling() = 0;
/**
-Decrement block count.
-*/
+ * Decrement block count.
+ *
+ * May start the idle job.
+ */
virtual void UnblockIdling() = 0;
/**
-Do these jobs asynchronously: do grammar checking,
-do layout, and update fields.
-They will be delayed until mode is start AND block count == 0.
-The implementation might delay them further, for example
-it might wait until the application is idle.
-*/
-virtual void StartBackgroundJobs() = 0;
-
-/**
* Is the document ready to be processed?
*/
virtual bool IsDocIdle() const = 0;
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx
b/sw/source/core/doc/DocumentTimerManager.cxx
index 5429c6edbda6..35f2eb94dcbd 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -49,9 +49,13 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc
) : m_rDoc( i_rSwdoc
void DocumentTimerManager::StartIdling()
{
-mbStartIdleTimer = true;
-if( !mIdleBlockCount )
+if( !mIdleBlockCount && !maDocIdle.IsActive() )
+{
+mbStartIdleTimer = false;
maDocIdle.Start();
+}
+else
+mbStartIdleTimer = true;
}
void DocumentTimerManager::StopIdling()
@@ -70,14 +74,10 @@ void DocumentTimerManager::UnblockIdling()
{
--mIdleBlockCount;
if( !mIdleBlockCount && mbStartIdleTimer && !maDocIdle.IsActive() )
+{
+mbStartIdleTimer = false;
maDocIdle.Start();
-}
-
-void DocumentTimerManager::StartBackgroundJobs()
-{
-// Trigger DoIdleJobs(), asynchronously.
-if (!maDocIdle.IsActive()) //fdo#73165 if the timer is already running
don't restart from 0
-maDocIdle.Start();
+}
}
DocumentTimerManager::IdleJob DocumentTimerManager::GetNextIdleJob() const
@@ -123,13 +123,14 @@ DocumentTimerManager::IdleJob
DocumentTimerManager::GetNextIdleJob() const
return IdleJob::None;
}
-IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer*, pIdle, void )
+IMPL_LINK_NOARG( DocumentTimerManager, DoIdleJobs, Timer*, void )
{
#ifdef TIMELOG
static ::rtl::Logfile* pModLogFile = 0;
if( !pModLogFile )
pModLogFile = new ::rtl::Logfile( "First DoIdleJobs" );
#endif
+BlockIdling();
IdleJob eJob = GetNextIdleJob();
@@ -183,7 +184,8 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer*, pIdle,
void )
}
if ( IdleJob::None !
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sd/qa
oox/source/export/shapes.cxx |7 ++-
sd/qa/unit/export-tests-ooxml2.cxx |1 +
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 406280c62843e9ed167e7adaa005fba92a39608f
Author: Szymon Kłos
AuthorDate: Wed Aug 8 17:57:51 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 10:14:17 2018 +0200
tdf#116350 Fix export of fontwork
Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414
Reviewed-on: https://gerrit.libreoffice.org/58746
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/58841
Reviewed-by: Andras Timar
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 95cc968f76ff..8c4b2daaaff0 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -744,6 +744,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
bool bFlipH = false;
bool bFlipV = false;
+// Avoid interference of preset type to the next shape
+m_presetWarp = "";
+
if( GETA( CustomShapeGeometry ) ) {
SAL_INFO("oox.shape", "got custom shape geometry");
if( mAny >>= aGeometrySeq ) {
@@ -1007,7 +1010,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
}
if( rXPropSet.is() )
{
-WriteFill( rXPropSet );
+// Preset shape with text has no fill
+if( sShapeType.isEmpty() || !sShapeType.startsWith( "fontwork" ) )
+WriteFill( rXPropSet );
WriteOutline( rXPropSet );
WriteShapeEffects( rXPropSet );
WriteShape3DEffects( rXPropSet );
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index c72ebc2f3158..1f246fec7a90 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1743,6 +1743,7 @@ void SdOOXMLExportTest2::testTdf116350TextEffects()
xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
assertXPath(pXmlDocContent, "//p:sp[1]/p:txBody/a:bodyPr/a:prstTxWarp",
"prst", "textArchUp");
assertXPath(pXmlDocContent, "//p:sp[14]/p:txBody/a:bodyPr/a:prstTxWarp",
"prst", "textCircle");
+assertXPath(pXmlDocContent, "//p:sp[14]/p:spPr/a:solidFill/a:srgbClr", 0);
xDocShRef->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/guide/keyboard.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c78f56bc417b0be078f84303ab4895c9e1f7daf Author: Stanislav Horacek AuthorDate: Sun Aug 19 16:30:10 2018 +0200 Commit: Olivier Hallot CommitDate: Mon Aug 20 02:49:34 2018 +0200 table is not in Insert menu anymore, use another example Change-Id: Iab50a4452f5b50eade881119f316410a03611265 Reviewed-on: https://gerrit.libreoffice.org/59305 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/guide/keyboard.xhp b/source/text/swriter/guide/keyboard.xhp index aea14c4da..6bfce4969 100644 --- a/source/text/swriter/guide/keyboard.xhp +++ b/source/text/swriter/guide/keyboard.xhp @@ -35,7 +35,7 @@ Press the keys Option Alt+to open a menu. In an open menu, press the underlined character to run a command. For example, press Option -Alt+I to open the Insert menu, and then T to insert a table. +Alt+I to open the Insert menu, and then H to insert a hyperlink. To open a context menu, press Shift+F10. To close a context menu, press Escape. To Insert Sections ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/core/layout/flowfrm.cxx |4 1 file changed, 4 insertions(+) New commits: commit d1b9cbe749fc3329bda1e8ddaee6d8a6f783ad82 Author: Caolán McNamara AuthorDate: Tue Aug 14 15:22:58 2018 +0100 Commit: Michael Stahl CommitDate: Mon Aug 20 12:20:03 2018 +0200 tdf#117086 crash on deleted SwFootnoteBossFrame use SwFrameDeleteGuard to lock pOldBoss to exist over the range its directly accessed Change-Id: I68af80114a380f68b86cbc78278fb9e5e87e Reviewed-on: https://gerrit.libreoffice.org/59113 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 46af46fbe942..4366c98af710 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1871,6 +1871,8 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) } } +std::unique_ptr xDeleteGuard(bMakePage ? new SwFrameDeleteGuard(pOldBoss) : nullptr); + bool bSamePage = true; SwLayoutFrame *pNewUpper = m_rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, true ); @@ -1909,6 +1911,8 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) pOldBoss = pOldBoss->FindFootnoteBossFrame( true ); SwPageFrame* pNewPage = pOldPage; +xDeleteGuard.reset(); + // First, we move the footnotes. bool bFootnoteMoved = false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa writerfilter/source
sw/qa/core/data/ooxml/fail/ofz9934-1.docx |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 4fb7390956a193e00c1b599129b89933c41f98ae Author: Caolán McNamara AuthorDate: Fri Aug 17 08:47:19 2018 +0100 Commit: Michael Stahl CommitDate: Mon Aug 20 12:16:10 2018 +0200 ofz#9934 null deref Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5 Reviewed-on: https://gerrit.libreoffice.org/59249 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/qa/core/data/ooxml/fail/ofz9934-1.docx b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx new file mode 100644 index ..b97afaee8d3f Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d2289c25fa9b..aff0159140e6 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1610,8 +1610,9 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandler if (!m_aAnchoredStack.empty()) m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); -m_aTextAppendStack.pop(); - +SAL_WARN_IF(m_aTextAppendStack.empty(), "writerfilter.dmapper", "no text stack"); +if (!m_aTextAppendStack.empty()) +m_aTextAppendStack.pop(); appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source
sw/source/filter/ww8/ww8scan.cxx | 39 +--
sw/source/filter/ww8/ww8scan.hxx |2 +-
2 files changed, 14 insertions(+), 27 deletions(-)
New commits:
commit c57538b2b3c9ffbb206590089c0a5ca69056304d
Author: Caolán McNamara
AuthorDate: Wed Aug 15 17:28:41 2018 +0100
Commit: Michael Stahl
CommitDate: Mon Aug 20 12:14:32 2018 +0200
ofz#9917 use a WW8SprmIter to find the sprm
extend WW8SprmIter to support the needed paramater match feature and
drop the custom WW8PLCFx_SEPX::HasSprm logic
Change-Id: I5893e04402ed03493add398f0939a578807561ef
Reviewed-on: https://gerrit.libreoffice.org/59120
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6a90d83e8e3c..6e5e863767c7 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -917,7 +917,7 @@ void WW8SprmIter::UpdateMyMembers()
}
}
-SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId)
+SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch)
{
while (GetSprms())
{
@@ -925,7 +925,13 @@ SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId)
{
sal_uInt16 nFixedLen = mrSprmParser.DistanceToData(nId);
sal_uInt16 nL = mrSprmParser.GetSprmSize(nId, GetSprms(),
GetRemLen());
-return SprmResult(GetAktParams(), nL - nFixedLen); // SPRM found!
+SprmResult aRet(GetAktParams(), nL - nFixedLen); // SPRM found!
+// typically pNextByteMatch is nullptr and we just return the
first match
+if (!pNextByteMatch)
+return aRet;
+// very occasionally we want one with a specific following byte
+if (aRet.nRemainingData >= 1 && *aRet.pSprm == *pNextByteMatch)
+return aRet;
}
advance();
}
@@ -3769,32 +3775,13 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16
nId1,sal_uInt16 nId2,sal_uInt16 nId3,s
SprmResult WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const
{
-if (!pPLCF)
-return SprmResult();
-
-sal_uInt8* pSp = pSprms.get();
-size_t i = 0;
-while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
+SprmResult aRet;
+if (pPLCF)
{
-// Sprm found?
-const sal_uInt16 nAktId = maSprmParser.GetSprmId(pSp);
-const sal_uInt16 x = maSprmParser.GetSprmSize(nAktId, pSp, nSprmSiz -
i);
-if (nAktId == nId)
-{
-sal_uInt16 nFixedLen = maSprmParser.DistanceToData(nId);
-const sal_uInt8 *pRet = pSp + nFixedLen;
-SprmResult aRet(pRet, x - nFixedLen);
-if (aRet.nRemainingData >= 1 && *aRet.pSprm == n2nd)
-{
-return aRet;
-}
-}
-// increment pointer so that it points to next SPRM
-i += x;
-pSp += x;
+WW8SprmIter aIter(pSprms.get(), nSprmSiz, maSprmParser);
+aRet = aIter.FindSprm(nId, &n2nd);
}
-
-return SprmResult(); // Sprm not found
+return aRet;
}
WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, const WW8Fib& rFib,
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index ff2246155899..841067d2a241 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -281,7 +281,7 @@ public:
explicit WW8SprmIter(const sal_uInt8* pSprms_, sal_Int32 nLen_,
const wwSprmParser &rSprmParser);
void SetSprms(const sal_uInt8* pSprms_, sal_Int32 nLen_);
-SprmResult FindSprm(sal_uInt16 nId);
+SprmResult FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch = nullptr);
void advance();
const sal_uInt8* GetSprms() const
{ return ( pSprms && (0 < nRemLen) ) ? pSprms : nullptr; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-5.3' - 3 commits - source/ja source/ko
source/ja/officecfg/registry/data/org/openoffice/Office/UI.po | 57 source/ja/sc/source/ui/dbgui.po |2 source/ja/sc/source/ui/src.po |4 source/ja/svtools/source/misc.po | 14 source/ja/svx/source/tbxctrls.po |2 source/ko/officecfg/registry/data/org/openoffice/Office/UI.po | 1092 +++--- source/ko/sc/source/ui/src.po |4 source/ko/svtools/source/misc.po |2 8 files changed, 456 insertions(+), 721 deletions(-) New commits: commit ddf3b88380fc439d17256f3f0cb25cbcaa27bef0 Author: Andras Timar AuthorDate: Mon Aug 6 16:28:29 2018 +0200 Commit: Andras Timar CommitDate: Mon Aug 6 16:28:29 2018 +0200 ja translation of 'No Fill' Change-Id: Ia27cce78a507b747284ef096c85105f11dc7ed00 diff --git a/source/ja/svx/source/tbxctrls.po b/source/ja/svx/source/tbxctrls.po index 617dfcd69ac..4ed903c 100644 --- a/source/ja/svx/source/tbxctrls.po +++ b/source/ja/svx/source/tbxctrls.po @@ -478,7 +478,7 @@ msgctxt "" "RID_SVXSTR_NOFILL\n" "string.text" msgid "No Fill" -msgstr "" +msgstr "塗りつぶしなし" #: tbcontrl.src msgctxt "" commit 4164436c91ae03b3bb4f64ae17a0b16a48746be5 Author: Andras Timar AuthorDate: Mon Jul 30 23:04:34 2018 +0200 Commit: Andras Timar CommitDate: Mon Jul 30 23:04:34 2018 +0200 Updated Korean translation Change-Id: I1a8af9ab040b58e809d79288edbe9a719666bee6 diff --git a/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po b/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po index 7501b75deea..af0e6943825 100644 --- a/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po @@ -17,7 +17,6 @@ msgstr "" "X-POOTLE-MTIME: 1476428947.00\n" #: BaseWindowState.xcu -#, fuzzy msgctxt "" "BaseWindowState.xcu\n" "..BaseWindowState.UIElements.States.private:resource/popupmenu/edit\n" @@ -153,7 +152,6 @@ msgid "Form Spin Button" msgstr "스핀 버튼 양식" #: BasicIDEWindowState.xcu -#, fuzzy msgctxt "" "BasicIDEWindowState.xcu\n" "..BasicIDEWindowState.UIElements.States.private:resource/popupmenu/dialog\n" @@ -367,7 +365,7 @@ msgctxt "" "Label\n" "value.text" msgid "Clear ~Direct Formatting" -msgstr "직접 적용한 서식 지우기(~D)" +msgstr "직접 설정한 서식 지우기(~D)" #: CalcCommands.xcu msgctxt "" @@ -412,7 +410,7 @@ msgctxt "" "Label\n" "value.text" msgid "Freeze ~Cells" -msgstr "" +msgstr "셀 고정(~C)" #: CalcCommands.xcu msgctxt "" @@ -430,7 +428,7 @@ msgctxt "" "Label\n" "value.text" msgid "Freeze First Column" -msgstr "" +msgstr "첫 열 고정" #: CalcCommands.xcu msgctxt "" @@ -439,7 +437,7 @@ msgctxt "" "Label\n" "value.text" msgid "Freeze First Row" -msgstr "" +msgstr "첫 행 고정" #: CalcCommands.xcu msgctxt "" @@ -460,7 +458,6 @@ msgid "Insert Chart" msgstr "차트 삽입" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:FillModeTracePredescessor\n" @@ -470,7 +467,6 @@ msgid "Trace ~Precedent" msgstr "선례 추적(~P)" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:FillModeRemovePredescessor\n" @@ -480,7 +476,6 @@ msgid "~Remove Precedent" msgstr "선례 추적 제거(~R)" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:FillModeTraceSuccessor\n" @@ -490,14 +485,13 @@ msgid "~Trace Dependent" msgstr "종속 추적(~T)" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:FillModeRemoveSuccessor\n" "Label\n" "value.text" msgid "Remove Dependent" -msgstr "종속 추적 제거(~D)" +msgstr "종속 추적 제거" #: CalcCommands.xcu msgctxt "" @@ -506,7 +500,7 @@ msgctxt "" "Label\n" "value.text" msgid "Exit Fill Mode" -msgstr "" +msgstr "채우기 모드 종료" #: CalcCommands.xcu msgctxt "" @@ -587,7 +581,7 @@ msgctxt "" "Label\n" "value.text" msgid "~Protect Records..." -msgstr "보호(~P)..." +msgstr "레코드 보호(~P)..." #: CalcCommands.xcu msgctxt "" @@ -641,7 +635,7 @@ msgctxt "" "Label\n" "value.text" msgid "Sheet ~Events..." -msgstr "시트 이벤트(~E)" +msgstr "시트 이벤트(~E)..." #: CalcCommands.xcu msgctxt "" @@ -653,7 +647,6 @@ msgid "Pivot Table Filter" msgstr "피벗 테이블 필터" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:DataPilotFilter\n" @@ -762,14 +755,13 @@ msgid "Page Format" msgstr "페이지 서식" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:StatusSelectionMode\n" "Label\n" "value.text" msgid "Se~lection Mode" -msgstr "선택 모드" +msgstr "선택 모드(~L)" #: CalcCommands.xcu msgctxt "" @@ -898,14 +890,13 @@ msgid "Select to Lower Block Margin" msgstr "아래 블록 여백까지 선택" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n"
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sot/source
sot/source/sdstor/stgavl.cxx | 12 ++--
sot/source/sdstor/stgavl.hxx |4 ++--
sot/source/sdstor/stgdir.cxx |4 ++--
sot/source/sdstor/stgdir.hxx |2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit a11ed230844873cef34e4c5c0d1536f4ed14b401
Author: Stephan Bergmann
AuthorDate: Fri Aug 17 20:09:19 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Aug 20 10:36:18 2018 +0200
Avoid further downstream overflow
...after 004304eb2fd1703d22dec0abf0170bb2ce493d0c "try to avoid overflows in
some compare functions" had changed the return type of just one function,
but
not its callers. Found with Clang's new -fsanitize=implicit-conversion
during
CppunitTest_sd_filters_test:
> Testing
file:///home/sbergman/lo/core/sd/qa/unit/data/ppt/pass/hang-17.ppt:
[...]
> sot/source/sdstor/stgdir.cxx:101:19: runtime error: implicit conversion
from type 'sal_Int32' (aka 'int') of value -57120 (32-bit, signed) to type
'short' changed the value to 8416 (16-bit, signed)
> #0 in StgDirEntry::Compare(StgAvlNode const*) const at
sot/source/sdstor/stgdir.cxx:101:19 (instdir/program/libsotlo.so +0x217699)
> #1 in StgAvlNode::Find(StgAvlNode const*) at
sot/source/sdstor/stgavl.cxx:43:29 (instdir/program/libsotlo.so +0x1db72b)
> #2 in StgDirStrm::Find(StgDirEntry&, rtl::OUString const&) at
sot/source/sdstor/stgdir.cxx:907:57 (instdir/program/libsotlo.so +0x22f2dc)
> #3 in Storage::IsStream(rtl::OUString const&) const at
sot/source/sdstor/stg.cxx:773:39 (instdir/program/libsotlo.so +0x1d2cdf)
> #4 in SotStorage::IsStream(rtl::OUString const&) const at
sot/source/sdstor/storage.cxx:654:27 (instdir/program/libsotlo.so +0x29ebdb)
> #5 in PropRead::PropRead(SotStorage&, rtl::OUString const&) at
sd/source/filter/ppt/propread.cxx:543:19 (instdir/program/libsdfiltlo.so
+0x6b72ee)
> #6 in ImplSdPPTImport::Import() at sd/source/filter/ppt/pptin.cxx:262:32
(instdir/program/libsdfiltlo.so +0x5d0dc4)
> #7 in SdPPTImport::Import() at sd/source/filter/ppt/pptin.cxx:167:21
(instdir/program/libsdfiltlo.so +0x5cf733)
> #8 in ImportPPT at sd/source/filter/ppt/pptin.cxx:2761:26
(instdir/program/libsdfiltlo.so +0x618f64)
> #9 in SdPPTFilter::Import() at sd/source/filter/sdpptwrp.cxx:106:32
(instdir/program/libsdlo.so +0x2877ed3)
> #10 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at
sd/source/ui/docshell/docshel4.cxx:474:46 (instdir/program/libsdlo.so
+0x2e1607c)
> #11 in SfxObjectShell::DoLoad(SfxMedium*) at
sfx2/source/doc/objstor.cxx:786:23 (instdir/program/libsfxlo.so +0x2c8c762)
> #12 in SdFiltersTest::load(rtl::OUString const&, rtl::OUString const&,
rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at
sd/qa/unit/filters-test.cxx:75:31
(workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19771)
> #13 in test::FiltersTest::recursiveScan(test::filterStatus,
rtl::OUString const&, rtl::OUString const&, rtl::OUString const&,
SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at
unotest/source/cpp/filters-test.cxx:130:20
(workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x5724c)
> #14 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString
const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned
int, bool) at unotest/source/cpp/filters-test.cxx:155:5
(workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x57ec9)
> #15 in SdFiltersTest::testCVEs() at sd/qa/unit/filters-test.cxx:83:5
(workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19d6d)
Change-Id: Iaffd35d33f0e1109195e3bd56538104d395af01b
Reviewed-on: https://gerrit.libreoffice.org/59274
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 4cb69cf33b5bf17030bcd263fe31258177c76d5e)
Reviewed-on: https://gerrit.libreoffice.org/59277
Reviewed-by: Michael Stahl
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index d488eec69130..0c78054045f0 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.cxx
@@ -40,7 +40,7 @@ StgAvlNode* StgAvlNode::Find( StgAvlNode const * pFind )
StgAvlNode* p = this;
while( p )
{
-short nRes = p->Compare( pFind );
+sal_Int32 nRes = p->Compare( pFind );
if( !nRes )
return p;
else p = ( nRes < 0 ) ? p->m_pLeft : p->m_pRight;
@@ -52,11 +52,11 @@ StgAvlNode* StgAvlNode::Find( StgAvlNode const * pFind )
// find point to add node to AVL tree and returns
// +/0/- for >/=/< previous
-short StgAvlNode::Locate
+sal_Int32 StgAvlNode::Locate
( StgAvlNode const * pFind,
StgAvlNode** pPivot, StgAvlNode **pParent, StgAvlNode** pPrev )
{
-short nRes = 0;
+sal_Int32 nRes = 0;
StgAvlNode* pCur = this;
OSL_ENSURE( pPivot && pParent && pPrev, "The pointers may not be NULL!" );
@@ -98,7
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sd/qa svx/source
oox/source/drawingml/shape.cxx | 11 +
sd/qa/unit/export-tests-ooxml2.cxx | 42
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 148
3 files changed, 167 insertions(+), 34 deletions(-)
New commits:
commit 40b396ef207213ebd07981206674a2260256cb3c
Author: Szymon Kłos
AuthorDate: Tue Aug 7 10:44:21 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 10:14:41 2018 +0200
tdf#116350 Correctly display text on arc
Change-Id: Ice8c141db20d43ccc8d6e2b56004a4a28d2b257a
Reviewed-on: https://gerrit.libreoffice.org/58729
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/58840
Reviewed-by: Andras Timar
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f13fa4a2f56f..5483dcc06ff1 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -547,13 +547,22 @@ static inline void lcl_createPresetShape(
uno::Reference& xShap
lcl_resetPropertyValue( aGeomPropVec, sEquations );
lcl_resetPropertyValue( aGeomPropVec, sPath );
+// Some shapes don't need scaling
+bool bScale = true;
+if ( rPresetType == "textRingInside"
+|| rPresetType == "textRingOutside"
+|| rPresetType == "textCirclePour" )
+{
+bScale = false;
+}
+
// Apply geometry properties
uno::Sequence aPropertyValues(
comphelper::InitPropertySequence(
{ { sTextPath, uno::makeAny( true ) },
{ "TextPathMode",
uno::Any( drawing::EnhancedCustomShapeTextPathMode_PATH ) },
-{ "ScaleX", uno::Any( false ) } } ) );
+{ "ScaleX", uno::Any( bScale ) } } ) );
lcl_setPropertyValue( aGeomPropVec, sTextPath,
comphelper::makePropertyValue( sTextPath, aPropertyValues ) );
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 1f246fec7a90..80cd202c533c 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1717,6 +1717,39 @@ static inline double getAdjustmentValue(
uno::Reference& xS
return -1.0;
}
+static inline bool getScaleXValue(uno::Reference& xSet)
+{
+bool bScaleX = false;
+
+auto aGeomPropSeq = xSet->getPropertyValue("CustomShapeGeometry")
+.get>();
+auto aGeomPropVec
+= comphelper::sequenceToContainer>(
+aGeomPropSeq);
+
+const OUString sName = "TextPath";
+auto aIterator = std::find_if(
+aGeomPropVec.begin(), aGeomPropVec.end(),
+[sName](const beans::PropertyValue& rValue) { return rValue.Name ==
sName; });
+
+if (aIterator != aGeomPropVec.end())
+{
+uno::Sequence aTextPathProperties;
+aIterator->Value >>= aTextPathProperties;
+const OUString sScaleX = "ScaleX";
+auto aIterator2 = std::find_if(
+aTextPathProperties.begin(), aTextPathProperties.end(),
+[sScaleX](const beans::PropertyValue& rValue) { return rValue.Name
== sScaleX; });
+
+if (aIterator2 != aTextPathProperties.end())
+{
+aIterator2->Value >>= bScaleX;
+}
+}
+
+return bScaleX;
+}
+
void SdOOXMLExportTest2::testTdf116350TextEffects()
{
::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(
"sd/qa/unit/data/pptx/tdf116350-texteffects.pptx" ), PPTX );
@@ -1726,16 +1759,25 @@ void SdOOXMLExportTest2::testTdf116350TextEffects()
double fAdjust = getAdjustmentValue( xShape0 );
CPPUNIT_ASSERT_EQUAL( 180.0, fAdjust );
+bool bScaleX = getScaleXValue( xShape0 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
// Default angle for ArchDown
uno::Reference xShape14( getShapeFromPage( 14, 0,
xDocShRef ) );
fAdjust = getAdjustmentValue( xShape14 );
CPPUNIT_ASSERT_EQUAL( 0.0, fAdjust );
+bScaleX = getScaleXValue( xShape14 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
// Angle directly set
uno::Reference xShape1( getShapeFromPage( 1, 0,
xDocShRef ) );
fAdjust = getAdjustmentValue( xShape1 );
CPPUNIT_ASSERT_EQUAL( 213.25, fAdjust );
+bScaleX = getScaleXValue( xShape1 );
+CPPUNIT_ASSERT_EQUAL( true, bScaleX );
+
// Export
utl::TempFile tempFile;
xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 9bfed5d53ab4..0419038f0fda 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -79,9 +80,11 @@ struct FWData // representing the
whole text
{
std::vector< FWTextArea > vTextAreas;
double fHorizonta
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/uiconfig
sw/uiconfig/swriter/ui/assignstylesdialog.ui | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) New commits: commit a19a65193a564a0eccdb63b7e2ca272d32aa9180 Author: Olivier Hallot AuthorDate: Sat Jun 30 22:35:39 2018 -0300 Commit: Olivier Hallot CommitDate: Mon Aug 20 11:51:16 2018 +0200 tdf#118457 Place Help button on the left Change-Id: Id1c386fab92a2e21e7b2f07f08daf08d5886d027 Reviewed-on: https://gerrit.libreoffice.org/56774 Tested-by: Jenkins Reviewed-by: Eike Rathke (cherry picked from commit 15eadb56d0a24fb4b1e70c8afb41f6e02eb47761) Reviewed-on: https://gerrit.libreoffice.org/56775 Reviewed-by: Olivier Hallot diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui index bc1e17069dc0..affe6ae33059 100644 --- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui +++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui @@ -1,5 +1,5 @@ - + @@ -18,6 +18,9 @@ 6 Assign Styles dialog + + + False @@ -69,6 +72,7 @@ False True 2 +True @@ -153,16 +157,12 @@ 0 0 -1 -1 0 2 -1 -1 @@ -178,22 +178,18 @@ 0 1 -1 -1 False True -0 Not applied +0 0 0 -1 -1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/inc oox/Library_oox.mk oox/source sd/qa
oox/Library_oox.mk |1
oox/inc/drawingml/presetgeometrynames.hxx | 23 ++
oox/inc/drawingml/textbodycontext.hxx |2
oox/inc/drawingml/textbodyproperties.hxx |1
oox/inc/drawingml/textbodypropertiescontext.hxx|5
oox/source/drawingml/presetgeometrynames.cxx | 108
oox/source/drawingml/shape.cxx | 185 +
oox/source/drawingml/shapecontext.cxx |4
oox/source/drawingml/textbodycontext.cxx | 12 +
oox/source/drawingml/textbodyproperties.cxx|1
oox/source/drawingml/textbodypropertiescontext.cxx | 32 +++
oox/source/ppt/pptshapecontext.cxx |2
sd/qa/unit/data/pptx/tdf116350-texteffects.pptx|binary
sd/qa/unit/export-tests-ooxml2.cxx | 50 +
14 files changed, 421 insertions(+), 5 deletions(-)
New commits:
commit b56857dbd21083f5d41eaf4c0f08db1977cf8d2e
Author: Szymon Kłos
AuthorDate: Fri Jul 20 17:21:43 2018 +0200
Commit: Andras Timar
CommitDate: Mon Aug 20 10:12:58 2018 +0200
tdf#116350 Import preset text geometry (text effects)
"Font effect" implementation, instead of normal
text, content is converted to "fontwork".
Change-Id: I5d02c7faedb66a4b919e64ae1b830bffb69984c1
Reviewed-on: https://gerrit.libreoffice.org/58358
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/58838
Reviewed-by: Andras Timar
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a21157be131f..e917a9b866d3 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/linepropertiescontext \
oox/source/drawingml/lineproperties \
oox/source/drawingml/objectdefaultcontext \
+oox/source/drawingml/presetgeometrynames \
oox/source/drawingml/scene3dcontext \
oox/source/drawingml/shapecontext \
oox/source/drawingml/shape \
diff --git a/oox/inc/drawingml/presetgeometrynames.hxx
b/oox/inc/drawingml/presetgeometrynames.hxx
new file mode 100644
index ..51721e41febd
--- /dev/null
+++ b/oox/inc/drawingml/presetgeometrynames.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_OOX_DRAWINGML_PRESETGEOMETRYNAMES_HXX
+#define INCLUDED_OOX_DRAWINGML_PRESETGEOMETRYNAMES_HXX
+
+#include
+#include
+
+namespace PresetGeometryTypeNames
+{
+OOX_DLLPUBLIC OUString GetFontworkType(const OUString& rMsoType);
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/oox/inc/drawingml/textbodycontext.hxx
b/oox/inc/drawingml/textbodycontext.hxx
index a3439105493a..39ae7b8a1b59 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -32,11 +32,13 @@ class TextBodyContext final : public
::oox::core::ContextHandler2
{
public:
TextBodyContext( ::oox::core::ContextHandler2Helper const & rParent,
TextBody& rTextBody );
+TextBodyContext( ::oox::core::ContextHandler2Helper const & rParent,
ShapePtr pShapePtr );
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32
Element, const ::oox::AttributeList& rAttribs ) override;
private:
TextBody& mrTextBody;
+ShapePtrmpShapePtr;
};
// CT_RegularTextRun
diff --git a/oox/inc/drawingml/textbodyproperties.hxx
b/oox/inc/drawingml/textbodyproperties.hxx
index bcb75546a688..62ee3190ae58 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -41,6 +41,7 @@ struct TextBodyProperties
boost::optional< sal_Int32 >moTextOffLower;
boost::optional< sal_Int32 >moTextOffRight;
css::drawing::TextVerticalAdjustmeVA;
+OUStringmsPrst;
explicitTextBodyProperties();
diff --git a/oox/inc/drawingml/textbodypropertiescontext.hxx
b/oox/inc/drawingml/textbodypropertiescontext.hxx
index 0ec5fe455185..b6305866e014 100644
--- a/oox/inc/drawingml/textbodypropertiescontext.hxx
+++ b/oox/inc/drawingml/textbodypropertiescontext.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
#include
+#include
namespace oox { namespace drawingml {
@@ -33,10 +34,14 @@ public:
const ::oox::AttributeList& rAttributes,
TextBodyProperties& rTextBodyProp );
+TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper const &
rPa
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a0b13ca3b4cf17bd46f0be8002c862e1b2a21e6 Author: Andras Timar AuthorDate: Mon Aug 6 16:28:29 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Aug 20 11:42:16 2018 +0200 Update git submodules * Update translations from branch 'distro/collabora/cp-5.3' - ja translation of 'No Fill' Change-Id: Ia27cce78a507b747284ef096c85105f11dc7ed00 - Updated Korean translation Change-Id: I1a8af9ab040b58e809d79288edbe9a719666bee6 - Updated Japanese translation Change-Id: Ie28f4c0ed0533cf4e96b6fa10f18ce00acbc7368 diff --git a/translations b/translations index 1dbde0d58502..ddf3b88380fc 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 1dbde0d58502a8c2b5bf27926c85a627789c3fa4 +Subproject commit ddf3b88380fc439d17256f3f0cb25cbcaa27bef0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sd/qa
oox/source/drawingml/shape.cxx |7 ++- sd/qa/unit/export-tests-ooxml2.cxx |8 2 files changed, 14 insertions(+), 1 deletion(-) New commits: commit 409fd186af22bd9c1819cc0f05bfca3bdf427a42 Author: Szymon Kłos AuthorDate: Wed Aug 1 15:58:20 2018 +0200 Commit: Andras Timar CommitDate: Mon Aug 20 10:13:48 2018 +0200 tdf#116350 Export preset text geometry (text effects) Change-Id: Ifb921b56387ca183b5a57126f6e88e2f9a4ecb3d Reviewed-on: https://gerrit.libreoffice.org/58430 Tested-by: Jenkins Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/58839 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 2a28ea06d0ec..f13fa4a2f56f 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -436,6 +436,7 @@ static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust ) static inline void lcl_createPresetShape( uno::Reference& xShape, const OUString& rClass, + const OUString& rPresetType, const CustomShapePropertiesPtr pCustomShapePropertiesPtr, const TextBodyPtr pTextBody, const GraphicHelper& rGraphicHelper ) @@ -540,6 +541,7 @@ static inline void lcl_createPresetShape( uno::Reference& xShap const OUString sPath( "Path" ); const OUString sTextPath( "TextPath" ); const OUString sAdjustmentValues( "AdjustmentValues" ); +const OUString sPresetTextWarp( "PresetTextWarp" ); lcl_resetPropertyValue( aGeomPropVec, sCoordinateSize ); lcl_resetPropertyValue( aGeomPropVec, sEquations ); @@ -556,6 +558,9 @@ static inline void lcl_createPresetShape( uno::Reference& xShap lcl_setPropertyValue( aGeomPropVec, sTextPath, comphelper::makePropertyValue( sTextPath, aPropertyValues ) ); +lcl_setPropertyValue( aGeomPropVec, sPresetTextWarp, +comphelper::makePropertyValue( sPresetTextWarp, rPresetType ) ); + if ( rClass == "fontwork-arch-up-curve" || rClass == "fontwork-circle-curve" || rClass == "fontwork-arch-down-curve" || rClass == "fontwork-open-circle-curve" ) lcl_setPropertyValue( aGeomPropVec, sAdjustmentValues, @@ -1309,7 +1314,7 @@ Reference< XShape > const & Shape::createAndInsert( const OUString sPresetType = mpTextBody->getTextProperties().msPrst; sClass = PresetGeometryTypeNames::GetFontworkType( sPresetType ); -lcl_createPresetShape( mxShape, sClass, mpCustomShapePropertiesPtr, mpTextBody, rGraphicHelper ); +lcl_createPresetShape( mxShape, sClass, sPresetType, mpCustomShapePropertiesPtr, mpTextBody, rGraphicHelper ); } } } diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 0607da45b22d..c72ebc2f3158 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1736,6 +1736,14 @@ void SdOOXMLExportTest2::testTdf116350TextEffects() fAdjust = getAdjustmentValue( xShape1 ); CPPUNIT_ASSERT_EQUAL( 213.25, fAdjust ); +// Export +utl::TempFile tempFile; +xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile ); + +xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); +assertXPath(pXmlDocContent, "//p:sp[1]/p:txBody/a:bodyPr/a:prstTxWarp", "prst", "textArchUp"); +assertXPath(pXmlDocContent, "//p:sp[14]/p:txBody/a:bodyPr/a:prstTxWarp", "prst", "textCircle"); + xDocShRef->DoClose(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/3a8440d6eb8992b8408fb90997270063bb03c328/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7a7cc860dc93e7fd36d413efb8a28b2e316617b Author: Andras Timar AuthorDate: Mon Aug 20 12:02:13 2018 +0200 Commit: Andras Timar CommitDate: Mon Aug 20 12:02:13 2018 +0200 Bump version to 5.3-54 Change-Id: Ic2ed70b84b8d0f67445ef14d9a33f5f5679427b0 diff --git a/configure.ac b/configure.ac index daa8073287b9..66e477674b20 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.49],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.54],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'distro/collabora/cd-5.3-3.4'
New branch 'distro/collabora/cd-5.3-3.4' available with the following commits: ___ 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/xml/xmlexprt.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3e97b8a74b20d72d36ac65d3ef091cae79b8cdac Author: Caolán McNamara AuthorDate: Sun Aug 19 23:42:49 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 20 09:23:29 2018 +0200 coverity#1438402 Improper use of negative value Change-Id: I00aa17ae4fd543faabc4cb7a052e3561da29c1e6 Reviewed-on: https://gerrit.libreoffice.org/59311 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index c8e83c7c47d8..10ebe9139ca5 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1518,6 +1518,7 @@ void ScXMLExport::OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, con bHidden = rRowAttr.rowHidden(nTable, nStartRow, nEndRowHidden); bFiltered = rRowAttr.rowFiltered(nTable, nStartRow, nEndRowFiltered); } +assert(nIndex >= 0 && "coverity#1438402"); OpenNewRow(nIndex, nStartRow, 1, bHidden, bFiltered); } nOpenRow = nStartRow + nRepeatRow - 1; ___ 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-6.0' - sw/source
sw/source/core/doc/doc.cxx | 49 +
1 file changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 53dfffb5ca85afa3c74b8e7a8f05cb4f2840c477
Author: Mike Kaganski
AuthorDate: Thu Aug 16 13:56:07 2018 +0300
Commit: Andras Timar
CommitDate: Mon Aug 20 09:46:01 2018 +0200
tdf#119294: reimplement fix for tdf#118859
When removing paragraphs with mail mere fields, both field type reference
and node reference could get invalid, because field type will be destroyed
when its last field is gone; and node will be destroyed if it is in a fly
with anchor in another node which gets destroyed.
To avoid use-after-delete, we will use an SwClient on field types, thus
detecting if a collected field type got destroyed; iterating over fields
using SwIterator is safe, because removing a node with fields would update
the iterator.
Change-Id: Id8b555ef7015b13ab70ebb41845d34c477ac6b31
Reviewed-on: https://gerrit.libreoffice.org/59164
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit c883d5e073d2ac5b2d55126c929d7bf3e6d295e8)
Reviewed-on: https://gerrit.libreoffice.org/59178
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8d29d7872467..a594fe3d1a2c 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -45,6 +45,7 @@
#include
#include
+#include
#include
#include
#include
@@ -124,7 +125,6 @@
#include
#include
-#include
#include
#include
#include
@@ -1341,8 +1341,9 @@ void RemoveOrDeleteContents(SwTextNode* pTextNd,
IDocumentContentOperations& xOp
xOperations.DelFullPara(aPam);
}
}
-// Returns the node pointer which needs to hide, or nullptr if this field does
not hide a node
-SwTextNode* HandleHidingField(SwFormatField& rFormatField, const SwNodes&
rNodes)
+// Returns if the data was actually modified
+bool HandleHidingField(SwFormatField& rFormatField, const SwNodes& rNodes,
+ IDocumentContentOperations& xOperations)
{
SwTextNode* pTextNd;
if (rFormatField.GetTextField()
@@ -1350,9 +1351,10 @@ SwTextNode* HandleHidingField(SwFormatField&
rFormatField, const SwNodes& rNodes
&& pTextNd->GetpSwpHints() && pTextNd->IsHiddenByParaField()
&& &pTextNd->GetNodes() == &rNodes)
{
-return pTextNd;
+RemoveOrDeleteContents(pTextNd, xOperations);
+return true;
}
-return nullptr;
+return false;
}
}
@@ -1391,25 +1393,38 @@ bool SwDoc::RemoveInvisibleContent()
GetIDocumentUndoRedo().StartUndo( SwUndoId::UI_DELETE_INVISIBLECNTNT,
nullptr );
{
+class FieldTypeGuard : public SwClient
+{
+public:
+explicit FieldTypeGuard(SwFieldType* pType)
+: SwClient(pType)
+{
+}
+const SwFieldType* get() const
+{
+return static_cast(GetRegisteredIn());
+}
+};
// Removing some nodes for one SwFieldIds::Database type might remove
the type from
-// document's field types, or try to remove already removed nodes,
invalidating iterators.
-// So, we need to create own list of nodes prior to removing them.
-std::set aHiddenNodes;
-for (const auto* pType : *getIDocumentFieldsAccess().GetFieldTypes())
+// document's field types, invalidating iterators. So, we need to
create own list of
+// matching types prior to processing them.
+std::vector> aHidingFieldTypes;
+for (SwFieldType* pType : *getIDocumentFieldsAccess().GetFieldTypes())
{
if (FieldCanHidePara(pType->Which()))
+
aHidingFieldTypes.push_back(o3tl::make_unique(pType));
+}
+for (const auto& pTypeGuard : aHidingFieldTypes)
+{
+if (const SwFieldType* pType = pTypeGuard->get())
{
SwIterator aIter(*pType);
-for (auto* pField = aIter.First(); pField; pField =
aIter.Next())
-if (SwTextNode* pHiddenNode = HandleHidingField(*pField,
GetNodes()))
-aHiddenNodes.insert(pHiddenNode);
+for (SwFormatField* pFormatField = aIter.First(); pFormatField;
+ pFormatField = aIter.Next())
+bRet |= HandleHidingField(*pFormatField, GetNodes(),
+ getIDocumentContentOperations());
}
}
-for (SwTextNode* pHiddenNode : aHiddenNodes)
-{
-bRet = true;
-RemoveOrDeleteContents(pHiddenNode,
getIDocumentContentOperations());
-}
}
// Remove any hidden paragraph (hidden text attribute)
___
Libreoffice-commits mailing list
libreoffice-comm...@l
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/qa sc/source
sc/qa/unit/data/xlsx/tdf118990.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 33 +
sc/source/filter/excel/xecontent.cxx |3 ++-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 7a0cad5a5667406b37b9ad6ec1e86d79784ce0ee
Author: Mike Kaganski
AuthorDate: Wed Aug 15 12:35:30 2018 +0300
Commit: Aron Budea
CommitDate: Mon Aug 20 06:26:18 2018 +0200
tdf#118990: use full URI for absolute references
Previously (since commit 7eb5e135422f1a5830a44d129300bc3fafb4627d)
only path relative to reference host was stored, and host itself
was dropped. That resulted in URIs like "/share/file.xlsx", even
without scheme. For Windows shares, this broke UNC paths like
"\\HOSTNAME\share\file.xlsx" (which are stored in XLSX by Excel as
"file:///\\HOSTNAME\share\file.xlsx"), and on subsequent import,
this resulted in paths on the same drive as the document (like
"C:\share\file.xlsx").
With this change, we will store "file://HOSTNAME/share/file.xlsx",
which is correctly processed by both LibreOffice and MS Excel.
Reviewed-on: https://gerrit.libreoffice.org/59064
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
(cherry picked from commit f24b0ec13c5c8edda5ffb1336b0eb6da173dfc97)
Change-Id: I3f13aa0b3ae8dc41ec28eaa1416d536469c4562a
Reviewed-on: https://gerrit.libreoffice.org/59166
Tested-by: Mike Kaganski
Reviewed-by: Aron Budea
diff --git a/sc/qa/unit/data/xlsx/tdf118990.xlsx
b/sc/qa/unit/data/xlsx/tdf118990.xlsx
new file mode 100644
index ..b680edceef0e
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf118990.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 916eea9229c1..2370836399a8 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -206,6 +206,8 @@ public:
void testHiddenRepeatedRowsODS();
void testHyperlinkTargetFrameODS();
+void testTdf118990();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
CPPUNIT_TEST(testTdf111876);
@@ -311,6 +313,8 @@ public:
CPPUNIT_TEST(testHiddenRepeatedRowsODS);
CPPUNIT_TEST(testHyperlinkTargetFrameODS);
+CPPUNIT_TEST(testTdf118990);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -3996,6 +4000,35 @@ void ScExportTest::testHyperlinkTargetFrameODS()
CPPUNIT_ASSERT_EQUAL(OUString("_blank"), aTargetFrameExport);
}
+void ScExportTest::testTdf118990()
+{
+ScDocShellRef xDocSh = loadDoc("tdf118990.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+xDocSh = saveAndReload(xDocSh.get(), FORMAT_XLSX);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// TODO: also test A1, which contains a UNC reference to
\\localhost\share\lookupsource.xlsx,
+// but currently looses "localhost" part when normalized in INetURLObject,
becoming
+// file:///share/lookupsource.xlsx - which is incorrect, since it points
to local filesystem
+// and not to Windows network share.
+
+#if defined LINUX // following INetURLObject::setAbsURIRef
+#define TDF118990_SCHEME "smb:"
+#else // for Windows and macOS
+#define TDF118990_SCHEME "file:"
+#endif
+
+ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0, 1, 0),
+ "VLOOKUP(B1,'" TDF118990_SCHEME
"//192.168.1.1/share/lookupsource.xlsx'#$Sheet1.A1:B5,2)",
+ "Wrong Windows share (using host IP) URL in A2");
+
+ASSERT_FORMULA_EQUAL(rDoc, ScAddress(0, 2, 0),
+ "VLOOKUP(B1,'" TDF118990_SCHEME
"//NETWORKHOST/share/lookupsource.xlsx'#$Sheet1.A1:B5,2)",
+ "Wrong Windows share (using hostname) URL in A3");
+
+xDocSh->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 29523aa81c9d..b79815d67781 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -459,7 +459,8 @@ OUString XclExpHyperlink::BuildFileName(
sal_uInt16& rnLevel, bool& rbRel, const OUString& rUrl, const
XclExpRoot& rRoot, bool bEncoded )
{
INetURLObject aURLObject( rUrl );
-OUString aDosName( bEncoded ? aURLObject.GetURLPath() :
aURLObject.getFSysPath( FSysStyle::Dos ) );
+OUString aDosName(bEncoded ?
aURLObject.GetMainURL(INetURLObject::DecodeMechanism::ToIUri)
+ : aURLObject.getFSysPath(FSysStyle::Dos));
rnLevel = 0;
rbRel = rRoot.IsRelUrl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6a55e18aceb88b3bced892fdecb07c7c17cf077d Author: Matthias Seidel AuthorDate: Sun Aug 19 19:34:05 2018 + Commit: Matthias Seidel CommitDate: Sun Aug 19 19:34:05 2018 + Updated excludes See: https://ci.apache.org/projects/openoffice/rat-output.html diff --git a/rat-excludes b/rat-excludes index 9566d2ab46de..7f776df91c21 100644 --- a/rat-excludes +++ b/rat-excludes @@ -884,7 +884,6 @@ main/setup_native/source/packinfo/linuxcopyrightfile main/setup_native/source/packinfo/private1copyrightfile main/setup_native/source/packinfo/solariscopyrightfile main/sfx2/workben/custompanel/delzip -main/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF main/smoketestdoc/com/sun/star/comp/smoketest/delzip main/solenv/ant/manifest.empty main/solenv/bin/genmap @@ -961,6 +960,7 @@ main/xmerge/source/activesync/XMergeFilter.h main/xmerge/source/activesync/XMergeSync.h main/xmerge/source/activesync/resource.h main/xmerge/source/activesync/stdafx.h +main/xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF main/xmlhelp/source/com/sun/star/help/MANIFEST.MF main/xmlhelp/util/delzip main/xmlsecurity/test_docs/CAs/Root_1/demoCA/crl/DO_NOT_CREATE_A_CRL @@ -1030,6 +1030,7 @@ main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/crl/DO_NOT_INSTALL_THIS_CR main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/crlnumber main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/serial main/xmlsecurity/tools/demo/manifest +test/smoketestdoc/MANIFEST.MF test/testassistant/META-INF/MANIFEST.MF test/testassistant.feature/.project test/testassistant.feature/build.properties ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f05b0a6aaf8af5d78f9cad8bb953228cb0ce09f1 Author: Stanislav Horacek AuthorDate: Sun Aug 19 16:30:10 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Aug 20 02:49:34 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - table is not in Insert menu anymore, use another example Change-Id: Iab50a4452f5b50eade881119f316410a03611265 Reviewed-on: https://gerrit.libreoffice.org/59305 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 324cbbd8b4e6..5c78f56bc417 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 324cbbd8b4e6769550d91f9cefc682f05b67e47f +Subproject commit 5c78f56bc417b0be078f84303ab4895c9e1f7daf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/filter include/svx
include/filter/msfilter/escherex.hxx |3 ---
include/svx/msdffdef.hxx |1 -
2 files changed, 4 deletions(-)
New commits:
commit b5f483cb907e3fe43bfa03c147dfb82ec645e668
Author: Johnny_M
AuthorDate: Sat Aug 18 10:39:01 2018 +0200
Commit: Michael Stahl
CommitDate: Sun Aug 19 18:49:16 2018 +0200
Remove comment leftovers
This is a follow-up to commit 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 ,
where the respective defines were removed, but their comments stayed
behind.
Change-Id: I205c5a36e0cd13e67293215c0be730ac7b17f111
Reviewed-on: https://gerrit.libreoffice.org/59284
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 63219bebde51..fe66f986fea0 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -411,16 +411,13 @@ enum MSOPATHTYPE
#define ESCHER_Prop_shadowOffsetX 517 /* LONG
Offset shadow */
#define ESCHER_Prop_shadowOffsetY 518 /* LONG
Offset shadow */
#define ESCHER_Prop_fshadowObscured 575 /* bool
Excel5-style shadow */
-// PerspectiveStyle
// 3D Object
#define ESCHER_Prop_fc3DLightFace 703 /* bool
*/
-// 3D Style
// Shape
#define ESCHER_Prop_hspMaster 769 /* MSOHSP
master shape*/
#define ESCHER_Prop_cxstyle 771 /* MSOCXSTYLE Type
of connector */
#define ESCHER_Prop_bWMode 772 /* ESCHERwMode
Settings for modifications to */
#define ESCHER_Prop_fBackground 831 /* boolIf
sal_True, this is the background shape. */
-// Callout
// GroupShape
#define ESCHER_Prop_wzName 896 /* WCHAR* Shape
Name (present only if explicitly set)
*/
#define ESCHER_Prop_wzDescription 897 /* WCHAR*
alternate text
*/
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 238ab5280fd8..4a4bd1249ce4 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -268,7 +268,6 @@ enum DFF_TextHeader {
#define DFF_Prop_tableRowProperties 928 // LONG*
#define DFF_Prop_fHidden 958 // sal_Bool Do
not display
#define DFF_Prop_fPrint 959 // sal_Bool
Print this shape
-// entsprechende BitFlags
// properties of the second property set
#define DFF_Prop_metroBlob 937 // XML ZipPackage*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes |1 - 1 file changed, 1 deletion(-) New commits: commit 4d45eb6b01f7cdc4d9d8ca7b9c5d7231360e89a6 Author: Matthias Seidel AuthorDate: Sun Aug 19 20:13:27 2018 + Commit: Matthias Seidel CommitDate: Sun Aug 19 20:13:27 2018 + Updated excludes (forgot to delete one entry) See: https://ci.apache.org/projects/openoffice/rat-output.html diff --git a/rat-excludes b/rat-excludes index 7f776df91c21..15524ff85764 100644 --- a/rat-excludes +++ b/rat-excludes @@ -961,7 +961,6 @@ main/xmerge/source/activesync/XMergeSync.h main/xmerge/source/activesync/resource.h main/xmerge/source/activesync/stdafx.h main/xmlhelp/java/LuceneHelpWrapper/MANIFEST.MF -main/xmlhelp/source/com/sun/star/help/MANIFEST.MF main/xmlhelp/util/delzip main/xmlsecurity/test_docs/CAs/Root_1/demoCA/crl/DO_NOT_CREATE_A_CRL main/xmlsecurity/test_docs/CAs/Root_1/demoCA/crlnumber ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/controls/grid/defaultgriddatamodel.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit e020cc88161ca5f3b35b629da627a530cb618532 Author: Takeshi Abe AuthorDate: Fri Jul 13 14:40:07 2018 +0900 Commit: Noel Grandin CommitDate: Sun Aug 19 14:48:27 2018 +0200 toolkit: a micro-optimization taking min and max simulnateously Change-Id: I161dd318b1e5729ef0b8c55a41c0eddc681b153f Reviewed-on: https://gerrit.libreoffice.org/57612 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 4a25f01237e0..e613878a3166 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -404,8 +404,9 @@ private: rDataRow[ columnIndex ].first = i_values[ col ]; } -sal_Int32 const firstAffectedColumn = *::std::min_element( i_columnIndexes.begin(), i_columnIndexes.end() ); -sal_Int32 const lastAffectedColumn = *::std::max_element( i_columnIndexes.begin(), i_columnIndexes.end() ); +auto aPair = ::std::minmax_element( i_columnIndexes.begin(), i_columnIndexes.end() ); +sal_Int32 const firstAffectedColumn = *aPair.first; +sal_Int32 const lastAffectedColumn = *aPair.second; broadcast( GridDataEvent( *this, firstAffectedColumn, lastAffectedColumn, i_rowIndex, i_rowIndex ), &XGridDataListener::dataChanged, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source connectivity/source sw/source
basic/source/runtime/runtime.cxx |4 ++--
connectivity/source/commontools/TSortIndex.cxx |2 +-
sw/source/core/fields/docufld.cxx |4 ++--
sw/source/filter/ww8/ww8par6.cxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7a0f3d16e35dbc890734e263432afc8da7b4f777
Author: Johnny_M
AuthorDate: Sat Aug 18 11:32:25 2018 +0200
Commit: Michael Stahl
CommitDate: Sun Aug 19 18:48:44 2018 +0200
Translate German comments
Change-Id: I1a4e41ccd3e3eb829419c45edd0417776a73c3ae
Reviewed-on: https://gerrit.libreoffice.org/59285
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 107124d98224..bb4d933445b3 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -231,11 +231,11 @@ SbiRuntime::pStep2 SbiRuntime::aStep2[] = {// all opcodes
with two operands
&SbiRuntime::StepFIND, // load (+StringID+Typ)
&SbiRuntime::StepELEM, // load element (+StringID+Typ)
&SbiRuntime::StepPARAM, // Parameter (+Offset+Typ)
-// Verzweigen
+// branches
&SbiRuntime::StepCALL, // Declare-Call (+StringID+Typ)
&SbiRuntime::StepCALLC, // CDecl-Declare-Call (+StringID+Typ)
&SbiRuntime::StepCASEIS,// Case-Test (+Test-Opcode+False-Target)
-// Verwaltung
+// management
&SbiRuntime::StepSTMNT, // beginning of a statement (+Line+Col)
// E/A
&SbiRuntime::StepOPEN, // (+StreamMode+Flags)
diff --git a/connectivity/source/commontools/TSortIndex.cxx
b/connectivity/source/commontools/TSortIndex.cxx
index 0f06aa11e625..0658c517a07d 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -117,7 +117,7 @@ void OSortIndex::AddKeyValue(std::unique_ptr
pKeyValue)
void OSortIndex::Freeze()
{
OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!");
-// Sortierung:
+// sorting:
if (m_aKeyType[0] != OKeyType::NONE)
// we will sort ourself when the first keyType say so
std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 5cf8372d9794..de055bb4cfa2 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -962,7 +962,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub,
sal_uInt32 nFormat,
}
else
{
-// Numberformatter anwerfen!
+// start the number formatter
double fVal = SwDateTimeField::GetDateTime( GetDoc(),
aDate);
aStr = ExpandValue(fVal, nFormat, nLang);
@@ -978,7 +978,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub,
sal_uInt32 nFormat,
}
else
{
-// Numberformatter anwerfen!
+// start the number formatter
double fVal = SwDateTimeField::GetDateTime( GetDoc(),
aDate);
aStr = ExpandValue(fVal, nFormat, nLang);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0d30a4f77832..cfdef0182114 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4738,7 +4738,7 @@ void SwWW8Shade::SetShade(Color nFore, Color nBack,
sal_uInt16 nIndex)
if (nFore == COL_AUTO)
nFore = COL_BLACK;
-//NO auto for shading so background: Auto = Weiss
+//NO auto for shading so background: Auto = White
Color nUseBack = nBack;
if (nUseBack == COL_AUTO)
nUseBack = COL_WHITE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sw/source
compilerplugins/clang/singlevalfields.results |2 +-
sw/source/core/inc/UndoSort.hxx |4 ++--
sw/source/core/undo/unsort.cxx|2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b2f52f4372e65b9af0e6fda588ca8b49e370ec0c
Author: Johnny_M
AuthorDate: Sat Aug 18 11:44:18 2018 +0200
Commit: Michael Stahl
CommitDate: Sun Aug 19 18:30:44 2018 +0200
Translate German variable names
Change-Id: I6b5fb91cbf32ce082fb77989e1b9ac5e8ecfe438
Reviewed-on: https://gerrit.libreoffice.org/59283
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/compilerplugins/clang/singlevalfields.results
b/compilerplugins/clang/singlevalfields.results
index 34b3d39416e8..6ec49ca86374 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -116,7 +116,7 @@ sw/source/core/inc/frmtool.hxx:260
SwBorderAttrs m_bBorderDist
1
sw/source/core/inc/UndoSort.hxx:38
-SwSortUndoElement::(anonymous union)::(anonymous) nKenn
+SwSortUndoElement::(anonymous union)::(anonymous) nID
4294967295
sw/source/filter/html/htmlcss1.cxx:77
SwCSS1ItemIds nFormatBreak
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 293d6a7ae0ae..167aaa4ef625 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -35,7 +35,7 @@ struct SwSortUndoElement
{
union {
struct {
-sal_uLong nKenn;
+sal_uLong nID;
sal_uLong nSource, nTarget;
} TXT;
struct {
@@ -52,7 +52,7 @@ struct SwSortUndoElement
{
SORT_TXT_TBL.TXT.nSource = nS;
SORT_TXT_TBL.TXT.nTarget = nT;
-SORT_TXT_TBL.TXT.nKenn = 0x;
+SORT_TXT_TBL.TXT.nID = 0x;
}
~SwSortUndoElement();
};
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index e70ad166311f..2b2bc5b407f8 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -35,7 +35,7 @@
SwSortUndoElement::~SwSortUndoElement()
{
// are there string pointers saved?
-if( 0x != SORT_TXT_TBL.TXT.nKenn ) // Kenn(ung) = identifier
+if( 0x != SORT_TXT_TBL.TXT.nID )
{
delete SORT_TXT_TBL.TBL.pSource;
delete SORT_TXT_TBL.TBL.pTarget;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
