[Libreoffice-commits] core.git: package/source
package/source/zipapi/XBufferedThreadedStream.cxx |6 +++---
package/source/zipapi/XBufferedThreadedStream.hxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit dacc1b40df67d154c96b256b0d920460f38c3d11
Author: Caolán McNamara
AuthorDate: Sat Jul 28 16:33:22 2018 +0100
Commit: Stephan Bergmann
CommitDate: Tue Jul 31 08:40:49 2018 +0200
ofz#9597 rethrown IOException not caught by catch IOException
under google oss-fuzz, asan + clang version 6.0.0 (trunk 315613)
when using our own exception thrower, but builtin C++11 support works
also, ofz#9266, ofz#9591, ofz#9597, ofz#9622, etc
Change-Id: I29c692da880b49268284de2f61be07fa94f33bc6
Reviewed-on: https://gerrit.libreoffice.org/58223
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/package/source/zipapi/XBufferedThreadedStream.cxx
b/package/source/zipapi/XBufferedThreadedStream.cxx
index 24c68cfc1fe2..71683cfaf590 100644
--- a/package/source/zipapi/XBufferedThreadedStream.cxx
+++ b/package/source/zipapi/XBufferedThreadedStream.cxx
@@ -32,7 +32,7 @@ private:
catch (const css::uno::Exception &e)
{
SAL_WARN("package", "Unexpected " << e );
-mxStream.saveException(cppu::getCaughtException());
+mxStream.saveException(std::current_exception());
}
mxStream.setTerminateThread();
@@ -107,8 +107,8 @@ const Buffer& XBufferedThreadedStream::getNextBlock()
if( maPendingBuffers.empty() )
{
maInUseBuffer = Buffer();
-if (maSavedException.hasValue())
-cppu::throwException(maSavedException);
+if (maSavedException)
+std::rethrow_exception(maSavedException);
}
else
{
diff --git a/package/source/zipapi/XBufferedThreadedStream.hxx
b/package/source/zipapi/XBufferedThreadedStream.hxx
index b99864fbb268..5feb6e4252e0 100644
--- a/package/source/zipapi/XBufferedThreadedStream.hxx
+++ b/package/source/zipapi/XBufferedThreadedStream.hxx
@@ -37,7 +37,7 @@ private:
std::condition_variable maBufferProduceResume;
bool mbTerminateThread; /// indicates the
failure of one of the threads
-css::uno::Any maSavedException; /// exception
caught during unzipping is saved to be thrown during reading
+std::exception_ptr maSavedException;/// exception
caught during unzipping is saved to be thrown during reading
static const size_t nBufferLowWater = 2;
static const size_t nBufferHighWater = 4;
@@ -66,7 +66,7 @@ public:
void produce();
void setTerminateThread();
-void saveException(const css::uno::Any &rAny) { maSavedException = rAny; }
+void saveException(std::exception_ptr exception) { maSavedException =
exception; }
// XInputStream
virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >&
aData, sal_Int32 nBytesToRead ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 32 ---
writerfilter/source/dmapper/StyleSheetTable.cxx | 18
writerfilter/source/dmapper/StyleSheetTable.hxx |6 ++
3 files changed, 24 insertions(+), 32 deletions(-)
New commits:
commit 108d4a6391eee22642fcb18ba429c2c9f4d8c818
Author: Justin Luth
AuthorDate: Sat Jul 28 22:17:36 2018 +0300
Commit: Justin Luth
CommitDate: Tue Jul 31 07:53:10 2018 +0200
writerfilter: create StyleSheetEntry::GetMergedInheritedProperties
This is a useful function. Make it more widely available.
Change-Id: I729c908eaf26e17c16198d14dcb89069ec6ca70c
Reviewed-on: https://gerrit.libreoffice.org/58261
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 2e9bfa959249..3c4bb61457e7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -78,36 +78,6 @@ void DomainMapperTableHandler::startTable(const
TablePropertyMapPtr& pProps)
#endif
}
-
-PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const
StyleSheetEntryPtr& rStyleSheet, const StyleSheetTablePtr& pStyleSheetTable)
-{
-PropertyMapPtr pRet;
-
-if (!rStyleSheet)
-return pRet;
-
-if(!rStyleSheet->sBaseStyleIdentifier.isEmpty())
-{
-const StyleSheetEntryPtr pParentStyleSheet =
pStyleSheetTable->FindStyleSheetByISTD(rStyleSheet->sBaseStyleIdentifier);
-//a loop in the style hierarchy, bail out
-if (pParentStyleSheet == rStyleSheet)
-return pRet;
-
-pRet = lcl_SearchParentStyleSheetAndMergeProperties(
pParentStyleSheet, pStyleSheetTable );
-}
-else
-{
-pRet = new PropertyMap;
-}
-
-if (pRet)
-{
-pRet->InsertProps(rStyleSheet->pProperties);
-}
-
-return pRet;
-}
-
void lcl_mergeBorder( PropertyIds nId, const PropertyMapPtr& pOrig, const
PropertyMapPtr& pDest )
{
boost::optional pOrigVal = pOrig->getProperty(nId);
@@ -388,7 +358,7 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
m_aTableProperties = pEmptyProps;
-PropertyMapPtr pMergedProperties =
lcl_SearchParentStyleSheetAndMergeProperties(pStyleSheet, pStyleSheetTable);
+PropertyMapPtr pMergedProperties =
pStyleSheet->GetMergedInheritedProperties(pStyleSheetTable);
table::BorderLine2 aBorderLine;
TableInfo rStyleInfo;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 8e71f5f28f2d..95d645a08bb1 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -161,6 +161,24 @@ void StyleSheetEntry::AppendInteropGrabBag(const
beans::PropertyValue& rValue)
m_aInteropGrabBag.push_back(rValue);
}
+PropertyMapPtr StyleSheetEntry::GetMergedInheritedProperties(const
StyleSheetTablePtr& pStyleSheetTable)
+{
+PropertyMapPtr pRet;
+if ( pStyleSheetTable && !sBaseStyleIdentifier.isEmpty() &&
sBaseStyleIdentifier != sStyleIdentifierD )
+{
+const StyleSheetEntryPtr pParentStyleSheet =
pStyleSheetTable->FindStyleSheetByISTD(sBaseStyleIdentifier);
+if ( pParentStyleSheet )
+pRet =
pParentStyleSheet->GetMergedInheritedProperties(pStyleSheetTable);
+}
+
+if ( !pRet )
+pRet = new PropertyMap;
+
+pRet->InsertProps(pProperties);
+
+return pRet;
+}
+
void lcl_mergeProps( const PropertyMapPtr& pToFill, const PropertyMapPtr&
pToAdd, TblStyleType nStyleId )
{
static const PropertyIds pPropsToCheck[] =
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index a5e1df2685d6..686779acbd71 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -47,6 +47,8 @@ enum StyleType
STYLE_TYPE_TABLE,
STYLE_TYPE_LIST
};
+class StyleSheetTable;
+typedef tools::SvRef StyleSheetTablePtr;
struct StyleSheetTable_Impl;
class StyleSheetEntry : public virtual SvRefBase
@@ -71,6 +73,9 @@ public:
css::beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles,
has a name.
css::beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing
styles, just a list of properties.
+// Get all properties, merged with the all of the parent's properties
+PropertyMapPtr GetMergedInheritedProperties(const StyleSheetTablePtr&
pStyleSheetTable);
+
StyleSheetEntry();
virtual ~StyleSheetEntry() override;
};
@@ -113,7 +118,6 @@ private:
void applyDefaults(bool bParaProperties);
};
-typedef tools::SvRef< StyleSheetTable >StyleSheetTablePtr;
class TableStyleSheetEntry :
Windows Debug builds failure: 'DbgGUIInitSolarMutexCheck': identifier not found
Noel, Ever since: https://cgit.freedesktop.org/libreoffice/core/commit/?id=9cceba9a make DBG_TESTSOLARMUTEX available in assert builds Windows builds with "--enable-debug" are failing with the following error: D:/core/vcl/source/app/svmain.cxx(371): error C3861: 'DbgGUIInitSolarMutexCheck': identifier not found make[1]: *** [D:/core/solenv/gbuild/LinkTarget.mk:293: D:/core/workdir/CxxObject/vcl/source/app/svmain.o] Error 2 make[1]: *** Waiting for unfinished jobs make: *** [Makefile:286: build] Error 2 Should your change be limited to Linux or something else going on here? -Luke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 64-bit Windows build failure: 'this' pointer for member, may not be aligned 8 as expected by the constructor
Caolán, Sorry to report that: https://cgit.freedesktop.org/libreoffice/core/commit/?id=397c2e67 Does not clear the warning. The build is failing with the same error. >From tinderbox Win-x86_64_42: https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1533004201.27570 32-bit release builds are succeeding. -Luke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/dlg/copydlg.src |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2bffe2d4615ee36a13de375026dbb3283a94f102
Author: Matthias Seidel
AuthorDate: Tue Jul 31 00:09:01 2018 +
Commit: Matthias Seidel
CommitDate: Tue Jul 31 00:09:01 2018 +
Cleaned up resource file for Duplicate.
Removed entry for MASKCOLOR.
diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
index e547683631d4..ee3c72d67f93 100644
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
@@ -82,8 +82,7 @@ ModalDialog DLG_COPY
Size = MAP_APPFONT ( 14, 14 ) ;
ButtonImage = Image
{
-ImageBitmap = Bitmap { File = "pipette.bmp" ; };
-MaskColor = IMAGE_MASK_STDCOLOR;
+ImageBitmap = Bitmap { File = "pipette.png" ; };
};
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Values from Selection" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
R-tree to be available in mdds
Hey there, I'm currently working toward getting the next version of mdds [1] released. One highlight of the next release is the inclusion of R-tree. For those of you unfamiliar with R-tree, it is a data structure known to be optimal for indexing multi-dimensional spatial data, and is heavily used in e.g. storing 2D/2D map data and shape data with bounding boxes. The one being implemented in mdds is a variant of R-tree known as R*-tree [2]. I can think of many areas where R-tree could be used inside the libreoffice code base, but one area I am particularly interested in is formula dependency tracking, especially those that involve cell ranges. I suspect that, if implemented correctly, the use of R-tree could improve the query speed and also potentially minimize the complexity of the range-based listener-broadcaster handling on the libreoffice side (by moving the complexity of managing the data structure into mdds). Also, by using R-tree to manage formula dependency data, we could in theory merge all of cell-to-cell, cell-to-range, range-to-cell and range-to-range dependency tracking into a single data structure, which to me is a very attractive proposition. Now, this all sounds good, but I'm fully aware that I'm being overly optimistic not to mention biased, and it's entirely possible that I'm wrong, and using R-tree in range-based dependency tracking would end up in more pain and less gain. So, my current plan is to experiment this idea of mine in the ixion library [3] first, then if it works well there, we can re-visit it here perhaps with more confidence. I just wanted to throw this idea on this list early, and see what you guys think. Thoughts? Kohei [1] https://gitlab.com/mdds/mdds [2] https://en.wikipedia.org/wiki/R*_tree [3] https://gitlab.com/ixion/ixion -- Kohei Yoshida, LibreOffice Calc volunteer hacker ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/customize/acccfg.src | 151 +++-
1 file changed, 44 insertions(+), 107 deletions(-)
New commits:
commit d4ab4fc277752d0bfc76ab72ed314c8b44877577
Author: Matthias Seidel
AuthorDate: Mon Jul 30 22:53:46 2018 +
Commit: Matthias Seidel
CommitDate: Mon Jul 30 22:53:46 2018 +
Cleaned up resource file.
Removed entries for MASKCOLOR.
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 6815fee988d4..8949729428ca 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -20,14 +20,11 @@
*/
- // include ---
+// include ---
#include "helpid.hrc"
#include "cuires.hrc"
#include "acccfg.hrc"
-#define MASKCOLOR MaskColor = \
-Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
-
#define PUSHBUTTON_TEXT_SAVE \
Text [ en-US ] = "~Save..." ; \
@@ -55,70 +52,70 @@
#define GROUPBOX_TEXT_FUNCTIONS \
Text [ en-US ] = "Functions" ; \
- // TP_CONFIG_ACCEL ---
+// TP_CONFIG_ACCEL ---
TabPage RID_SVXPAGE_KEYBOARD
{
HelpId = HID_CONFIG_ACCEL ;
Hide = TRUE ;
-Size = MAP_APPFONT ( 273 , 258 ) ;
+Size = MAP_APPFONT ( 273, 258 ) ;
RadioButton RB_OFFICE
{
HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
-Pos = MAP_APPFONT ( 192 , 6 ) ;
-Size = MAP_APPFONT ( 75 , 10 ) ;
+Pos = MAP_APPFONT ( 192, 6 ) ;
+Size = MAP_APPFONT ( 75, 10 ) ;
Text = "%PRODUCTNAME" ;
};
RadioButton RB_MODULE
{
HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
-Pos = MAP_APPFONT ( 192 , 19 ) ;
-Size = MAP_APPFONT ( 75 , 10 ) ;
+Pos = MAP_APPFONT ( 192, 19 ) ;
+Size = MAP_APPFONT ( 75, 10 ) ;
Text = "$(MODULE)" ;
};
PushButton BTN_ACC_CHANGE
{
HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
-Pos = MAP_APPFONT ( 192 , 35 ) ;
-Size = MAP_APPFONT ( 75 , 14 ) ;
+Pos = MAP_APPFONT ( 192, 35 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
TabStop = TRUE ;
PUSHBUTTON_TEXT_CHANGE
};
PushButton BTN_ACC_REMOVE
{
HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
-Pos = MAP_APPFONT ( 192 , 52 ) ;
-Size = MAP_APPFONT ( 75 , 14 ) ;
+Pos = MAP_APPFONT ( 192, 52 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
PUSHBUTTON_TEXT_REMOVE
};
FixedLine GRP_ACC_KEYBOARD
{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 180 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 180, 8 ) ;
Group = TRUE ;
Text [ en-US ] = "Shortcut keys";
};
Control BOX_ACC_ENTRIES
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 174 , 120 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 174, 120 ) ;
TabStop = TRUE ;
Group = TRUE ;
HelpId = HID_ACCELCONFIG_LISTBOX ;
};
FixedLine GRP_ACC_FUNCTIONS
{
-Pos = MAP_APPFONT ( 6 , 140 ) ;
-Size = MAP_APPFONT ( 258 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 140 ) ;
+Size = MAP_APPFONT ( 258, 8 ) ;
Group = TRUE ;
GROUPBOX_TEXT_FUNCTIONS
};
FixedText TXT_ACC_GROUP
{
-Pos = MAP_APPFONT ( 12 , 151 ) ;
-Size = MAP_APPFONT ( 78 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 151 ) ;
+Size = MAP_APPFONT ( 78, 8 ) ;
Group = TRUE ;
Left = TRUE ;
FIXEDTEXT_TEXT_GROUP
@@ -126,45 +123,45 @@ TabPage RID_SVXPAGE_KEYBOARD
Control BOX_ACC_GROUP
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 161 ) ;
-Size = MAP_APPFONT ( 78 , 91 ) ;
+Pos = MAP_APPFONT ( 12, 161 ) ;
+Size = MAP_APPFONT ( 78, 91 ) ;
TabStop = TRUE ;
HelpId = HID_CONFIGGROUP_ACC_LISTBOX ;
};
FixedText TXT_ACC_FUNCTION
{
-Pos = MAP_APPFONT ( 93 , 151 ) ;
-Size = MAP_APPFONT ( 88 , 8 ) ;
+Pos = MAP_APPFONT ( 93, 151 ) ;
+Size = MAP_APPFONT ( 88, 8 ) ;
Left = TRUE ;
FIXEDTEXT_TEXT_FUNCTION
};
Control BOX_ACC_FUNCTION
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 93 , 161 ) ;
-Size = MAP_APPFONT ( 88 , 91 ) ;
+Pos = MAP_APPFONT ( 93, 161 ) ;
+Size = MAP_APPFONT ( 88, 91 ) ;
TabStop = TRUE ;
HelpId = HID_CONFIGFUNCTION_ACC_LISTBOX ;
};
FixedText TXT_ACC_KEY
{
-Pos = MAP_APPFONT ( 184 , 151 ) ;
-S
[Libreoffice-commits] core.git: include/vcl sc/source sd/source sfx2/source starmath/source svx/source sw/source vcl/source
include/vcl/uitest/eventdescription.hxx | 18 ++
include/vcl/uitest/logger.hxx | 11 +++-
sc/source/ui/view/gridwin.cxx | 17 ++
sc/source/ui/view/tabview3.cxx| 33
sd/source/ui/view/drviews1.cxx| 19 +++
sfx2/source/control/unoctitm.cxx |6 +-
sfx2/source/sidebar/SidebarController.cxx | 18 ++
starmath/source/ElementsDockingWindow.cxx | 22 +++-
svx/source/svdraw/svdmrkv.cxx | 22
sw/source/core/crsr/crsrsh.cxx| 19 +++
sw/source/uibase/uiview/viewmdi.cxx | 20 +++
sw/source/uibase/wrtsh/select.cxx | 23
vcl/source/uitest/logger.cxx | 81 +-
13 files changed, 302 insertions(+), 7 deletions(-)
New commits:
commit 7e65a0794b7c57210779bb9a6d1f2b2e49eb86e9
Author: Saurav Chirania
AuthorDate: Fri Jul 13 01:13:11 2018 +0530
Commit: Markus Mohrhard
CommitDate: Tue Jul 31 00:35:42 2018 +0200
uitest logger: log more events
Logging for the following:
1) Object Selection
2) Sidebar / Deck opening
3) Parameters of UNO commands
4) Element Selection (Math)
5) Set Zoom (Impress)
6) Calc -
a) Autofilter Launch
b) Select Cell / Range of cells
c) Switch table
7) Writer -
a) Goto page
b) Set Zoom
Change-Id: Ifc7f603f62d10cfd1062923ded68203e574aebb6
Reviewed-on: https://gerrit.libreoffice.org/57368
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/include/vcl/uitest/eventdescription.hxx
b/include/vcl/uitest/eventdescription.hxx
new file mode 100644
index ..7c5eec65b2a6
--- /dev/null
+++ b/include/vcl/uitest/eventdescription.hxx
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+struct EventDescription
+{
+OUString aKeyWord, aAction, aID, aParent;
+std::map aParameters;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 997bc3be866a..18fadd77aad2 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -11,6 +11,13 @@
#include
#include
+#include
+
+namespace com { namespace sun { namespace star {
+namespace beans { struct PropertyValue; }
+} } }
+
+struct EventDescription;
class UITEST_DLLPUBLIC UITestLogger
{
@@ -24,7 +31,7 @@ public:
UITestLogger();
-void logCommand(const OUString& rAction);
+void logCommand(const OUString& rAction, const
css::uno::Sequence& rArgs);
void logAction(VclPtr const & xUIElement, VclEventId nEvent);
@@ -32,6 +39,8 @@ public:
void logKeyInput(VclPtr const & xUIElement, const KeyEvent&
rEvent);
+void logEvent(const EventDescription& rDescription);
+
static UITestLogger& getInstance();
};
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9280eea07be7..6106ca423a7f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -140,6 +140,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -619,6 +621,19 @@ public:
}
};
+void collectUIInformation(const OUString& aRow, const OUString& aCol)
+{
+EventDescription aDescription;
+aDescription.aAction = "LAUNCH";
+aDescription.aID = "grid_window";
+aDescription.aParameters = {{"AUTOFILTER", ""},
+{"ROW", aRow}, {"COL", aCol}};
+aDescription.aParent = "MainWindow";
+aDescription.aKeyWord = "ScGridWinUIObject";
+
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
}
void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
@@ -705,6 +720,8 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
aConfig.mbRTL =
pViewData->GetDocument()->IsLayoutRTL(pViewData->GetTabNo());
mpAutoFilterPopup->setConfig(aConfig);
mpAutoFilterPopup->launch(aCellRect);
+
+collectUIInformation(OUString::number(nRow), OUString::number(nCol));
}
void ScGridWindow::RefreshAutoFilterButton(const ScAddress& rPos)
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 7030f1b31cdd..fe4292c7d4e3 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -30,6 +30,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -326,6 +328,22 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_NUMBER_THOUSANDS );
}
+namespace {
+
+void collectUIInformation(const std::map& aParameters)
+{
+EventDescription a
[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx| 102
++
chart2/qa/extras/data/docx/testChartTitlePropertiesBitmapFill.docx |binary
chart2/qa/extras/data/docx/testChartTitlePropertiesColorFill.docx|binary
chart2/qa/extras/data/docx/testChartTitlePropertiesGradientFill.docx |binary
chart2/qa/extras/data/pptx/testChartTitlePropertiesBitmapFill.pptx |binary
chart2/qa/extras/data/pptx/testChartTitlePropertiesColorFill.pptx|binary
chart2/qa/extras/data/pptx/testChartTitlePropertiesGradientFill.pptx |binary
chart2/qa/extras/data/xlsx/testChartTitlePropertiesBitmapFill.xlsx |binary
chart2/qa/extras/data/xlsx/testChartTitlePropertiesColorFill.xlsx|binary
chart2/qa/extras/data/xlsx/testChartTitlePropertiesGradientFill.xlsx |binary
include/oox/export/chartexport.hxx |1
oox/source/export/chartexport.cxx| 22 --
oox/source/export/drawingml.cxx |9
13 files changed, 116 insertions(+), 18 deletions(-)
New commits:
commit 051399740e41c6495ed362e78c63e0868bcd180c
Author: Balazs Varga
AuthorDate: Mon Jul 23 21:13:09 2018 +0200
Commit: Bartosz Kosiorek
CommitDate: Mon Jul 30 23:53:35 2018 +0200
tdf#108078 OOXML Export Chart shapes area fill properties
Verified with color, gradient, bitmap for:
Chart Title in DOCX, XLSX and PPTX.
Also verified with gradient, bitmap for
Chart Legend, Plot Area, Dataseries and Background
in DOCX, XLSX and PPTX.
Change-Id: I15d29f3ca2d75f45f612766b635d50a29d8551ae
Reviewed-on: https://gerrit.libreoffice.org/57880
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 2a0d7e5df1c4..25de7c1c3cc6 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -82,6 +82,9 @@ public:
void testDataLabelDoughnutChartDOCX();
void testDataLabelAreaChartDOCX();
void testDataLabelDefaultLineChartDOCX();
+void testChartTitlePropertiesColorFillDOCX();
+void testChartTitlePropertiesGradientFillDOCX();
+void testChartTitlePropertiesBitmapFillDOCX();
void testFdo83058dlblPos();
void testAutoTitleDelXLSX();
void testDispBlanksAsXLSX();
@@ -96,6 +99,9 @@ public:
void testTitleManualLayoutXLSX();
void testPlotAreaManualLayoutXLSX();
void testLegendManualLayoutXLSX();
+void testChartTitlePropertiesColorFillXLSX();
+void testChartTitlePropertiesGradientFillXLSX();
+void testChartTitlePropertiesBitmapFillXLSX();
void testAxisCharacterPropertiesXLSX();
void testTitleCharacterPropertiesXLSX();
void testPlotVisOnlyXLSX();
@@ -107,6 +113,9 @@ public:
void testCustomDataLabel();
void testCustomDataLabelMultipleSeries();
void testNumberFormatExportPPTX();
+void testChartTitlePropertiesColorFillPPTX();
+void testChartTitlePropertiesGradientFillPPTX();
+void testChartTitlePropertiesBitmapFillPPTX();
void testTdf116163();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
@@ -152,6 +161,9 @@ public:
CPPUNIT_TEST(testDataLabelDoughnutChartDOCX);
CPPUNIT_TEST(testDataLabelAreaChartDOCX);
CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX);
+CPPUNIT_TEST(testChartTitlePropertiesColorFillDOCX);
+CPPUNIT_TEST(testChartTitlePropertiesGradientFillDOCX);
+CPPUNIT_TEST(testChartTitlePropertiesBitmapFillDOCX);
CPPUNIT_TEST(testFdo83058dlblPos);
CPPUNIT_TEST(testAutoTitleDelXLSX);
CPPUNIT_TEST(testDispBlanksAsXLSX);
@@ -166,6 +178,9 @@ public:
CPPUNIT_TEST(testTitleManualLayoutXLSX);
CPPUNIT_TEST(testPlotAreaManualLayoutXLSX);
CPPUNIT_TEST(testLegendManualLayoutXLSX);
+CPPUNIT_TEST(testChartTitlePropertiesColorFillXLSX);
+CPPUNIT_TEST(testChartTitlePropertiesGradientFillXLSX);
+CPPUNIT_TEST(testChartTitlePropertiesBitmapFillXLSX);
CPPUNIT_TEST(testAxisCharacterPropertiesXLSX);
CPPUNIT_TEST(testTitleCharacterPropertiesXLSX);
CPPUNIT_TEST(testPlotVisOnlyXLSX);
@@ -177,6 +192,9 @@ public:
CPPUNIT_TEST(testCustomDataLabel);
CPPUNIT_TEST(testCustomDataLabelMultipleSeries);
CPPUNIT_TEST(testNumberFormatExportPPTX);
+CPPUNIT_TEST(testChartTitlePropertiesColorFillPPTX);
+CPPUNIT_TEST(testChartTitlePropertiesGradientFillPPTX);
+CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX);
CPPUNIT_TEST(testTdf116163);
CPPUNIT_TEST_SUITE_END();
@@ -1051,6 +1069,34 @@ void
Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Line chart's default label placement
should be 'right'.", chart::DataLabelPlacement::RIGHT, nLabelPlacement );
}
+void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
+{
+load("/chart2/qa/extras/data/docx/",
"testChartTitlePropertiesColorFill.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - 7 commits - loleaflet/po scripts/untranslated.py
loleaflet/po/ui-de.po| 16 ++--
loleaflet/po/ui-es.po| 16 ++--
loleaflet/po/ui-fr.po| 16 ++--
loleaflet/po/ui-it.po| 16 ++--
loleaflet/po/ui-pt.po| 16 ++--
loleaflet/po/ui-pt_BR.po | 16 ++--
scripts/untranslated.py | 156 +++
7 files changed, 204 insertions(+), 48 deletions(-)
New commits:
commit 550dc9c1dd5bbcca2a7e4a8962758fc45132c713
Author: Andras Timar
AuthorDate: Mon Jul 30 23:44:27 2018 +0200
Commit: Andras Timar
CommitDate: Mon Jul 30 23:44:27 2018 +0200
untranslated.py - a helper script to list untranslated strings for a given
language
Change-Id: I44d5102fbe3ca319d5a4671a91957353c5357cda
diff --git a/scripts/untranslated.py b/scripts/untranslated.py
new file mode 100755
index 0..78d377f6f
--- /dev/null
+++ b/scripts/untranslated.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import os
+import polib
+import sys
+import itertools
+import re
+
+def usageAndExit():
+message = """usage: {program} online_dir lo_translations_dir lang
+
+Prints en-US strings that do not have translations in the specified language.
+
+"""
+print(message.format(program = os.path.basename(sys.argv[0])))
+exit(1)
+
+# extract translations from po files
+def extractFromPo(poFile, stringIds, untranslated):
+if not os.path.isfile(poFile):
+return
+
+po = polib.pofile(poFile, autodetect_encoding=False, encoding="utf-8",
wrapwidth=-1)
+
+for entry in itertools.chain(po.untranslated_entries(),
po.fuzzy_entries()):
+for stringId in stringIds:
+if stringId in entry.msgctxt:
+untranslated.append(entry.msgid)
+
+# Read the uno commands present in the unocommands.js for checking
+def parseUnocommandsJS(onlineDir):
+strings = {}
+
+f = open(onlineDir + '/loleaflet/unocommands.js', 'r')
+readingCommands = False
+for line in f:
+line = line.decode('utf-8')
+m = re.match(r"\t([^:]*):.*", line)
+if m:
+command = m.group(1)
+
+n = re.findall(r"_\('([^']*)'\)", line)
+if n:
+strings[command] = n
+
+return strings
+
+# Remove duplicates from list
+def uniq(seq):
+seen = set()
+seen_add = seen.add
+return [x for x in seq if not (x in seen or seen_add(x))]
+
+if __name__ == "__main__":
+if len(sys.argv) != 4:
+usageAndExit()
+
+onlineDir = sys.argv[1]
+translationsDir = sys.argv[2]
+lang = sys.argv[3]
+
+dir = translationsDir + '/source/'
+
+untranslated = []
+
+# LO Core strings
+
+# extract 'Clear formatting'
+poFile = dir + lang + '/svx/source/tbxctrls.po'
+extractFromPo(poFile, ["RID_SVXSTR_CLEARFORM"], untranslated)
+
+# extract some status bar strings
+poFile = dir + lang + '/svx/source/stbctrls.po'
+stringIds = ["RID_SVXMENU_SELECTION", "RID_SVXSTR_OVERWRITE_TEXT"]
+extractFromPo(poFile, stringIds, untranslated)
+poFile = dir + lang + '/sw/source/ui/shells.po'
+extractFromPo(poFile, ["STR_PAGE_COUNT"], untranslated)
+poFile = dir + lang + '/sw/source/ui/app.po'
+extractFromPo(poFile, ["STR_STATUSBAR_WORDCOUNT_NO_SELECTION"],
untranslated)
+
+# extract Writer style names
+poFile = dir + lang + '/sw/source/ui/utlui.po'
+extractFromPo(poFile, ["STR_POOL"], untranslated)
+
+# extract Impress/Draw style names
+poFile = dir + lang + '/sd/source/core.po'
+streingIds = ["STR_STANDARD_STYLESHEET_NAME", "STR_POOL",
"STR_PSEUDOSHEET"]
+extractFromPo(poFile, stringIds, untranslated)
+
+# extract Impress layout names and 'Slide %1 of %2'
+poFile = dir + lang + '/sd/source/ui/app.po'
+stringIds = ["STR_AUTOLAYOUT", "STR_AL_", "STR_SD_PAGE_COUNT"]
+extractFromPo(poFile, stringIds, untranslated)
+
+# extract Calc style names and strings for status bar
+poFile = dir + lang + '/sc/source/ui/src.po'
+stringIds = ["STR_STYLENAME_", "STR_FILTER_SELCOUNT",
"STR_ROWCOL_SELCOUNT", "STR_FUN_TEXT_", "STR_UNDO_INSERTCELLS",
"STR_TABLE_COUNT"]
+extractFromPo(poFile, stringIds, untranslated)
+
+# extract language names
+poFile = dir + lang + '/svtools/source/misc.po'
+extractFromPo(poFile, ["STR_ARR_SVT_LANGUAGE_TABLE"], untranslated)
+
+# extract 'None (Do not check spelling)'
+poFile = dir + lang + '/framework/source/classes.po'
+extractFromPo(poFile, ["STR_LANGSTATUS_NONE"], untranslated)
+
+# UNO command strings
+
+parsed = parseUnocommandsJS(onlineDir)
+keys = set(parsed.keys())
+
+poFile = dir + lang +
'/officecfg/registry/data/org/openoffice/Office/UI.po'
+
+po = polib.p
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/dist loleaflet/po
loleaflet/dist/l10n/locore/ko.json |3 +
loleaflet/dist/l10n/uno/ko.json| 105 ++---
loleaflet/po/ui-ko.po | 18 +++---
3 files changed, 109 insertions(+), 17 deletions(-)
New commits:
commit e59d6186804c12a352ec9c33966cf497d53a50e2
Author: Andras Timar
AuthorDate: Mon Jul 30 23:16:04 2018 +0200
Commit: Andras Timar
CommitDate: Mon Jul 30 23:16:04 2018 +0200
loleaflet: add missing Korean translations
Change-Id: I13a38740cecf16b914f6712d3552dbbd68f7d7b4
diff --git a/loleaflet/dist/l10n/locore/ko.json
b/loleaflet/dist/l10n/locore/ko.json
index 17c1f812e..853e738de 100644
--- a/loleaflet/dist/l10n/locore/ko.json
+++ b/loleaflet/dist/l10n/locore/ko.json
@@ -1,4 +1,5 @@
{
+"$1 of $2 records found":"$2 개 중 $1 레코드 발견",
"$1 rows, $2 columns selected":"%1 행, %2 열이 선택됨",
"%1 words, %2 characters":"단어 %1 개, 문자 %2 개",
"Adding selection":"추가 선택",
@@ -167,6 +168,7 @@
"Graphics":"그래픽",
"Greek":"그리스어",
"Greek, Ancient":"고대 그리스어",
+"Guarani (Paraguay)":"과라니어 (파라과이)",
"Gujarati":"구자라트어",
"HTML":"HTML",
"Haitian":"아이티어",
@@ -292,6 +294,7 @@
"Mari, Meadow":"마리어, 메도우",
"Max":"최대",
"Mbochi":"Mbochi",
+"Median":"중앙값",
"Min":"최소",
"Mongolian Cyrillic":"몽골어 키릴",
"Mongolian Mongolian":"몽골 몽골어",
diff --git a/loleaflet/dist/l10n/uno/ko.json b/loleaflet/dist/l10n/uno/ko.json
index af41186df..8f602a33e 100644
--- a/loleaflet/dist/l10n/uno/ko.json
+++ b/loleaflet/dist/l10n/uno/ko.json
@@ -1,5 +1,10 @@
{
+"Accept All":"모두 적용",
"Add Decimal Place":"소수점 추가",
+"Align Left":"왼쪽 맞춤",
+"Align Right":"오른쪽 맞춤",
+"Alig~n":"맞춤(~N)",
+"Anc~hor":"고정(~H)",
"Arrange":"배치",
"As C~haracter":"글꼴로서(~H)",
"AutoCorr~ect":"자동 고침(~E)",
@@ -11,29 +16,43 @@
"Bold":"굵게",
"Bottom":"아래",
"Center":"가운데",
+"Center Horizontally":"가로로 가운데 맞춤",
"Centered":"가운데 맞춤",
"Ce~lls...":"셀(~L)...",
"Character...":"글꼴...",
"Clear ~Direct Formatting":"직접 적용한 서식 지우기(~D)",
+"Columns R~ight":"열 오른쪽(~I)",
"Columns ~Left":"열 왼쪽(~L)",
"Columns ~Right":"열 오른쪽(~R)",
"Comme~nt":"설명(~N)",
-"Comm~ent":"주석(~e)",
+"Comm~ent":"주석(~E)",
"Continue previous numbering":"이전 번호 매기기 계속",
+"Copy Link Location":"링크 주소 복사",
"Co~lumns...":"단(~L)...",
+"Currency":"통화",
+"Current ~Index":"현재 색인 및 목차(~I)",
+"Cycle Case":"대소문자 전환",
+"C~ell":"셀(~E)",
+"Date":"날짜",
+"Decrease Indent":"내어쓰기",
+"Decrease Paragraph Spacing":"단락 여백 줄이기",
+"Decrease Size":"크기 감소",
"Delete All Comments":"모든 주석 삭제",
"Delete All Comments by This Author":"이 작성자의 모든 주석 삭제",
"Delete Column":"열 삭제",
"Delete Columns":"열 삭제",
"Delete Comment":"주석 삭제",
"Delete Decimal Place":"소수점 삭제",
-"Delete Page ~Break":"페이지 나누기 삭제(~B)",
+"Delete Page ~Break":"페이지 구분 삭제(~B)",
"Delete Row":"행 삭제",
"Delete Rows":"행 삭제",
"Delete index":"색인 삭제",
"Demote One Level":"한 수준 내리기",
"Demote One Level With Subpoints":"하위 항목과 함께 한 수준 내리기",
"Double Underline ":"이중 밑줄",
+"Duplicate ~Slide":"슬라이드 복제(~S)",
+"D~elete Slide":"슬라이드 삭제(~E)",
+"E~dit Style...":"스타일 편집(~D)...",
"Find & Rep~lace...":"찾기 및 바꾸기(~L)...",
"Find Next":"다음 찾기",
"Find Previous":"이전 찾기",
@@ -42,18 +61,41 @@
"For Paragraph":"단락",
"For Selection":"선택",
"For all Text":"문서",
+"Format as Currency":"형식: 통화",
+"Format as Date":"형식: 날짜",
+"Format as Number":"형식: 숫자",
+"Format as Percent":"형식: 백분율",
"Formatting Mark":"서식 기호",
"Forward One":"앞으로",
+"For~matting Marks":"기호에 서식 지정(~M)",
"F~ormat":"서식(~O)",
"F~ull Screen":"전체 화면(~U)",
"He~ader":"머리글(~A)",
+"He~ader and Footer":"머리글/바닥글(~A)",
"H~ide":"숨기기(~I)",
+"H~ide Columns":"열 숨기기(~I)",
"H~ide Rows":"행 숨기기(~I)",
"In ~Background":"배경(~B)",
-"Insert Column Break":"열 삽입",
+"Increase Indent":"들여쓰기",
+"Increase Paragraph Spacing":"단락 여백 늘이기",
+"Increase Size":"크기 증가",
+"Insert Chart":"차트 삽입",
+"Insert Column Break":"단 나누기 삽입",
+"Insert Column Left":"왼쪽에 열 삽입",
+"Insert Column Right":"오른쪽에 열 삽입",
+"Insert Columns ~Left":"왼쪽에 열 삽입(~L)",
+"Insert Columns ~Right":"오른쪽에 열 삽입(~R)",
+"Insert Comment":"주석 삽입",
"Insert Co~lumns":"열 삽입(~L)",
-"Insert Page ~Break":"페이지 나누기 삽입(~B)",
+"Insert Co~mment":"주석 삽입(~M)",
+"Insert Image":"이미지 삽입",
+"Insert Page ~Break":"페이지 구분 삽입(~B)",
+"Insert Row Above":"위에 행 삽입",
+"Insert Row Below":"아래에 행 삽입",
+"Insert Rows ~Above":"위에 행 삽입(~A)",
+"Insert Rows ~Below":"아래에 행 삽입(~B)",
"Insert Slide":"삽입 모드",
+"Insert Special Character":"특수 문자 삽입",
"Insert Unnumbered Entry":"번호없이 항목 삽입",
"Insert ~Rows":"행 삽입(~R)",
"Italic":"이탤릭체",
@@ -63,6 +105,9 @@
"Left":"왼쪽",
"Left-To-Right":"왼쪽에서 오른쪽으로",
"Line Spacing: 1":"행간: 1",
+"Line Spacing: 1.5":"행간: 1.5",
+"Line Spacing: 2":"행간: 2",
+"Lis~ts":"목록(~T)",
"L~ine...":"선(~I)...",
"Merge Cells":"셀 병합",
"More ~Filters":"더 많은 필터(~F)",
@@ -71,34 +116,47 @@
"Move Up":"위로",
"Move Up with Subpoints":"하위 단락과 함께 위로 이동",
"M~erge and Center Cells":"셀을 병합하고 가운데로(~E)",
+"Next":"다음",
"Next Page":"다음 페이지",
"No-width no ~break":"줄 바꾸지 않음(~B)",
"No-~width optional break":"보이지 않는 나누기(~W)",
"Non-br~eaking hyphen":"줄 바꿈하지 않는 하이픈(~E)",
+"Number":"숫자",
"Number Format: Currency
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cd-5.3-3.2' - source/ko
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 3 files changed, 422 insertions(+), 676 deletions(-) New commits: 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" "..CalcCommands.UserInterface.Commands..uno:DataDataPilotRun\n" "Label\n" "value.text" msgid "Pivot Table" -msgstr "피벗 테이블(~P)" +msgstr "피벗 테이블" #: CalcCommands.xcu msgctxt "" @@ -923,7 +914,7 @@ msgctxt "" "TooltipLabel\n" "value.text" msgid "Insert Pivot Table" -msgstr "" +msgstr "피벗 테이블 삽입" #: CalcCommands.xcu msgctxt "" @@ -932,10 +923,9 @@ msgctxt "" "PopupLabel\n" "value.text" msgid "~Edit Layout..." -msgstr "" +msgstr "레이아웃 편집(~E)..." #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Commands..uno:InsertPivotTable\n" @@ -1095,7 +1085,7 @@ msgctxt "" "ContextLabel\n" "value.text" msgid "Condition..." -msgstr "조건" +msgstr "조건..." #: CalcCommands.xcu msgctxt "" @@ -1212,7 +1202,7 @@ msgctxt "" "Label\n" "value.text" msgid "Cell Edit Mode" -msgstr "" +msgstr "셀 편집 모드" #: CalcCommands.xcu msgctxt "" @@ -1221,7 +1211,7 @@ msgctxt "" "Label\n" "value.text" msgid "Clear Contents" -m
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 524e3cb2a75bc1aeaf57376812b542ef80d25bec Author: Andras Timar AuthorDate: Mon Jul 30 23:04:34 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 30 23:04:39 2018 +0200 Update git submodules * Update translations from branch 'distro/collabora/cd-5.3-3.2' - Updated Korean translation Change-Id: I1a8af9ab040b58e809d79288edbe9a719666bee6 diff --git a/translations b/translations index 6c0d98fe8226..4164436c91ae 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6c0d98fe8226b018356aeec8c0ee7b7e6ab4fab1 +Subproject commit 4164436c91ae03b3bb4f64ae17a0b16a48746be5 ___ 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/8987eef40e549f5d4884a1be6b616496a761b761/ 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: svgio/source ucb/source uui/source xmloff/source xmlsecurity/source
svgio/source/svgreader/svgstylenode.cxx |6 ++--
ucb/source/ucp/cmis/cmis_url.cxx|8 +++---
uui/source/iahndl.cxx |9 +++
uui/source/secmacrowarnings.cxx |9 +++
xmloff/source/transform/StyleOASISTContext.cxx | 12 -
xmloff/source/transform/StyleOOoTContext.cxx| 12 -
xmlsecurity/source/framework/buffernode.cxx | 19 ---
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 25 ++--
8 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 83d8331581ab43cf35325ca674cf62d4ba5dc5ad
Author: Noel Grandin
AuthorDate: Mon Jul 30 15:24:30 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 30 21:04:40 2018 +0200
loplugin:stringloop in svgio..xmlsecurity
Change-Id: I1b2fe5674c8350690efc3d3219b9273cc61d5b0c
Reviewed-on: https://gerrit.libreoffice.org/58332
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svgio/source/svgreader/svgstylenode.cxx
b/svgio/source/svgreader/svgstylenode.cxx
index c3ca2a5c540b..c909586724f5 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -114,12 +114,12 @@ namespace svgio
if(aSelectorParts.size())
{
-OUString aConcatenatedSelector;
+OUStringBuffer aConcatenatedSelector;
// re-combine without spaces, create a unique name (for
now)
for(size_t a(0); a < aSelectorParts.size(); a++)
{
-aConcatenatedSelector += aSelectorParts[a];
+aConcatenatedSelector.append(aSelectorParts[a]);
}
// CssStyles in SVG are currently not completely
supported; the current idea for
@@ -138,7 +138,7 @@ namespace svgio
// SvgStyleAttributes will not do it) will have to be
adapted to make use of it.
// register new style at document for (evtl. concatenated)
stylename
-const_cast< SvgDocument&
>(getDocument()).addSvgStyleAttributesToMapper(aConcatenatedSelector,
rNewStyle);
+const_cast< SvgDocument&
>(getDocument()).addSvgStyleAttributesToMapper(aConcatenatedSelector.makeStringAndClear(),
rNewStyle);
}
}
}
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 8f5f9146d9eb..170c00cf9088 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -86,7 +86,7 @@ namespace cmis
if ( !m_sPath.isEmpty( ) )
{
sal_Int32 nPos = -1;
-OUString sEncodedPath;
+OUStringBuffer sEncodedPath;
do
{
sal_Int32 nStartPos = nPos + 1;
@@ -98,14 +98,14 @@ namespace cmis
if ( !sSegment.isEmpty( ) )
{
-sEncodedPath += "/" + rtl::Uri::encode( sSegment,
+sEncodedPath.append("/").append(rtl::Uri::encode( sSegment,
rtl_UriCharClassRelSegment,
rtl_UriEncodeKeepEscapes,
-RTL_TEXTENCODING_UTF8 );
+RTL_TEXTENCODING_UTF8 ));
}
}
while ( nPos != -1 );
-sUrl += sEncodedPath;
+sUrl += sEncodedPath.makeStringAndClear();
} else if ( !m_sId.isEmpty( ) )
{
sUrl += "#" + rtl::Uri::encode( m_sId,
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 16fd450ce05c..2aec43bf5979 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -413,15 +413,14 @@ UUIInteractionHelper::handleRequest_impl(
= aModSizeException.Names;
if ( sModules.getLength() )
{
-OUString aName;
+OUStringBuffer aName;
for ( sal_Int32 index=0; index< sModules.getLength(); ++index )
{
if ( index )
-aName += "," + sModules[index];
-else
-aName = sModules[index]; // 1st name
+aName.append(",");
+aName.append(sModules[index]);
}
-aArguments.push_back( aName );
+aArguments.push_back( aName.makeStringAndClear() );
}
handleErrorHandlerRequest( task::InteractionClassification_WARNING,
ERRCODE_UUI_IO_MODULESIZEEXCEEDED,
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 1233ced8c86c..3030ab92520a 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -160,16 +160,15 @@ void MacroWarnin
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source
vcl/source/window/decoview.cxx | 33 + 1 file changed, 29 insertions(+), 4 deletions(-) New commits: commit 47b820d17c5fcab61e8db0f19b9b9b357c29f97c Author: Thorsten Wagner AuthorDate: Mon Jun 25 23:53:58 2018 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jul 30 19:31:46 2018 +0200 Inaccurate symbol signs fixed (tdf#118381) Change-Id: I2af1d3e4c924acd2ae601f0b40fcf1b2be17c397 Reviewed-on: https://gerrit.libreoffice.org/56426 Tested-by: Christian Lohmaier Reviewed-by: Adolfo Jayme Barrientos Reviewed-on: https://gerrit.libreoffice.org/58328 Tested-by: Jenkins diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index e44eba19e727..f1dbc388162c 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -68,6 +68,7 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp const long n2 = nSide/2; const long n4 = (n2+1)/2; const long n8 = (n4+1)/2; +const long n16 = (n8+1)/2; const Point aCenter = nRect.Center(); switch ( eType ) @@ -79,6 +80,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustTop( 1 ); pDev->DrawLine( Point( aCenter.X()-i, nRect.Top() ), Point( aCenter.X()+i, nRect.Top() ) ); +pDev->DrawPixel( Point( aCenter.X()-i, nRect.Top() ) ); +pDev->DrawPixel( Point( aCenter.X()+i, nRect.Top() ) ); } pDev->DrawRect( tools::Rectangle( aCenter.X()-n8, nRect.Top()+1, aCenter.X()+n8, nRect.Bottom() ) ); @@ -91,6 +94,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustBottom( -1 ); pDev->DrawLine( Point( aCenter.X()-i, nRect.Bottom() ), Point( aCenter.X()+i, nRect.Bottom() ) ); +pDev->DrawPixel( Point( aCenter.X()-i, nRect.Bottom() ) ); +pDev->DrawPixel( Point( aCenter.X()+i, nRect.Bottom() ) ); } pDev->DrawRect( tools::Rectangle( aCenter.X()-n8, nRect.Top(), aCenter.X()+n8, nRect.Bottom()-1 ) ); @@ -103,6 +108,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustLeft( 1 ); pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-i ), Point( nRect.Left(), aCenter.Y()+i ) ); +pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()-i ) ); +pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()+i ) ); } pDev->DrawRect( tools::Rectangle( nRect.Left()+1, aCenter.Y()-n8, nRect.Right(), aCenter.Y()+n8 ) ); @@ -115,6 +122,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustRight( -1 ); pDev->DrawLine( Point( nRect.Right(), aCenter.Y()-i ), Point( nRect.Right(), aCenter.Y()+i ) ); +pDev->DrawPixel( Point( nRect.Right(), aCenter.Y()-i ) ); +pDev->DrawPixel( Point( nRect.Right(), aCenter.Y()+i ) ); } pDev->DrawRect( tools::Rectangle( nRect.Left(), aCenter.Y()-n8, nRect.Right()-1, aCenter.Y()+n8 ) ); @@ -128,6 +137,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustTop( 1 ); pDev->DrawLine( Point( aCenter.X()-i, nRect.Top() ), Point( aCenter.X()+i, nRect.Top() ) ); +pDev->DrawPixel( Point( aCenter.X()-i, nRect.Top() ) ); +pDev->DrawPixel( Point( aCenter.X()+i, nRect.Top() ) ); } break; @@ -139,6 +150,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustBottom( -1 ); pDev->DrawLine( Point( aCenter.X()-i, nRect.Bottom() ), Point( aCenter.X()+i, nRect.Bottom() ) ); +pDev->DrawPixel( Point( aCenter.X()-i, nRect.Bottom() ) ); +pDev->DrawPixel( Point( aCenter.X()+i, nRect.Bottom() ) ); } break; @@ -158,6 +171,8 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp nRect.AdjustLeft( 1 ); pDev->DrawLine( Point( nRect.Left(), aCenter.Y()-i ), Point( nRect.Left(), aCenter.Y()+i ) ); +pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()-i ) ); +pDev->DrawPixel( Point( nRect.Left(), aCenter.Y()+i ) ); } break; @@ -178,6 +193,8 @@ vo
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47061031a4ff7096b794a8e3e5bf1aa0a885a60a Author: Andras Timar AuthorDate: Mon Jul 30 19:24:58 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 30 19:25:42 2018 +0200 Update git submodules * Update translations from branch 'distro/collabora/cd-5.3-3.2' - Updated Japanese translation Change-Id: Ie28f4c0ed0533cf4e96b6fa10f18ce00acbc7368 - remove extra ~ characters from German translation Change-Id: Iadeafd183afecb6c16f8b7d23311b6f050266dde diff --git a/translations b/translations index 5c8037b1eea4..6c0d98fe8226 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5c8037b1eea42c23f7b20d203ace7c0317c55d7e +Subproject commit 6c0d98fe8226b018356aeec8c0ee7b7e6ab4fab1 ___ 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.2'
New branch 'distro/collabora/cd-5.3-3.2' available with the following commits: commit 6c0d98fe8226b018356aeec8c0ee7b7e6ab4fab1 Author: Andras Timar Date: Mon Jul 30 19:24:58 2018 +0200 Updated Japanese translation Change-Id: Ie28f4c0ed0533cf4e96b6fa10f18ce00acbc7368 ___ 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' - cui/source
cui/source/dialogs/hltpbase.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit e130c53ceda7947b01b7d3b23ccea1a6260f6754
Author: George Wood
AuthorDate: Mon Jul 30 14:54:47 2018 +0100
Commit: Michael Meeks
CommitDate: Mon Jul 30 17:51:15 2018 +0100
Hide macro selector button in kit mode.
Change-Id: If068d23a5aeb9be6d8e1736543c002bf2e68dacb
Signed-off-by: Michael Meeks
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2d41c1b664f5..c89cb91dd375 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -271,10 +272,17 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields (
const SvxHyperlinkItem* pH
mpEdText->SetText ( pHyperlinkItem->GetIntName() );
// Script-button
-if ( pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE )
-mpBtScript->Disable();
+if (!comphelper::LibreOfficeKit::isActive())
+{
+if ( pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE )
+mpBtScript->Disable();
+else
+mpBtScript->Enable();
+}
else
-mpBtScript->Enable();
+{
+mpBtScript->Hide();
+}
}
// Any action to do after apply-button is pressed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/sfx2 include/xmloff sfx2/source sw/inc sw/source xmloff/source
include/sfx2/docfile.hxx |2 include/sfx2/frame.hxx|4 include/sfx2/objsh.hxx|2 include/sfx2/sfxbasemodel.hxx |2 include/sfx2/viewfrm.hxx |2 include/xmloff/styleexp.hxx |2 sfx2/source/doc/docfile.cxx |3 sfx2/source/doc/doctemplates.cxx | 18 --- sfx2/source/doc/objstor.cxx | 14 +- sfx2/source/doc/sfxbasemodel.cxx | 39 +++ sfx2/source/view/frame.cxx|8 - sfx2/source/view/frame2.cxx |3 sfx2/source/view/viewfrm.cxx |4 sw/inc/calc.hxx |4 sw/inc/cellfml.hxx| 20 +-- sw/inc/dbgoutsw.hxx | 11 +- sw/source/core/bastyp/calc.cxx| 14 +- sw/source/core/crsr/crstrvl.cxx |8 - sw/source/core/crsr/pam.cxx |8 - sw/source/core/doc/DocumentFieldsManager.cxx |7 - sw/source/core/doc/DocumentListsManager.cxx |3 sw/source/core/doc/dbgoutsw.cxx | 98 +- sw/source/core/doc/docsort.cxx|6 - sw/source/core/doc/number.cxx | 15 +- sw/source/core/edit/edfcol.cxx|8 - sw/source/core/edit/editsh.cxx| 13 +- sw/source/core/fields/cellfml.cxx | 138 +- sw/source/core/fields/ddefld.cxx |8 - sw/source/core/tox/ToxTextGenerator.cxx | 14 +- sw/source/core/undo/undel.cxx |8 - sw/source/core/unocore/unochart.cxx | 16 +-- sw/source/core/unocore/unoidx.cxx | 14 +- sw/source/filter/docx/swdocxreader.cxx|4 sw/source/filter/html/htmlbas.cxx |3 sw/source/filter/html/htmlftn.cxx |8 - sw/source/filter/html/svxcss1.cxx |8 - sw/source/filter/ww8/writerwordglue.cxx |3 sw/source/filter/ww8/ww8glsy.cxx |4 sw/source/filter/ww8/ww8par.cxx |8 - sw/source/filter/ww8/ww8par2.cxx | 10 - sw/source/ui/chrdlg/drpcps.cxx|6 - sw/source/ui/dbui/createaddresslistdialog.cxx |8 - sw/source/ui/dbui/mmresultdialogs.cxx | 10 - sw/source/ui/index/cnttab.cxx |6 - sw/source/ui/index/swuiidxmrk.cxx |8 - sw/source/ui/misc/bookmark.cxx|8 - sw/source/ui/misc/glossary.cxx|7 - sw/source/ui/vba/vbatemplate.cxx |7 - sw/source/uibase/app/docstyle.cxx | 26 ++-- sw/source/uibase/config/modcfg.cxx| 26 ++-- sw/source/uibase/dbui/dbmgr.cxx | 22 ++-- sw/source/uibase/dbui/mailmergehelper.cxx |9 - sw/source/uibase/dbui/mmconfigitem.cxx| 18 +-- sw/source/uibase/envelp/envimg.cxx| 24 ++-- sw/source/uibase/envelp/labelcfg.cxx |3 sw/source/uibase/shells/annotsh.cxx |8 - sw/source/uibase/shells/drwtxtsh.cxx |6 - sw/source/uibase/shells/frmsh.cxx |4 sw/source/uibase/uno/unotxdoc.cxx | 12 +- sw/source/uibase/wrtsh/wrtundo.cxx|6 - xmloff/source/style/styleexp.cxx |3 xmloff/source/transform/ChartOOoTContext.cxx |6 - xmloff/source/transform/EventOOoTContext.cxx |6 - xmloff/source/transform/TransformerBase.cxx | 11 -- xmloff/source/transform/TransformerBase.hxx |2 65 files changed, 393 insertions(+), 423 deletions(-) New commits: commit c90da566ed1026a70217ac8a52a90e5df5c3026e Author: Noel Grandin AuthorDate: Mon Jul 30 15:34:35 2018 +0200 Commit: Noel Grandin CommitDate: Mon Jul 30 18:54:44 2018 +0200 loplugin:returnconstant in xmloff Change-Id: Ia837a93ae817df282096abb80efcbd6922867b25 Reviewed-on: https://gerrit.libreoffice.org/58335 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index fb48166e14df..0418aaebc8e5 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -93,7 +93,7 @@ public: // bool bUsed, sal_uInt16 nFamily = 0, // const OUString* pPrefix = 0); -bool exportDefaultStyle( +void exportDefaultStyle( const css::uno::Reference< css::beans::XPropertySet > & xPropSet, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper ); diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index fa8ff9c8a46a..40334fc30be1 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -381,7 +381,7 @@ bool XMLStyleExport::exportStyle( return true; } -bool XMLStyleExport:
[Libreoffice-commits] core.git: oox/source sw/inc sw/source
oox/source/shape/LockedCanvasContext.cxx |2 +-
oox/source/shape/WpgContext.cxx |2 +-
sw/inc/fldbas.hxx|1 +
sw/inc/usrfld.hxx|1 +
sw/source/core/fields/fldbas.cxx | 20 ++--
sw/source/core/fields/usrfld.cxx |9 +
6 files changed, 27 insertions(+), 8 deletions(-)
New commits:
commit 1ad14b32c651b23b2c37d83dbdea889607ea6680
Author: Miklos Vajna
AuthorDate: Mon Jul 30 17:22:24 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 18:34:24 2018 +0200
sw doc model xml dump: dump float value of user fields
Change-Id: Ie59070254eb293cbfdd688d97bf4bb6c06e77a79
Reviewed-on: https://gerrit.libreoffice.org/58339
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/shape/LockedCanvasContext.cxx
b/oox/source/shape/LockedCanvasContext.cxx
index 277a11fdd262..a460a9585425 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
#include "LockedCanvasContext.hxx"
+#include
#include
#include
#include
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 26a54c41d2ac..95264e53ce15 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
#include "WpgContext.hxx"
+#include
#include
#include
#include
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 46d1a01d70ad..4696f48fe88b 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -262,6 +262,7 @@ public:
SwFieldIds Which() const { return m_nWhich; }
inline voidUpdateFields() const;
+virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
inline void SwFieldType::UpdateFields() const
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index fccf5b070538..e98258c624c3 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -60,6 +60,7 @@ public:
virtual voidQueryValue( css::uno::Any& rVal, sal_uInt16 nMId )
const override;
virtual voidPutValue( const css::uno::Any& rVal, sal_uInt16 nMId )
override;
+void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
override;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index fcfc52f61932..01e43cdc992c 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -154,17 +154,24 @@ void SwFieldType::PutValue( const uno::Any& , sal_uInt16 )
{
}
+void SwFieldType::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+SwIterator aIter(*this);
+if (!aIter.First())
+return;
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwFieldType"));
+for (const SwFormatField* pFormatField = aIter.First(); pFormatField;
+ pFormatField = aIter.Next())
+pFormatField->dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
+
void SwFieldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SwFieldTypes"));
sal_uInt16 nCount = size();
for (sal_uInt16 nType = 0; nType < nCount; ++nType)
-{
-const SwFieldType *pCurType = (*this)[nType];
-SwIterator aIter(*pCurType);
-for (const SwFormatField* pFormatField = aIter.First(); pFormatField;
pFormatField = aIter.Next())
-pFormatField->dumpAsXml(pWriter);
-}
+(*this)[nType]->dumpAsXml(pWriter);
xmlTextWriterEndElement(pWriter);
}
@@ -777,6 +784,7 @@ void SwField::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s",
BAD_CAST(typeid(*this).name()));
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nFormat"),
BAD_CAST(OString::number(m_nFormat).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nLang"),
BAD_CAST(OString::number(m_nLang.get()).getStr()));
xmlTextWriterEndElement(pWriter);
}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index c843d1a5e490..d81ba1c84ae8 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -339,4 +339,13 @@ void SwUserFieldType::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
}
}
+void SwUserFieldType::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwUserFieldType"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nValue"),
BAD_CAST(OString::number(nValue).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aContent"),
BAD_CAST(aContent.toUtf8().getStr()));
+SwFieldType::dumpAsX
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 253cd2e450ca9c004237cd0c21b5c7f2f1f70bf7 Author: Mike Kaganski AuthorDate: Mon Jul 30 14:46:41 2018 +0200 Commit: Mike Kaganski CommitDate: Mon Jul 30 18:32:22 2018 +0200 tdf#118869: mark some properties secure to pass them to elevated install See also http://helpnet.flexerasoftware.com/installshield19helplib/helplibrary/ISBP10.htm Change-Id: I217d68f98af8e56874af6c071bb7fa7354b3e4b4 Reviewed-on: https://gerrit.libreoffice.org/58326 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit ec9b18b75c193c914691a29d3eb78bd81961fced) Reviewed-on: https://gerrit.libreoffice.org/58338 Reviewed-by: Christian Lohmaier diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index 32ada67082b4..302c4f281279 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -43,7 +43,7 @@ ProgressType3 installs Quickstarterlinkname QUICKSTARTERLINKNAMETEMPLATE RebootYesNoYes ReinstallModeText omus -SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS +SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED SetupType Typical SELECT_WORD0 SELECT_EXCEL 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Calc - Debugging issues in undo
Hi, I am currently working on issue #118842 (https://bugs.documentfoundation.org/show_bug.cgi?id=118842) and #39217 (https://bugs.documentfoundation.org/show_bug.cgi?id=39217). Both are related to the copy of formatted text from a web browser, and then using "undo". The first issue is that rows' height are not restored with the undo. The other one is that images copied this way are not removed with the undo. I was able to work around the first by forcing a call to "AdjustRowHeight()" after the undo, but it doesn't address the root cause, so I'm not sure this can be called a fix. For the second, I think the image creation doesn't trigger the creation of an "undo action" at all - only the text is registered in the undo. I've tracked the image creation into the scfilt library (ScEEImport::InsertGraphic()), but it doesn't looks like the right place to manage undo actions. Now the caller (ScImportExport::HTML2Doc()) doesn't have a clue that a graphic has been created, so I'm not sure how it could handle the undo part... All in all, I think I lack some better understanding of how the undo management is performed in LibreOffice. Do you have any suggestion / documentation to help me troubleshoot this? Best regards, Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC Weekly update for UI Test logger
Hello! I have updated my progress here- http://chiranias.blogspot.com/2018/07/gsoc-work-report-week-11.html Regards, Saurav ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/CppunitTest_sc_datapilottableobj.mk
sc/CppunitTest_sc_datapilottableobj.mk | 41 - 1 file changed, 6 insertions(+), 35 deletions(-) New commits: commit a69bac4caa6ceec5cd19c84cdf25c1341e7feb4c Author: Jens Carl AuthorDate: Mon Jul 30 05:57:11 2018 + Commit: Jens Carl CommitDate: Mon Jul 30 17:53:17 2018 +0200 Remove obsolete (cargo-cult copied) dependencies Change-Id: I84a9dc3e41e13faa50017644e4bc9c80eb9b8ed5 Reviewed-on: https://gerrit.libreoffice.org/58299 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 858a81aaaf00..f17660c82f86 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -14,48 +14,19 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_datapilottableobj)) $(eval $(call gb_CppunitTest_use_external,sc_datapilottableobj,boost_headers)) $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \ -sc/qa/extras/scdatapilottableobj \ + sc/qa/extras/scdatapilottableobj \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ -basegfx \ -comphelper \ -cppu \ -cppuhelper \ -drawinglayer \ -editeng \ -for \ -forui \ -i18nlangtag \ -msfilter \ -oox \ -sal \ -salhelper \ -sax \ -sb \ -sc \ -sfx \ -sot \ -subsequenttest \ -svl \ -svt \ -svx \ -svxcore \ + cppu \ + sal \ + subsequenttest \ test \ -tk \ -tl \ -ucbhelper \ unotest \ -utl \ -vbahelper \ -vcl \ -xo \ )) $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ --I$(SRCDIR)/sc/source/ui/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ + $$(INCLUDE) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilottableobj)) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_datapilottableobj)) $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdmodel.hxx | 28
svx/source/svdraw/svdmodel.cxx | 22 +-
svx/source/svdraw/svdobj.cxx | 23 +++
3 files changed, 72 insertions(+), 1 deletion(-)
New commits:
commit f0dcfe008d58053e52c51b10e51c58eae27c1f0b
Author: Armin Le Grand
AuthorDate: Fri Jul 27 16:04:07 2018 +0200
Commit: Armin Le Grand
CommitDate: Mon Jul 30 17:52:30 2018 +0200
Added SdrObjectLifetimeWatchDog for debug mode
Change-Id: I79f65b7511d400c3e7071e45c3f0b1d385bcd8d4
Reviewed-on: https://gerrit.libreoffice.org/58197
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index ccc1323abe56..19cb27a3570b 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -49,6 +49,11 @@ class OutputDevice;
#include
#include
+#ifdef DBG_UTIL
+// SdrObjectLifetimeWatchDog
+#include
+#endif
+
#define DEGREE_CHAR u'\x00B0' /* U+00B0 DEGREE SIGN */
class SdrOutliner;
@@ -152,6 +157,29 @@ struct SdrModelImpl;
class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public virtual
tools::WeakBase
{
+private:
+#ifdef DBG_UTIL
+// SdrObjectLifetimeWatchDog:
+// Use maAllIncarnatedObjects to keep track of all SdrObjects incarnated
using this SdrModel
+// (what is now possible after the paradigm change that a SdrObject stays
at a single SdrModel
+// for it's whole lifetime).
+// The two methods are exclusive, debug-only, only-accessible-by SdrObject
accesses to else
+// hidden/non-existing maAllIncarnatedObjects.
+// SdrObject::SdrObject uses impAddIncarnatedSdrObjectToSdrModel, while
SdrObject::~SdrObject
+// uses impRemoveIncarnatedSdrObjectToSdrModel.
+// There are two places which may trigger OSL_FAIL warnings:
+// - impRemoveIncarnatedSdrObjectToSdrModel when the to-be-removed
SdrObject is not member of SdrModel
+// - SdrModel::~SdrModel after all SdrObjects *should* be cleaned-up.
+// SdrModel::~SdrModel will also - for convenience - Free the non-deleted
SdrObjects if there
+// are any.
+// Using std::unordered_set will use quasi constant access times, so this
watchdog will not
+// be expensive. Nonetheless, only use with debug code. It may be
seductive to use this in
+// product code, too, especially if it will indeed trigger - but it's
intention is clearly
+// to find/identify MemoryLeaks caused by SdrObjects
+friend void impAddIncarnatedSdrObjectToSdrModel(const SdrObject&
rSdrObject, SdrModel& rSdrModel);
+friend void impRemoveIncarnatedSdrObjectToSdrModel(const SdrObject&
rSdrObject, SdrModel& rSdrModel);
+std::unordered_set< const SdrObject* > maAllIncarnatedObjects;
+#endif
protected:
std::vector maMaPag; // master pages
std::vector maPages;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 2761af39bea4..a63401dc88e7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -204,7 +204,12 @@ void SdrModel::ImpCtor(
SdrModel::SdrModel(
SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* pPers)
-: maMaPag(),
+:
+#ifdef DBG_UTIL
+// SdrObjectLifetimeWatchDog:
+maAllIncarnatedObjects(),
+#endif
+maMaPag(),
maPages()
{
ImpCtor(pPool,pPers);
@@ -228,6 +233,21 @@ SdrModel::~SdrModel()
ClearModel(true);
+#ifdef DBG_UTIL
+// SdrObjectLifetimeWatchDog:
+if(!maAllIncarnatedObjects.empty())
+{
+SAL_WARN("svx","SdrModel::~SdrModel: Not all incarnations of
SdrObjects deleted, possible memory leak (!)");
+// copy to std::vector - calling SdrObject::Free will change
maAllIncarnatedObjects
+const std::vector< const SdrObject* >
maRemainingObjects(maAllIncarnatedObjects.begin(),
maAllIncarnatedObjects.end());
+for(auto pSdrObject : maRemainingObjects)
+{
+SdrObject* pCandidate(const_cast(pSdrObject));
+SdrObject::Free(pCandidate);
+}
+}
+#endif
+
pLayerAdmin.reset();
pTextChain.reset();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0559d751..6cd4947da101 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -332,6 +332,20 @@ void SdrObject::SetBoundRectDirty()
aOutRect = tools::Rectangle();
}
+#ifdef DBG_UTIL
+// SdrObjectLifetimeWatchDog:
+void impAddIncarnatedSdrObjectToSdrModel(const SdrObject& rSdrObject,
SdrModel& rSdrModel)
+{
+rSdrModel.maAllIncarnatedObjects.insert(&rSdrObject);
+}
+void impRemoveIncarnatedSdrObjectToSdrModel(const SdrObject& rSdrObject,
SdrModel& rSdrModel)
+{
+if(!rSdrModel.maAllIncarnatedObjects.erase(&rSdrObject))
+{
+SAL_WARN("svx","SdrObject::~SdrObject: Destructed incarnation of
SdrObject not member of this SdrModel (!)");
+}
+}
+#endif
SdrObject::SdrObject(SdrModel& rSdrModel)
: mpFillGeometryDefiningShape
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - reportdesign/inc reportdesign/source
reportdesign/inc/RptObject.hxx |2
reportdesign/source/core/sdr/RptObject.cxx | 97 ++---
2 files changed, 50 insertions(+), 49 deletions(-)
New commits:
commit 90c11ceeb32e8c2fd59028befd726e807a8188cf
Author: Armin Le Grand
AuthorDate: Wed Jul 25 14:10:08 2018 +0200
Commit: Armin Le Grand
CommitDate: Mon Jul 30 17:52:22 2018 +0200
tdf#118730 Correct ReportDesigner Object creation
This is a follow up problem to removing the old stuff
that first a SdrPage* at the SdrObjects was set *without*
the SdrObject being inserted to any SdrObjList. It works
no longer - the SdrPage which you can get now is the one
the SdrObject *is* inserted at.
Solution is to move that stuff - plus other initializations
which were done in OUnoObject::EndCreate before - to where
it belongs. This gets rid of OUnoObject::EndCreate
completely.
It makes OUnoObject::impl_setReportComponent_nothrow no
longer needed due to being used only in one place. All
initializations move to OUnoObject::CreateMediator which
anyways needs to be done when a OUnoObject got created.
Change-Id: I86f968dc6e867c5752d3c8cee1b3b2af57e467c8
Reviewed-on: https://gerrit.libreoffice.org/57976
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 96b338e62c422ccd23cd33b3f87a463730221514)
Reviewed-on: https://gerrit.libreoffice.org/58321
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index b078e1f7d143..3a4c6cbe35de 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -246,7 +246,6 @@ protected:
virtual void NbcMove( const Size& rSize ) override;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact) override;
virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
-virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
virtual SdrPage* GetImplPage() const override;
@@ -272,7 +271,6 @@ public:
private:
virtual void impl_setUnoShape( const css::uno::Reference<
css::uno::XInterface >& rxUnoShape ) override;
-voidimpl_setReportComponent_nothrow();
voidimpl_initializeModel_nothrow();
};
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 85a50a242c58..47191497712b 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -640,18 +640,6 @@ void OUnoObject::impl_initializeModel_nothrow()
}
}
-void OUnoObject::impl_setReportComponent_nothrow()
-{
-if ( m_xReportComponent.is() )
-return;
-
-OReportModel& rRptModel(static_cast< OReportModel&
>(getSdrModelFromSdrObject()));
-OXUndoEnvironment::OUndoEnvLock aLock( rRptModel.GetUndoEnv() );
-m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY);
-
-impl_initializeModel_nothrow();
-}
-
sal_uInt16 OUnoObject::GetObjIdentifier() const
{
return m_nObjectType;
@@ -743,37 +731,6 @@ void OUnoObject::NbcSetLogicRect(const tools::Rectangle&
rRect)
OObjectBase::StartListening();
}
-
-bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
-{
-bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
-if ( bResult )
-{
-impl_setReportComponent_nothrow();
-// set labels
-if ( m_xReportComponent.is() )
-{
-try
-{
-if ( supportsService( SERVICE_FIXEDTEXT ) )
-{
-m_xReportComponent->setPropertyValue( PROPERTY_LABEL,
uno::makeAny(GetDefaultName(this)) );
-}
-}
-catch(const uno::Exception&)
-{
-DBG_UNHANDLED_EXCEPTION("reportdesign");
-}
-
-impl_initializeModel_nothrow();
-}
-// set geometry properties
-SetPropsFromRect(GetLogicRect());
-}
-
-return bResult;
-}
-
OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
{
OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!";
@@ -857,11 +814,57 @@ void OUnoObject::CreateMediator(bool _bReverse)
{
if ( !m_xMediator.is() )
{
-impl_setReportComponent_nothrow();
+// tdf#118730 Directly do thinigs formerly done in
+// OUnoObject::impl_setReportComponent_nothrow here
+if(!m_xReportComponent.is())
+{
+OReportModel& rRptModel(static_cast< OReportModel&
>(getSdrModelFromSdrObject()));
+OXUndoEnvironment::OUndoEnvLock aLock( rRptModel.GetUndoEnv() );
+m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY);
+
+impl_initializeModel_nothrow();
+}
+
+// tdf#118730 Directly do thinigs formerly done in
+// OUnoObject::EndCreate here
+if(m_xReportComponent.is())
+{
+// set labels
+if ( m_xReportCom
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx | 30 ++
1 file changed, 26 insertions(+), 4 deletions(-)
New commits:
commit e1d73cb5552c2566c6d7463ce001e23f3d92
Author: Xisco Fauli
AuthorDate: Mon Jul 30 13:12:43 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 17:52:12 2018 +0200
tdf#118971: allow arrow keys to move images or drawing objects
Partially revert 2d5ce0e1b233c83f91481cd6b9306ac8de7f5ff8
Change-Id: Ie4c91529c1ce878f4b0474d815a3a88ed48769c2
Reviewed-on: https://gerrit.libreoffice.org/58318
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 14011cbb7b38..4edc16a3f1e5 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1768,7 +1768,11 @@ KEYINPUT_CHECKTABLE:
eFlyState = SwKeyState::Fly_Change;
nDir = MOVE_LEFT_BIG;
}
-break;
+goto KEYINPUT_CHECKTABLE_INSDEL;
+}
+case KEY_RIGHT | KEY_MOD1:
+{
+goto KEYINPUT_CHECKTABLE_INSDEL;
}
case KEY_UP:
case KEY_UP | KEY_MOD1:
@@ -1779,7 +1783,7 @@ KEYINPUT_CHECKTABLE:
eFlyState = SwKeyState::Fly_Change;
nDir = MOVE_UP_BIG;
}
-break;
+goto KEYINPUT_CHECKTABLE_INSDEL;
}
case KEY_DOWN:
case KEY_DOWN | KEY_MOD1:
@@ -1790,8 +1794,26 @@ KEYINPUT_CHECKTABLE:
eFlyState = SwKeyState::Fly_Change;
nDir = MOVE_DOWN_BIG;
}
-break;
+goto KEYINPUT_CHECKTABLE_INSDEL;
+}
+
+KEYINPUT_CHECKTABLE_INSDEL:
+if( rSh.IsTableMode() || !rSh.GetTableFormat() )
+{
+const SelectionType nSelectionType =
rSh.GetSelectionType();
+
+eKeyState = SwKeyState::KeyToView;
+if(SwKeyState::KeyToView != eFlyState)
+{
+if((nSelectionType &
(SelectionType::DrawObject|SelectionType::DbForm)) &&
+rSh.GetDrawView()->AreObjectsMarked())
+eKeyState = SwKeyState::Draw_Change;
+else if(nSelectionType &
(SelectionType::Frame|SelectionType::Ole|SelectionType::Graphic))
+eKeyState = SwKeyState::Fly_Change;
+}
}
+break;
+
case KEY_DELETE:
if ( !rSh.HasReadonlySel() || rSh.CursorInsideInputField())
@@ -1967,7 +1989,7 @@ KEYINPUT_CHECKTABLE:
{
eFlyState = SwKeyState::Fly_Change;
nDir = MOVE_RIGHT_BIG;
-break;
+goto KEYINPUT_CHECKTABLE_INSDEL;
}
case KEY_TAB:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source sdext/source sd/source
scripting/source/basprov/basprov.cxx |1 + scripting/source/protocolhandler/scripthandler.cxx |1 + scripting/source/provider/BrowseNodeFactoryImpl.cxx |1 + scripting/source/provider/MasterScriptProvider.cxx |1 + scripting/source/provider/ProviderCache.cxx |1 + scripting/source/vbaevents/eventhelper.cxx |1 + sd/source/core/CustomAnimationCloner.cxx |1 + sd/source/core/CustomAnimationEffect.cxx |1 + sd/source/core/CustomAnimationPreset.cxx |1 + sd/source/core/PageListWatcher.cxx |1 + sd/source/core/TransitionPreset.cxx |1 + sd/source/core/drawdoc2.cxx |1 + sd/source/core/sdpage.cxx |1 + sd/source/core/stlsheet.cxx |1 + sd/source/filter/eppt/pptx-epptbase.cxx |1 + sd/source/filter/eppt/pptx-epptooxml.cxx |1 + sd/source/filter/html/htmlex.cxx |1 + sd/source/filter/ppt/ppt97animations.cxx |1 + sd/source/filter/ppt/pptin.cxx |1 + sd/source/filter/ppt/propread.cxx |1 + sd/source/filter/xml/sdxmlwrp.cxx |1 + sd/source/helper/simplereferencecomponent.cxx |1 + sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |1 + sd/source/ui/accessibility/AccessibleOutlineView.cxx |1 + sd/source/ui/accessibility/AccessiblePageShape.cxx |1 + sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |1 + sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |1 + sd/source/ui/animations/SlideTransitionPane.cxx |1 + sd/source/ui/dlg/PhotoAlbumDialog.cxx |1 + sd/source/ui/dlg/prltempl.cxx |1 + sd/source/ui/dlg/sdtreelb.cxx |1 + sd/source/ui/docshell/docshel4.cxx |1 + sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx |1 + sd/source/ui/framework/configuration/Configuration.cxx |1 + sd/source/ui/framework/configuration/ConfigurationClassifier.cxx |1 + sd/source/ui/framework/configuration/ConfigurationController.cxx |1 + sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx |1 + sd/source/ui/framework/configuration/ConfigurationUpdater.cxx |1 + sd/source/ui/framework/configuration/ResourceFactoryManager.cxx |1 + sd/source/ui/framework/factories/ChildWindowPane.cxx |1 + sd/source/ui/framework/factories/ViewShellWrapper.cxx |1 + sd/source/ui/framework/module/ModuleController.cxx |1 + sd/source/ui/func/fuexpand.cxx |1 + sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |1 + sd/source/ui/remotecontrol/Communicator.cxx |1 + sd/source/ui/remotecontrol/DiscoveryService.cxx |1 + sd/source/ui/remotecontrol/ImagePreparer.cxx |1 + sd/source/ui/remotecontrol/Listener.cxx |1 + sd/source/ui/remotecontrol/Receiver.cxx |1 + sd/source/ui/remotecontrol/Transmitter.cxx |1 + sd/source/ui/sidebar/DocumentHelper.cxx |1 + sd/source/ui/sidebar/LayoutMenu.cxx |1 + sd/source/ui/sidebar/MasterPageContainerProviders.cxx |1 + sd/source/ui/sidebar/MasterPageDescriptor.cxx |1 + sd/source/ui/slideshow/showwin.cxx |
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fldbas.hxx|1 +
sw/inc/usrfld.hxx|1 +
sw/source/core/fields/fldbas.cxx |9 +
sw/source/core/fields/usrfld.cxx | 10 ++
4 files changed, 21 insertions(+)
New commits:
commit 05ae22e9f99ae6236a77a3fbfb5ac1e3f95df619
Author: Miklos Vajna
AuthorDate: Mon Jul 30 14:23:11 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 17:19:14 2018 +0200
sw doc model xml dump: cover SwValueField
Also SwUserField.
Change-Id: Ie8a8ca997e5b89bcf6b40363721e9caaeb60f696
Reviewed-on: https://gerrit.libreoffice.org/58325
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 8765362f6754..46d1a01d70ad 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -446,6 +446,7 @@ public:
}
static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter,
sal_uInt32 nFormat);
+void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
class SW_DLLPUBLIC SwFormulaField : public SwValueField
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index c776f5b200c4..fccf5b070538 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -109,6 +109,7 @@ public:
virtual voidSetPar2(const OUString& rStr) override;
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt16
nWhichId ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt16
nWhichId ) override;
+void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
#endif // INCLUDED_SW_INC_USRFLD_HXX
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 887bf3a008de..fcfc52f61932 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -613,6 +613,14 @@ sal_uInt32
SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt
return nFormat;
}
+void SwValueField::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwValueField"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_fValue"),
BAD_CAST(OString::number(m_fValue).getStr()));
+SwField::dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
+
/// set language of the format
void SwValueField::SetLanguage( LanguageType nLng )
{
@@ -768,6 +776,7 @@ void SwField::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterStartElement(pWriter, BAD_CAST("SwField"));
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s",
BAD_CAST(typeid(*this).name()));
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nFormat"),
BAD_CAST(OString::number(m_nFormat).getStr()));
xmlTextWriterEndElement(pWriter);
}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 809884e163d2..c843d1a5e490 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -19,6 +19,8 @@
#include
+#include
+
#include
#include
@@ -155,6 +157,14 @@ bool SwUserField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
return true;
}
+void SwUserField::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwUserField"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nSubType"),
BAD_CAST(OString::number(nSubType).getStr()));
+SwValueField::dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
+
SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const OUString& aNam )
: SwValueFieldType( pDocPtr, SwFieldIds::User ),
nValue( 0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ODF specification for border around text portions
Hi Tamás, Regina Henschel schrieb am 30-Jul-18 um 14:33: That is the behavior of LibreOffice. But if browser (tested with Seamonkey and Chrome) split a paragraph across pages, then the bottom border of the paragraph in the first page is missing and the top border of the paragraph on the second page is missing. And because ODF indirectly uses CSS, here is a problem too. I have just tested Word 365. It does not render borders at page breaks. So it is only LibreOffice. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/view2.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 6ee3d32494e165b11a416637a91cf4fc69af5432
Author: Mike Kaganski
AuthorDate: Thu Jul 26 13:12:31 2018 +0200
Commit: Mike Kaganski
CommitDate: Mon Jul 30 16:42:27 2018 +0200
tdf#106374: lock view when updating index
Change-Id: I745f8b66cb79c8738dba6fcdd58b8597e604f6fd
Reviewed-on: https://gerrit.libreoffice.org/58091
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index c71011b737a4..f1866fc3ee16 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -906,11 +906,16 @@ void SwView::Execute(SfxRequest &rReq)
const SwTOXBase* pBase = m_pWrtShell->GetCurTOX();
if(pBase)
{
+// tdf#106374: don't jump view on the update
+const bool bWasLocked = m_pWrtShell->IsViewLocked();
+m_pWrtShell->LockView(true);
m_pWrtShell->StartAction();
if(TOX_INDEX == pBase->GetType())
m_pWrtShell->ApplyAutoMark();
m_pWrtShell->UpdateTableOf( *pBase );
m_pWrtShell->EndAction();
+if (!bWasLocked)
+m_pWrtShell->LockView(false);
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec9b18b75c193c914691a29d3eb78bd81961fced Author: Mike Kaganski AuthorDate: Mon Jul 30 14:46:41 2018 +0200 Commit: Mike Kaganski CommitDate: Mon Jul 30 16:37:01 2018 +0200 tdf#118869: mark some properties secure to pass them to elevated install See also http://helpnet.flexerasoftware.com/installshield19helplib/helplibrary/ISBP10.htm Change-Id: I217d68f98af8e56874af6c071bb7fa7354b3e4b4 Reviewed-on: https://gerrit.libreoffice.org/58326 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index 32ada67082b4..302c4f281279 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -43,7 +43,7 @@ ProgressType3 installs Quickstarterlinkname QUICKSTARTERLINKNAMETEMPLATE RebootYesNoYes ReinstallModeText omus -SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS +SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED SetupType Typical SELECT_WORD0 SELECT_EXCEL 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source lingucomponent/source linguistic/source lotuswordpro/source oox/source package/source pyuno/source registry/tools reportdesign/source
l10ntools/source/merge.cxx|1 + l10ntools/source/po.cxx |1 + lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |1 + linguistic/source/convdic.cxx |1 + linguistic/source/convdiclist.cxx |1 + linguistic/source/dicimp.cxx |1 + linguistic/source/dlistimp.cxx|1 + linguistic/source/gciterator.cxx |1 + linguistic/source/hyphdsp.cxx |1 + linguistic/source/lngprophelp.cxx |1 + linguistic/source/lngsvcmgr.cxx |1 + linguistic/source/misc.cxx|1 + linguistic/source/spelldsp.cxx|1 + linguistic/source/thesdsp.cxx |1 + lotuswordpro/source/filter/lwpbulletstylemgr.cxx |1 + lotuswordpro/source/filter/lwpdivinfo.cxx |1 + lotuswordpro/source/filter/lwpfont.cxx|1 + lotuswordpro/source/filter/lwpgrfobj.cxx |1 + lotuswordpro/source/filter/lwplayout.cxx |1 + lotuswordpro/source/filter/lwpobjfactory.cxx |1 + lotuswordpro/source/filter/lwppagelayout.cxx |1 + lotuswordpro/source/filter/lwpparaborderoverride.cxx |1 + lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |1 + lotuswordpro/source/filter/lwptablelayout.cxx |1 + lotuswordpro/source/filter/lwptblformula.cxx |1 + lotuswordpro/source/filter/tocread.cxx|1 + oox/source/core/relationshandler.cxx |1 + oox/source/core/xmlfilterbase.cxx |1 + oox/source/docprop/docprophandler.cxx |1 + oox/source/drawingml/color.cxx|1 + oox/source/drawingml/customshapegeometry.cxx |1 + oox/source/drawingml/customshapepresetdata.cxx|1 + oox/source/drawingml/customshapeproperties.cxx|1 + oox/source/drawingml/diagram/diagram.cxx |1 + oox/source/drawingml/diagram/diagramlayoutatoms.cxx |1 + oox/source/drawingml/diagram/layoutatomvisitors.cxx |2 ++ oox/source/drawingml/diagram/layoutnodecontext.cxx|1 + oox/source/drawingml/fillproperties.cxx |1 + oox/source/drawingml/graphicshapecontext.cxx |1 + oox/source/drawingml/shape.cxx|1 + oox/source/drawingml/shape3dproperties.cxx|1 + oox/source/drawingml/shapecontext.cxx |1 + oox/source/drawingml/shapegroupcontext.cxx|1 + oox/source/drawingml/textbodycontext.cxx |2 ++ oox/source/drawingml/textcharacterpropertiescontext.cxx |2 ++ oox/source/drawingml/textfield.cxx|1 + oox/source/drawingml/textliststyle.cxx|1 + oox/source/drawingml/textparagraph.cxx|1 + oox/source/drawingml/textparagraphpropertiescontext.cxx |1 + oox/source/drawingml/textrun.cxx |1 + oox/source/export/chartexport.cxx |1 + oox/source/export/drawingml.cxx |1 + oox/source/export/shapes.cxx |1 + oox/source/export/vmlexport.cxx |1 + oox/source/helper/graphichelper.cxx |1 + oox/source/helper/progressbar.cxx |2 ++ oox/source/helper/propertymap.cxx |1 + oox/source/helper/propertyset.cxx |1 + oox/source/helper/zipstorage.cxx |1 + oox/source/mathml/importutils.cxx |1 + oox/source/ole/axcontrol.cxx |1 + oox/source/ole/vbacontrol.cxx |1 + oox/source/ole/vbaproject.cxx |1 + oox/source/ppt/animationspersist.cxx |1 + oox/source/ppt/commonbehaviorcontext.cxx |1 + oox/source/ppt/pptimport.cxx |1 + oox/source/ppt/pptshape.cxx |1 + oox/source/ppt/pptshapecontext.cxx|2 ++ oox/source/ppt/presentationfragmenthandler.cxx|1 + oox/source/ppt/slidefragmenthandler.cxx |1 + oox/source/ppt/slidetransition.cxx|1 + oox/source/ppt/timenodelistcontext.cxx|1 + oox/source/ppt/timetargetelementcontext.cxx |1 + oox/source/shape/LockedCanvas
[Libreoffice-commits] core.git: include/svl solenv/clang-format svl/source
include/svl/grabbagitem.hxx | 19 ++-
solenv/clang-format/blacklist|2 --
svl/source/items/grabbagitem.cxx |5 ++---
3 files changed, 8 insertions(+), 18 deletions(-)
New commits:
commit 5ea91ed27342766f2b6103ddb64f07e35af54e50
Author: Miklos Vajna
AuthorDate: Mon Jul 30 14:02:58 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 16:25:37 2018 +0200
svl: turn on clang-format for grabbagitem
I (tried to) keep these files consistent manually in the past, switching to
clang-format makes sure that the recent problem with introducing
inconsistencies in these files doesn't happen again.
Change-Id: I94e7f846c0d3361082d74a2883486c9aa67ed362
Reviewed-on: https://gerrit.libreoffice.org/58322
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index d938d526f710..4fcd9159a8e6 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -22,25 +22,18 @@ private:
std::map m_aMap;
public:
-
SfxGrabBagItem();
SfxGrabBagItem(sal_uInt16 nWhich);
~SfxGrabBagItem() override;
-SfxGrabBagItem(SfxGrabBagItem const &) = default;
-SfxGrabBagItem(SfxGrabBagItem &&) = default;
-SfxGrabBagItem & operator =(SfxGrabBagItem const &) = default;
-SfxGrabBagItem & operator =(SfxGrabBagItem &&) = default;
+SfxGrabBagItem(SfxGrabBagItem const&) = default;
+SfxGrabBagItem(SfxGrabBagItem&&) = default;
+SfxGrabBagItem& operator=(SfxGrabBagItem const&) = default;
+SfxGrabBagItem& operator=(SfxGrabBagItem&&) = default;
-const std::map& GetGrabBag() const
-{
-return m_aMap;
-}
+const std::map& GetGrabBag() const { return
m_aMap; }
-std::map& GetGrabBag()
-{
-return m_aMap;
-}
+std::map& GetGrabBag() { return m_aMap; }
bool operator==(const SfxPoolItem& rItem) const override;
SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index bdfe45ecc3e9..312b8016ba05 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6959,7 +6959,6 @@ include/svl/filenotation.hxx
include/svl/flagitem.hxx
include/svl/fstathelper.hxx
include/svl/globalnameitem.hxx
-include/svl/grabbagitem.hxx
include/svl/gridprinter.hxx
include/svl/hint.hxx
include/svl/ilstitem.hxx
@@ -13772,7 +13771,6 @@ svl/source/items/cintitem.cxx
svl/source/items/custritm.cxx
svl/source/items/flagitem.cxx
svl/source/items/globalnameitem.cxx
-svl/source/items/grabbagitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/int64item.cxx
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index b7693dcd68bf..c476fe27e0c1 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -14,13 +14,12 @@
#include
#include
-
using namespace com::sun::star;
SfxGrabBagItem::SfxGrabBagItem() = default;
-SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich) :
-SfxPoolItem(nWhich)
+SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich)
+: SfxPoolItem(nWhich)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/inc
editeng/inc/editdoc.hxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit ce3e03bd87b9091485931d7621472a3113b41a9e
Author: Caolán McNamara
AuthorDate: Mon Jul 30 13:16:00 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 30 16:19:00 2018 +0200
deque could be a vector instead
reduces peak memory from 90M to 65M
Change-Id: Ia30309b7a1adf0736c1e84b2aafcd8b10b7fea8c
Reviewed-on: https://gerrit.libreoffice.org/58324
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 821a26e79306..92b677466761 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -33,7 +33,6 @@
#include
#include
-#include
#include
#include
@@ -90,7 +89,7 @@ struct ScriptTypePosInfo
}
};
-typedef std::deque< ScriptTypePosInfo > ScriptTypePosInfos;
+typedef std::vector ScriptTypePosInfos;
struct WritingDirectionInfo
{
___
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/ui/fldui/DropDownFieldDialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 15f8f0be29c42ac0c10af679ff5bb51b29bb3bd1
Author: Caolán McNamara
AuthorDate: Mon Jul 30 11:12:04 2018 +0100
Commit: Xisco Faulí
CommitDate: Mon Jul 30 16:08:28 2018 +0200
Resolves: tdf#118965 fix input list edit button
regression since...
commit 7d5245848c28f5786258476cd7aa2a4523645de3
Date: Fri Sep 15 17:39:48 2017 +0200
tdf#79877 revert to old behavior when clicking on input fields.
Change-Id: I5e67a8f0c8d2599c139d3d728298c30f4a31c8d1
Reviewed-on: https://gerrit.libreoffice.org/58315
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index d467cfa3470e..655f2d60c086 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -117,7 +117,7 @@ bool sw::DropDownFieldDialog::NextButtonPressed() const
IMPL_LINK_NOARG(sw::DropDownFieldDialog, EditHdl, weld::Button&, void)
{
m_pPressedButton = m_xEditPB.get();
-m_xDialog->response(RET_OK);
+m_xDialog->response(RET_YES);
}
IMPL_LINK_NOARG(sw::DropDownFieldDialog, PrevHdl, weld::Button&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W30-2018)
Hello, What have happened in QA in the last 7 days? * 90 bugs have been created, of which, 32 are still unconfirmed ( Total Unconfirmed bugs: 390 ) + Created bugs: http://tinyurl.com/ya6t2zlt + Still unconfirmed bugs: http://tinyurl.com/y824r67t * 1060 comments have been written by 162 users. * 41 new users have signed up to Bugzilla. == STATUSES CHANGED == * 10 bugs have been changed to 'ASSIGNED'. + Link: http://tinyurl.com/y8hj3qvb + Done by: Xisco Faulí ( 3 ), Miklos Vajna ( 1 ), Heiko Tietze ( 1 ), Julien Nabet ( 1 ), Paul Trojahn ( 1 ), nicksonthanda10 ( 1 ), nelsoch ( 1 ), Mike Kaganski ( 1 ) * 2 bugs have been changed to 'CLOSED'. + Link: http://tinyurl.com/ydxtw6x3 + Done by: Harald Koester ( 1 ), Eike Rathke ( 1 ) * 23 bugs have been changed to 'NEEDINFO'. + Link: http://tinyurl.com/y8zedh3a + Done by: Xisco Faulí ( 11 ), Jean-Baptiste Faure ( 3 ), Alex Thurgood ( 2 ), Timur ( 2 ), tommy27 ( 2 ), Heiko Tietze ( 1 ), Julien Nabet ( 1 ), ashashamaiah27 ( 1 ) * 40 bugs have been changed to 'NEW'. + Link: http://tinyurl.com/yap3ansg + Done by: Xisco Faulí ( 9 ), Heiko Tietze ( 5 ), Drew Jensen ( 4 ), V Stuart Foote ( 3 ), Timur ( 3 ), Regina Henschel ( 2 ), raal ( 2 ), Alex Thurgood ( 2 ), Dieter Praas ( 2 ), Buovjaga ( 1 ), Thomas Hackert ( 1 ), MM ( 1 ), Laurent BP ( 1 ), Jean-Baptiste Faure ( 1 ), Jacques Guilleron ( 1 ), Gökhan Gurbetoğlu ( 1 ), osnola ( 1 ) * 2 bugs have been changed to 'REOPENED'. + Link: http://tinyurl.com/y9m2w8hp + Done by: Heiko Tietze ( 1 ), david.vantyghem ( 1 ) * 19 bugs have been changed to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y86778vg + Done by: Justin L ( 6 ), Xisco Faulí ( 2 ), Timur ( 2 ), Drew Jensen ( 2 ), Julien Nabet ( 1 ), robert ( 1 ), Olivier Hallot ( 1 ), Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 ), Aron Budea ( 1 ), kompilainenn ( 1 ) * 35 bugs have been changed to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y9g2ubfw + Done by: Mark Hung ( 9 ), Justin L ( 9 ), Heiko Tietze ( 3 ), Timur ( 2 ), Xisco Faulí ( 1 ), Winfried Donkers ( 1 ), Miklos Vajna ( 1 ), Thorsten Wagner ( 1 ), Regina Henschel ( 1 ), Olivier Hallot ( 1 ), Mike Kaganski ( 1 ), Markus Mohrhard ( 1 ), gmolleda ( 1 ), Eike Rathke ( 1 ), Caolán McNamara ( 1 ), Armin Le Grand (CIB) ( 1 ) * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/y8vvyafj + Done by: Jean-Baptiste Faure ( 1 ) * 3 bugs have been changed to 'RESOLVED INVALID'. + Link: http://tinyurl.com/y9c7jmqk + Done by: V Stuart Foote ( 1 ), Telesto ( 1 ), Timur ( 1 ) * 1 bug has been changed to 'RESOLVED MOVED'. + Link: http://tinyurl.com/ycncmntm + Done by: V Stuart Foote ( 1 ) * 7 bugs have been changed to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/yca3qvr6 + Done by: Xisco Faulí ( 2 ), V Stuart Foote ( 1 ), Thomas Seeling ( 1 ), m.a.riosv ( 1 ), Inbadreams ( 1 ), Drew Jensen ( 1 ) * 1 bug has been changed to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/ydyelojn + Done by: Jean-Baptiste Faure ( 1 ) * 23 bugs have been changed to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/y9lwezxl + Done by: Olivier Hallot ( 11 ), V Stuart Foote ( 3 ), Heiko Tietze ( 3 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ), OfficeUser ( 1 ), Caolán McNamara ( 1 ), Aron Budea ( 1 ), kompilainenn ( 1 ) * 20 bugs have been changed to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/y8h8gmcw + Done by: Xisco Faulí ( 2 ), Heiko Tietze ( 2 ), Regina Henschel ( 2 ), Timur ( 2 ), kompilainenn ( 2 ), Xavier Van Wijmeersch ( 1 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), Olivier Hallot ( 1 ), Mike Kaganski ( 1 ), mahfiaz ( 1 ), Luke ( 1 ), Joel Madero ( 1 ), Jean-Baptiste Faure ( 1 ), Andrew Mitchell ( 1 ) * 11 bugs have been changed to 'UNCONFIRMED'. + Link: http://tinyurl.com/ybyexoxy + Done by: Carlos Silvestre ( 2 ), Xisco Faulí ( 1 ), muso ( 1 ), Markus Grob ( 1 ), sharmadineshv ( 1 ), Stephen ( 1 ), neil.youngman ( 1 ), Mike Kaganski ( 1 ), MD ( 1 ), tommy27 ( 1 ) * 18 bugs have been changed to 'VERIFIED FIXED'. + Link: http://tinyurl.com/y7ema24o + Done by: Xisco Faulí ( 15 ), Zineta ( 1 ), Luke ( 1 ), Jean-Baptiste Faure ( 1 ) == KEYWORDS ADDED == * 'bibisectRequest' has been added to 2 bugs. + Link: http://tinyurl.com/yaddrya9 + Done by: Xisco Faulí ( 1 ), kompilainenn ( 1 ) * 'bibisected' has been added to 19 bugs. + Link: http://tinyurl.com/yb3zowcf + Done by: Xisco Faulí ( 14 ), Justin L ( 2 ), Buovjaga ( 1 ), Drew Jensen ( 1 ), Aron Budea ( 1 ) * 'bisected' has been added to 17 bugs. + Link: http://tinyurl.com/y7x3a4j8 + Done by: Xisco Faulí ( 11 ), Justin L ( 3 ), Buovjaga ( 1 ), himajin10 ( 1 ), Aron Budea ( 1 ) * 'corruptP
[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
sw/inc/strings.hrc |1 -
sw/uiconfig/sglobal/menubar/menubar.xml |2 +-
sw/uiconfig/sweb/menubar/menubar.xml|2 +-
sw/uiconfig/swriter/menubar/menubar.xml |2 +-
sw/uiconfig/swriter/popupmenu/table.xml |2 +-
sw/uiconfig/swriter/popupmenu/text.xml |2 +-
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui|2 +-
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |2 +-
sw/uiconfig/swriter/ui/notebookbar_groups.ui|2 +-
sw/uiconfig/swxform/menubar/menubar.xml |2 +-
11 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 94614dc88d78c68d687222d2eb205605e1bd0c51
Author: Maxim Monastirsky
AuthorDate: Mon Jul 30 00:27:20 2018 +0300
Commit: Maxim Monastirsky
CommitDate: Mon Jul 30 15:32:59 2018 +0200
tdf#108461 Correct use of the default style
The underlying issue was fixed by Miklos in commit
9d754a59154c40235c240bb0e7f47a2006fa85bd ("sw: give
the 'Default Style' char style a programmatic name").
What left is to actually use the internal name in
various UI elements.
Also removed a comment that tells to not rename the
default style, which isn't relevant anymore, as we
no longer write the UI name into files.
Change-Id: Ie2ab632e40b4fc6295f2c9d1a1f1f2358ab38e52
Reviewed-on: https://gerrit.libreoffice.org/58311
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 286f44343fa9..b185aac57576 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3053,7 +3053,7 @@
9
-
+
Default ~Character
@@ -3066,7 +3066,7 @@
Default Character Style
- .uno:StyleApply?Style:string=Default
Style&FamilyName:string=CharacterStyles
+
.uno:StyleApply?Style:string=Standard&FamilyName:string=CharacterStyles
9
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 9be1de51bfe9..7a35d1ebe1d2 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -59,7 +59,6 @@
#define STR_POOLFRM_WATERSIGN NC_("STR_POOLFRM_WATERSIGN",
"Watermark")
#define STR_POOLFRM_LABEL NC_("STR_POOLFRM_LABEL",
"Labels")
// Template names
-// tdf#107211 please don't change STANDARD, except back to "Default"
#define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD",
"Default Style")
#define STR_POOLCOLL_TEXT NC_("STR_POOLCOLL_TEXT", "Text
Body")
#define STR_POOLCOLL_TEXT_IDENT NC_("STR_POOLCOLL_TEXT_IDENT",
"First Line Indent")
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index c889ba6f87c2..4e3b76f70398 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -557,7 +557,7 @@
-
+
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index 1b5624f22169..99dba081a7f3 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -432,7 +432,7 @@
-
+
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index f2148b3fa3fe..532e8b8d6c73 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -557,7 +557,7 @@
-
+
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml
b/sw/uiconfig/swriter/popupmenu/table.xml
index bdd835d4960c..92d143884e9d 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -78,7 +78,7 @@
-
+
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml
b/sw/uiconfig/swriter/popupmenu/text.xml
index 3c020ef793a7..a8462627225b 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -48,7 +48,7 @@
-
+
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 4835169624e6..7f82770797ba 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
Re: ODF specification for border around text portions
Hi Tamás, Tamás Zolnai schrieb am 30-Jul-18 um 11:57: Hi Regina, That's right what Miklos wrote here, it was added mainly for MS compatibility, so the expected behavior if it works similar to that. This line height handling "bug" seems an independent issue from the character border, which affects that use case too. Yes, that bug can be seen too with images anchored as character or single characters in larger font size. But the effect of the bug for me is, that I cannot say "LibreOffice has implemented borders same as Word.". However I'm not sure that ODF specification is this detailed that you need to specify these things too. At least I did not meet with a detailed specification. As I remember in ODF spec the border related attrubutes are general attributes already used for other objects like paragraphs, pages, frames, etc. Unfortunately it is not that simple. The border of the paragraph is a fo:border and is specified by a reference to XSL. And XSL specifies it by a reference to CSS2. And there I come to https://www.w3.org/TR/CSS2/visudet.html#inline-non-replaced with its description "The vertical padding, border and margin of an inline, non-replaced box start at the top and bottom of the content area, and has nothing to do with the 'line-height'. But only the 'line-height' is used when calculating the height of the line box." Therefore the current fo:border is not suitable to describe a intended, Word compatible rendering. So it might be a good idea to check how paragraph border works for example. In theory these two should be somewhat consistent and as I see they are. Line height - border interaction seems similar for paragraphs and when a paragraph is splitted between pages I see two separate boxes. That is the behavior of LibreOffice. But if browser (tested with Seamonkey and Chrome) split a paragraph across pages, then the bottom border of the paragraph in the first page is missing and the top border of the paragraph on the second page is missing. And because ODF indirectly uses CSS, here is a problem too. Therefor this mail: How to resolve the differences between rendering as specified by CSS and rendering in Word? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - external/harfbuzz include/vcl vcl/source
external/harfbuzz/harfbuzz-rtti.patch | 12 +--
include/vcl/BitmapGaussianSeparableBlurFilter.hxx |8 +-
vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx | 60 +++
vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx | 62
4 files changed, 71 insertions(+), 71 deletions(-)
New commits:
commit e3c8f4978a797f2b999865b7d6ebd65aa1ef93f4
Author: Caolán McNamara
AuthorDate: Mon Jul 30 10:07:46 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 30 13:59:29 2018 +0200
Related: rhbz#1602589 rework to avoid bogus cppcheck double free warning
Change-Id: Ie673de68f39b903536c2287b8989fe6afcc9fd66
Reviewed-on: https://gerrit.libreoffice.org/58307
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index 6e6a3a09e6f0..c1359dab4761 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
@@ -12,6 +12,7 @@
#define INCLUDED_VCL_BITMAPGAUSSIANSEPARABLEBLURFILTER_HXX
#include
+#include
class BitmapEx;
@@ -39,10 +40,11 @@ private:
int aNumberOfContributions, const double* pWeights,
int const* pPixels,
const int* pCount);
-static double* makeBlurKernel(const double radius, int& rows);
+static std::vector makeBlurKernel(const double radius, int& rows);
static void blurContributions(const int aSize, const int
aNumberOfContributions,
- const double* pBlurVector, double*&
pWeights, int*& pPixels,
- int*& pCount);
+ const std::vector& rBlurVector,
+ std::vector& rWeights,
std::vector& rPixels,
+ std::vector& rCounts);
};
#endif
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index b28ce99e8d19..d65d82e238b3 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -26,14 +26,13 @@ BitmapEx
BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx)
// Prepare Blur Vector
int aNumberOfContributions;
-double* pBlurVector = makeBlurKernel(mfRadius, aNumberOfContributions);
-
-double* pWeights;
-int* pPixels;
-int* pCount;
+std::vector aBlurVector(makeBlurKernel(mfRadius,
aNumberOfContributions));
+std::vector aWeights;
+std::vector aPixels;
+std::vector aCounts;
// Do horizontal filtering
-blurContributions(nWidth, aNumberOfContributions, pBlurVector, pWeights,
pPixels, pCount);
+blurContributions(nWidth, aNumberOfContributions, aBlurVector, aWeights,
aPixels, aCounts);
Bitmap::ScopedReadAccess pReadAcc(aBitmap);
@@ -41,17 +40,17 @@ BitmapEx
BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx)
Bitmap aNewBitmap(Size(nHeight, nWidth), 24);
bool bResult = convolutionPass(aBitmap, aNewBitmap, pReadAcc.get(),
aNumberOfContributions,
- pWeights, pPixels, pCount);
+ aWeights.data(), aPixels.data(),
aCounts.data());
// Cleanup
pReadAcc.reset();
-delete[] pWeights;
-delete[] pPixels;
-delete[] pCount;
+aWeights.clear();
+aPixels.clear();
+aCounts.clear();
if (!bResult)
{
-delete[] pBlurVector;
+aBlurVector.clear();
}
else
{
@@ -59,19 +58,19 @@ BitmapEx
BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx)
aBitmap.ReassignWithSize(aNewBitmap);
// Do vertical filtering
-blurContributions(nHeight, aNumberOfContributions, pBlurVector,
pWeights, pPixels, pCount);
+blurContributions(nHeight, aNumberOfContributions, aBlurVector,
aWeights, aPixels, aCounts);
pReadAcc = Bitmap::ScopedReadAccess(aBitmap);
aNewBitmap = Bitmap(Size(nWidth, nHeight), 24);
bResult = convolutionPass(aBitmap, aNewBitmap, pReadAcc.get(),
aNumberOfContributions,
- pWeights, pPixels, pCount);
+ aWeights.data(), aPixels.data(),
aCounts.data());
// Cleanup
pReadAcc.reset();
-delete[] pWeights;
-delete[] pCount;
-delete[] pPixels;
-delete[] pBlurVector;
+aWeights.clear();
+aCounts.clear();
+aPixels.clear();
+aBlurVector.clear();
if (bResult)
aBitmap.ReassignWithSize(aNewBitmap); // swap current bitmap with
new bitmap
@@ -138,11 +137,12 @@ bool
BitmapGaussianSeparableBlurFilter::convolutionPass(Bitmap& rBitmap, Bitmap&
return true;
}
-double* Bit
[Libreoffice-commits] core.git: sw/source
sw/source/core/swg/SwXMLTextBlocks.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit ccf14962edf5cb1cf650363c876f6460e9403ccf Author: Noel Grandin AuthorDate: Mon Jul 30 12:00:13 2018 +0200 Commit: Noel Grandin CommitDate: Mon Jul 30 13:38:23 2018 +0200 fix bug in SwXMLTextBlocks::CopyBlock would have created a name that looked like 123456789101112 etc, which is probably not what it wanted Change-Id: I4ebdf1444fc12d57762463075ca0dea2cc046dd7 Reviewed-on: https://gerrit.libreoffice.org/58309 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index eed2272a3ad5..2f22f88f8b3d 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -238,7 +238,8 @@ ErrCode SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, const OUString aGroup( rShort ); bool bTextOnly = IsOnlyTextBlock ( rShort ) ;//pImp->pBlkRoot->IsStream( aGroup ); sal_uInt16 nIndex = GetIndex ( rShort ); -OUString sDestShortName( GetPackageName (nIndex) ); +OUString sPackageName( GetPackageName (nIndex) ); +OUString sDestShortName( sPackageName ); sal_uInt16 nIdx = 0; OSL_ENSURE( xBlkRoot.is(), "No storage set" ); @@ -256,7 +257,7 @@ ErrCode SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, rDestImp.CloseFile(); return ERR_SWG_WRITE_ERROR; } -sDestShortName += OUString::number( nIdx ); +sDestShortName = sPackageName + OUString::number( nIdx ); } try ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/OpenTypeFeatureDefinitonList.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8e46561f087e923bc0d9ad03758c270b06d201fb
Author: Tomaž Vajngerl
AuthorDate: Mon Jul 30 10:23:26 2018 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Jul 30 13:29:38 2018 +0200
fix OT font feature description ssxx and cvxx mixup
Change-Id: I20e169fede237e4760f8be905e70a3ed964c402f
Reviewed-on: https://gerrit.libreoffice.org/58305
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
index 1c75d46031c7..93b5e6d67550 100644
--- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
+++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
@@ -164,9 +164,9 @@
OpenTypeFeatureDefinitonListPrivate::handleSpecialFeatureCode(sal_uInt32 nFeatur
if (!sNumericPart.isEmpty())
{
if (isCharacterVariantCode(nFeatureCode))
-aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_SSXX,
sNumericPart };
-else if (isStylisticSetCode(nFeatureCode))
aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_CVXX,
sNumericPart };
+else if (isStylisticSetCode(nFeatureCode))
+aFeatureDefinition = { nFeatureCode, STR_FONT_FEATURE_ID_SSXX,
sNumericPart };
}
return aFeatureDefinition;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/fldui/DropDownFieldDialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1eb1fe39f14a8fcd306859f0741c88b8577a2598
Author: Caolán McNamara
AuthorDate: Mon Jul 30 11:12:04 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 30 13:27:13 2018 +0200
Resolves: tdf#118965 fix input list edit button
regression since...
commit 7d5245848c28f5786258476cd7aa2a4523645de3
Date: Fri Sep 15 17:39:48 2017 +0200
tdf#79877 revert to old behavior when clicking on input fields.
Change-Id: I5e67a8f0c8d2599c139d3d728298c30f4a31c8d1
Reviewed-on: https://gerrit.libreoffice.org/58313
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 7514b85bb8a0..7bec262b6338 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -117,7 +117,7 @@ bool sw::DropDownFieldDialog::NextButtonPressed() const
IMPL_LINK_NOARG(sw::DropDownFieldDialog, EditHdl, weld::Button&, void)
{
m_pPressedButton = m_xEditPB.get();
-m_xDialog->response(RET_OK);
+m_xDialog->response(RET_YES);
}
IMPL_LINK_NOARG(sw::DropDownFieldDialog, PrevHdl, weld::Button&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/gengal/gengal.sh |2 -- 1 file changed, 2 deletions(-) New commits: commit 7c3dcb0546c5fbaae6b67ce5e4c5305ba85a96a8 Author: Caolán McNamara AuthorDate: Mon Jul 30 10:39:54 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 30 13:26:56 2018 +0200 SHELLCHECK_WARNING, VERBOSE is unused gengal.sh was originally based on unopkg.sh which had this --verbose switch... commit 164027e48899faaee284242eaca04b8aa5545319 Date: Fri Apr 5 16:39:24 2013 +0100 gengal: re-base on original tool. new wrapper based on unopkg.sh. work re-based on original SUSE implementation. and unopkg.sh later had VERBOSE removed... commit 1fc195f7e830619d56cc4c56043b154bc3a72b02 Author: Stephan Bergmann Date: Thu Oct 17 15:34:53 2013 +0200 Simplify code (VERBOSE was unused) but gengal.sh retained its unused VERBOSE variable Change-Id: I56aa830aef829c7727550fcaf7aed5058fffdc78 Reviewed-on: https://gerrit.libreoffice.org/58308 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh index 3970ab1fa9c8..245c171c3caf 100755 --- a/svx/source/gengal/gengal.sh +++ b/svx/source/gengal/gengal.sh @@ -59,8 +59,6 @@ for arg in "$@" do case "$arg" in -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; - -v) VERBOSE=true;; - --verbose) VERBOSE=true;; esac done ___ 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-cd-3-2' - 2 commits - loleaflet/po
loleaflet/po/ui-ja.po | 168 +++--- 1 file changed, 91 insertions(+), 77 deletions(-) New commits: commit 2212e1055024c69e2dad88ecb61832e3fbc4a57d Author: Andras Timar AuthorDate: Mon Jul 30 13:05:35 2018 +0200 Commit: Andras Timar CommitDate: Mon Jul 30 13:09:56 2018 +0200 loleaflet: a few more Japanese UI strings translated diff --git a/loleaflet/po/ui-ja.po b/loleaflet/po/ui-ja.po index 7435c0af9..0e37b7697 100644 --- a/loleaflet/po/ui-ja.po +++ b/loleaflet/po/ui-ja.po @@ -93,7 +93,7 @@ msgstr "アイドル時間" #: admin.strings.js:24 msgid "Modified" -msgstr "" +msgstr "変更" #: admin.strings.js:25 msgid "Kill" @@ -272,7 +272,7 @@ msgstr "表の挿入" #: dist/toolbar/toolbar.js:521 msgid "More" -msgstr "" +msgstr "詳細" #: dist/toolbar/toolbar.js:619 dist/toolbar/toolbar.js:1094 msgid "Sum" @@ -308,7 +308,7 @@ msgstr "最後のシート" #: dist/toolbar/toolbar.js:642 msgid "Insert sheet" -msgstr "" +msgstr "シートの挿入" #: dist/toolbar/toolbar.js:652 src/control/Control.Menubar.js:288 msgid "Fullscreen presentation" @@ -332,7 +332,7 @@ msgstr "常に編集者に従う" #: dist/toolbar/toolbar.js:688 msgid "Current" -msgstr "" +msgstr "現在" #: dist/toolbar/toolbar.js:695 src/control/Control.Menubar.js:58 #: src/control/Control.Menubar.js:253 @@ -581,7 +581,7 @@ msgstr "Microsoft Word (.docx)" #: src/control/Control.Menubar.js:27 msgid "Rich Text (.rtf)" -msgstr "" +msgstr "Rich Text (.rtf)" #: src/control/Control.Menubar.js:32 src/control/Control.Menubar.js:239 #: src/control/Control.Menubar.js:317 @@ -590,7 +590,7 @@ msgstr "修復" #: src/control/Control.Menubar.js:79 src/control/Control.Menubar.js:81 msgid "All" -msgstr "" +msgstr "すべて" #: src/control/Control.Menubar.js:128 msgid "Text orientation" @@ -663,7 +663,7 @@ msgstr "標準の値" #: src/control/Control.MetricInput.js:68 msgid "Submit" -msgstr "" +msgstr "送信" #: src/control/Control.Scroll.Annotation.js:9 msgid "Scroll up annotations" @@ -739,19 +739,19 @@ msgstr "" #: src/core/Socket.js:438 msgid "Document has been changed in storage. What would you like to do with your unsaved changes?" -msgstr "" +msgstr "ドキュメントがストレージ上で変更されました。" #: src/core/Socket.js:443 msgid "Discard" -msgstr "" +msgstr "変更を破棄" #: src/core/Socket.js:448 msgid "Overwrite" -msgstr "" +msgstr "ドキュメントを上書き" #: src/core/Socket.js:453 msgid "Save to new file" -msgstr "" +msgstr "名前を付けて保存" #: src/core/Socket.js:520 msgid "Document requires password to view." commit 1b172821452955e3ccc79a446e936cf5afc4f760 Author: Andras Timar AuthorDate: Mon Jul 30 11:49:33 2018 +0200 Commit: Andras Timar CommitDate: Mon Jul 30 13:09:51 2018 +0200 loleaflet: updated Japanese UI po file diff --git a/loleaflet/po/ui-ja.po b/loleaflet/po/ui-ja.po index 23abac694..7435c0af9 100644 --- a/loleaflet/po/ui-ja.po +++ b/loleaflet/po/ui-ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-28 14:15+0200\n" +"POT-Creation-Date: 2018-07-30 11:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,6 +35,7 @@ msgid "Analytics" msgstr "分析" #: admin.strings.js:10 evol.colorpicker.strings.js:6 +#: dist/toolbar/toolbar.js:311 dist/toolbar/toolbar.js:322 msgid "History" msgstr "履歴" @@ -158,23 +159,28 @@ msgstr "期限切れ:" msgid "Refresh" msgstr "更新" -#: evol.colorpicker.strings.js:2 +#: evol.colorpicker.strings.js:2 dist/toolbar/toolbar.js:311 +#: dist/toolbar/toolbar.js:322 msgid "Theme Colors" msgstr "テーマの色" -#: evol.colorpicker.strings.js:3 +#: evol.colorpicker.strings.js:3 dist/toolbar/toolbar.js:311 +#: dist/toolbar/toolbar.js:322 msgid "Standard Colors" msgstr "標準色" -#: evol.colorpicker.strings.js:4 +#: evol.colorpicker.strings.js:4 dist/toolbar/toolbar.js:311 +#: dist/toolbar/toolbar.js:322 msgid "Web Colors" msgstr "ウェブ色" -#: evol.colorpicker.strings.js:5 +#: evol.colorpicker.strings.js:5 dist/toolbar/toolbar.js:311 +#: dist/toolbar/toolbar.js:322 msgid "Back to Palette" msgstr "パレットに戻る" -#: evol.colorpicker.strings.js:7 +#: evol.colorpicker.strings.js:7 dist/toolbar/toolbar.js:311 +#: dist/toolbar/toolbar.js:322 msgid "No history yet." msgstr "履歴はありません。" @@ -207,8 +213,8 @@ msgid "Unauthorized WOPI host. Please try again later and report to your adminis msgstr "認証されていないWOPIホストです。後ほど再度試して、問題があるようなら管理者に報告してください。" #: dist/errormessages.js:8 -msgid "Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: file_path=/path/to/doc/" -msgstr "WOPISrcが誤っています。利用法: WOPISrc=正しくエンコードされたURI、またはファイルパス、利用法=/path/to/doc" +msgid "Wrong or missing WOPISrc parameter, please contact support." +msgstr "" #: dist/errormessages.js:9 msgid "Your session will expire in %time. Please save your work and refresh the session (or webpage) to continue." @@ -256,185 +262,189 @@ msgstr "0 ユーザー" msgid "Are you sure you want to delete this page?"
Re: 64-bit Windows build failure: 'this' pointer for member, may not be aligned 8 as expected by the constructor
On Sun, 2018-07-29 at 22:23 +, Luke Benes wrote: > I can confirm reverting: > > https://cgit.freedesktop.org/libreoffice/core/commit/?id=8b8fb4ac > > Fixes this issue, allowing the build to succeed. Maybe https://cgit.freedesktop.org/libreoffice/core/commit/?id=397c2e67 e6614f87e408432f63956f507a64023d will clear that warning/error ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par2.cxx |2 -
sw/source/filter/ww8/ww8par6.cxx | 10 ++---
sw/source/filter/ww8/ww8scan.cxx | 64 +++---
sw/source/filter/ww8/ww8struc.hxx |3 +
4 files changed, 40 insertions(+), 39 deletions(-)
New commits:
commit 397c2e67e6614f87e408432f63956f507a64023d
Author: Caolán McNamara
AuthorDate: Mon Jul 30 09:33:03 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 30 12:05:49 2018 +0200
workaround msvc compiler warning
warning C4315: 'WW8_FFN': 'this' pointer for member 'WW8_FFN::sFontname' may
not be aligned 8 as expected by the constructor
Change-Id: Ic23b79c7da5f435f72cf3d1d3052d7a6926e5dce
Reviewed-on: https://gerrit.libreoffice.org/58303
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3fcb7ad116b9..7fb6ee18862f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -594,7 +594,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum,
WW8_ANLV const &rAV,
rtl_TextEncoding eCharSet = m_eStructCharSet;
const WW8_FFN* pF = m_xFonts->GetFont(SVBT16ToShort(rAV.ftc)); // FontInfo
-bool bListSymbol = pF && ( pF->chs == 2 ); // Symbol/WingDings/...
+bool bListSymbol = pF && ( pF->aFFNBase.chs == 2 ); //
Symbol/WingDings/...
OUString sText;
sal_uInt32 nLen = rAV.cbTextBefore + rAV.cbTextAfter;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 7abf127ec0fd..4513d19bd177 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3563,20 +3563,20 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode,
FontFamily& reFamily,
rName = pF->sFontname;
// pF->prg : Pitch
-rePitch = ePitchA[pF->prg];
+rePitch = ePitchA[pF->aFFNBase.prg];
// pF->chs: Charset
-if( 77 == pF->chs ) // Mac font in Mac Charset or
+if( 77 == pF->aFFNBase.chs ) // Mac font in Mac Charset or
reCharSet = m_eTextCharSet; // translated to ANSI charset
else
{
// #i52786#, for word 67 we'll assume that ANSI is basically invalid,
// might be true for (above) mac as well, but would need a mac example
// that exercises this to be sure
-if (m_bVer67 && pF->chs == 0)
+if (m_bVer67 && pF->aFFNBase.chs == 0)
reCharSet = RTL_TEXTENCODING_DONTKNOW;
else
-reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs );
+reCharSet =
rtl_getTextEncodingFromWindowsCharset(pF->aFFNBase.chs);
}
// make sure Font Family Code is set correctly
@@ -3605,7 +3605,7 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode,
FontFamily& reFamily,
}
else
{
-reFamily = eFamilyA[pF->ff];
+reFamily = eFamilyA[pF->aFFNBase.ff];
}
return true;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c581f22385c6..eafd78c352b7 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7247,17 +7247,17 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
{
if (!readU8(
pVer2, offsetof(WW8_FFN_BASE, cbFfnM1), pEnd,
-&p->cbFfnM1))
+&p->aFFNBase.cbFfnM1))
{
break;
}
-p->prg = 0;
-p->fTrueType = 0;
-p->ff= 0;
+p->aFFNBase.prg = 0;
+p->aFFNBase.fTrueType = 0;
+p->aFFNBase.ff= 0;
-if (!(readU8(pVer2, 1, pEnd, &p->wWeight)
- && readU8(pVer2, 2, pEnd, &p->chs)))
+if (!(readU8(pVer2, 1, pEnd, &p->aFFNBase.wWeight)
+ && readU8(pVer2, 2, pEnd, &p->aFFNBase.chs)))
{
break;
}
@@ -7266,7 +7266,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
the font, e.g load the doc in 97 and save to see the unicode
ver of the asian fontnames in that example to confirm.
*/
-rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(p->chs,
rFib.m_lid);
+rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(p->aFFNBase.chs,
rFib.m_lid);
if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc ==
RTL_TEXTENCODING_DONTKNOW))
eEnc = RTL_TEXTENCODING_MS_1252;
@@ -7276,7 +7276,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
}
p->sFontname = OUString(
reinterpret_cast(pVer2 + 1 + 2), n, eEnc);
-pVer2 = pVer2 + p->cbFfnM1 + 1;
+pV
Re: ODF specification for border around text portions
Hi Regina, That's right what Miklos wrote here, it was added mainly for MS compatibility, so the expected behavior if it works similar to that. This line height handling "bug" seems an independent issue from the character border, which affects that use case too. However I'm not sure that ODF specification is this detailed that you need to specify these things too. At least I did not meet with a detailed specification. As I remember in ODF spec the border related attrubutes are general attributes already used for other objects like paragraphs, pages, frames, etc. So it might be a good idea to check how paragraph border works for example. In theory these two should be somewhat consistent and as I see they are. Line height - border interaction seems similar for paragraphs and when a paragraph is splitted between pages I see two separate boxes. Best Regards, Tamás 2018-07-30 9:24 GMT+02:00 Miklos Vajna : > Hi Regina, > > On Mon, Jul 30, 2018 at 12:36:01AM +0200, Regina Henschel < > rb.hensc...@t-online.de> wrote: > > I have noticed the problems described below, when looking what would be > > needed for interoperability with Word and what would be needed for EPUB > > export. > > I think it was on purpose that Tamas implemented this feature in terms > of what Word does. > > Regards, > > Miklos > > ___ > 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: loleaflet/po
loleaflet/po/templates/loleaflet-ui.pot | 348 1 file changed, 178 insertions(+), 170 deletions(-) New commits: commit 33f0e7e893d3a4f7d14ce1a2b958d9539f9e912c Author: Andras Timar AuthorDate: Mon Jul 30 11:37:05 2018 +0200 Commit: Andras Timar CommitDate: Mon Jul 30 11:37:05 2018 +0200 loleaflet: updated UI pot file Change-Id: I31fb03a771cd802416250d9dad29ccadd8fd1631 diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot index fc9e84f82..992cab3f5 100644 --- a/loleaflet/po/templates/loleaflet-ui.pot +++ b/loleaflet/po/templates/loleaflet-ui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-19 09:41+0200\n" +"POT-Creation-Date: 2018-07-30 11:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,147 +17,147 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: admin/admin.strings.js:5 +#: admin/admin.strings.js:6 msgid "Admin console" msgstr "" -#: admin/admin.strings.js:6 +#: admin/admin.strings.js:7 msgid "Settings" msgstr "" -#: admin/admin.strings.js:7 +#: admin/admin.strings.js:8 msgid "Overview" msgstr "" -#: admin/admin.strings.js:8 +#: admin/admin.strings.js:9 msgid "(current)" msgstr "" -#: admin/admin.strings.js:9 +#: admin/admin.strings.js:10 msgid "Analytics" msgstr "" -#: admin/admin.strings.js:10 +#: admin/admin.strings.js:11 msgid "History" msgstr "" -#: admin/admin.strings.js:11 +#: admin/admin.strings.js:12 msgid "Dashboard" msgstr "" -#: admin/admin.strings.js:12 +#: admin/admin.strings.js:13 msgid "Users online" msgstr "" -#: admin/admin.strings.js:13 +#: admin/admin.strings.js:14 msgid "User Name" msgstr "" -#: admin/admin.strings.js:14 +#: admin/admin.strings.js:15 msgid "Documents opened" msgstr "" -#: admin/admin.strings.js:15 +#: admin/admin.strings.js:16 msgid "Number of Documents" msgstr "" -#: admin/admin.strings.js:16 +#: admin/admin.strings.js:17 msgid "Memory consumed" msgstr "" -#: admin/admin.strings.js:17 +#: admin/admin.strings.js:18 msgid "Bytes sent" msgstr "" -#: admin/admin.strings.js:18 +#: admin/admin.strings.js:19 msgid "Bytes received" msgstr "" -#: admin/admin.strings.js:19 +#: admin/admin.strings.js:20 msgid "PID" msgstr "" -#: admin/admin.strings.js:20 +#: admin/admin.strings.js:21 msgid "Document" msgstr "" -#: admin/admin.strings.js:21 +#: admin/admin.strings.js:22 msgid "Number of views" msgstr "" -#: admin/admin.strings.js:22 +#: admin/admin.strings.js:23 msgid "Elapsed time" msgstr "" -#: admin/admin.strings.js:23 +#: admin/admin.strings.js:24 msgid "Idle time" msgstr "" -#: admin/admin.strings.js:24 +#: admin/admin.strings.js:25 msgid "Modified" msgstr "" -#: admin/admin.strings.js:25 +#: admin/admin.strings.js:26 msgid "Kill" msgstr "" -#: admin/admin.strings.js:26 +#: admin/admin.strings.js:27 msgid "Graphs" msgstr "" -#: admin/admin.strings.js:27 +#: admin/admin.strings.js:28 msgid "Memory Graph" msgstr "" -#: admin/admin.strings.js:28 +#: admin/admin.strings.js:29 msgid "CPU Graph" msgstr "" -#: admin/admin.strings.js:29 +#: admin/admin.strings.js:30 msgid "Network Graph" msgstr "" -#: admin/admin.strings.js:30 src/layer/marker/Annotation.js:224 +#: admin/admin.strings.js:31 src/layer/marker/Annotation.js:225 msgid "Save" msgstr "" -#: admin/admin.strings.js:31 +#: admin/admin.strings.js:32 msgid "Cache size of memory statistics" msgstr "" -#: admin/admin.strings.js:32 +#: admin/admin.strings.js:33 msgid "Time interval of memory statistics (in ms)" msgstr "" -#: admin/admin.strings.js:33 +#: admin/admin.strings.js:34 msgid "Cache size of CPU statistics" msgstr "" -#: admin/admin.strings.js:34 +#: admin/admin.strings.js:35 msgid "Time interval of CPU statistics (in ms)" msgstr "" -#: admin/admin.strings.js:35 +#: admin/admin.strings.js:36 msgid "Maximum Document process virtual memory (in MB) - reduce only" msgstr "" -#: admin/admin.strings.js:36 +#: admin/admin.strings.js:37 msgid "Maximum Document process stack memory (in KB) - reduce only" msgstr "" -#: admin/admin.strings.js:37 +#: admin/admin.strings.js:38 msgid "Maximum file size allowed to write to disk (in MB) - reduce only" msgstr "" -#: admin/admin.strings.js:38 +#: admin/admin.strings.js:39 msgid "Documents:" msgstr "" -#: admin/admin.strings.js:39 +#: admin/admin.strings.js:40 msgid "Expired:" msgstr "" -#: admin/admin.strings.js:40 +#: admin/admin.strings.js:41 msgid "Refresh" msgstr "" @@ -250,466 +250,474 @@ msgid "" "server administrator." msgstr "" -#: js/toolbar.js:60 +#: js/toolbar.js:61 msgid "%n users" msgstr "" -#: js/toolbar.js:61 +#: js/toolbar.js:62 msgid "1 user" msgstr "" -#: js/toolbar.js:62 +#: js/toolbar.js:63 msgi
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/expfld.hxx | 22 ++---
sw/source/core/access/accpara.cxx | 34 ++--
sw/source/core/fields/expfld.cxx | 64 +++---
sw/source/core/fields/fldlst.cxx | 40 +++
4 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 4219a1f8e44aaa44a0baf30af9ebdcbd709f0a56
Author: Miklos Vajna
AuthorDate: Mon Jul 30 09:02:17 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 11:36:43 2018 +0200
sw: prefix members of SwHyperlinkIter_Impl and SwInputField
Change-Id: I35bb9f6624a74c8351c094355434417790d6027d
Reviewed-on: https://gerrit.libreoffice.org/58301
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index ecdba62d7c9c..b438d80c9896 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -278,22 +278,22 @@ inline bool SwSetExpField::IsSequenceField() const
class SwInputFieldType : public SwFieldType
{
-SwDoc* pDoc;
+SwDoc* mpDoc;
public:
SwInputFieldType( SwDoc* pDoc );
virtual SwFieldType* Copy() const override;
-SwDoc* GetDoc() const { return pDoc; }
+SwDoc* GetDoc() const { return mpDoc; }
};
class SW_DLLPUBLIC SwInputField : public SwField
{
-mutable OUString aContent;
-OUString aPText;
-OUString aHelp;
-OUString aToolTip;
-sal_uInt16 nSubType;
+mutable OUString maContent;
+OUString maPText;
+OUString maHelp;
+OUString maToolTip;
+sal_uInt16 mnSubType;
bool mbIsFormField;
SwFormatField* mpFormatField; // attribute to which the
belongs to
@@ -302,7 +302,7 @@ class SW_DLLPUBLIC SwInputField : public SwField
virtual std::unique_ptr Copy() const override;
// Accessing Input Field's content
-const OUString& getContent() const { return aContent;}
+const OUString& getContent() const { return maContent;}
public:
/// Direct input via dialog; delete old value.
@@ -366,9 +366,9 @@ public:
boolBuildSortLst();
private:
-SwEditShell* pSh;
-std::unique_ptr pSrtLst;
-std::set aTmpLst;
+SwEditShell* mpSh;
+std::unique_ptr mpSrtLst;
+std::set maTmpLst;
};
/// Implementation in tblcalc.cxx.
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index 14d1f6efb564..f6ccef2903ee 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2943,49 +2943,49 @@ void SwAccessibleParagraph::deselectAccessibleChild(
class SwHyperlinkIter_Impl
{
-const SwpHints *pHints;
-sal_Int32 nStt;
-sal_Int32 nEnd;
-size_t nPos;
+const SwpHints *m_pHints;
+sal_Int32 m_nStt;
+sal_Int32 m_nEnd;
+size_t m_nPos;
public:
explicit SwHyperlinkIter_Impl( const SwTextFrame *pTextFrame );
const SwTextAttr *next();
-size_t getCurrHintPos() const { return nPos-1; }
+size_t getCurrHintPos() const { return m_nPos-1; }
-sal_Int32 startIdx() const { return nStt; }
-sal_Int32 endIdx() const { return nEnd; }
+sal_Int32 startIdx() const { return m_nStt; }
+sal_Int32 endIdx() const { return m_nEnd; }
};
SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrame *pTextFrame ) :
-pHints( pTextFrame->GetTextNode()->GetpSwpHints() ),
-nStt( pTextFrame->GetOfst() ),
-nPos( 0 )
+m_pHints( pTextFrame->GetTextNode()->GetpSwpHints() ),
+m_nStt( pTextFrame->GetOfst() ),
+m_nPos( 0 )
{
const SwTextFrame *pFollFrame = pTextFrame->GetFollow();
-nEnd = pFollFrame ? pFollFrame->GetOfst() :
TextFrameIndex(pTextFrame->GetText().getLength());
+m_nEnd = pFollFrame ? pFollFrame->GetOfst() :
TextFrameIndex(pTextFrame->GetText().getLength());
}
const SwTextAttr *SwHyperlinkIter_Impl::next()
{
const SwTextAttr *pAttr = nullptr;
-if( pHints )
+if( m_pHints )
{
-while( !pAttr && nPos < pHints->Count() )
+while( !pAttr && m_nPos < m_pHints->Count() )
{
-const SwTextAttr *pHt = pHints->Get(nPos);
+const SwTextAttr *pHt = m_pHints->Get(m_nPos);
if( RES_TXTATR_INETFMT == pHt->Which() )
{
const sal_Int32 nHtStt = pHt->GetStart();
const sal_Int32 nHtEnd = *pHt->GetAnyEnd();
if( nHtEnd > nHtStt &&
-( (nHtStt >= nStt && nHtStt < nEnd) ||
- (nHtEnd > nStt && nHtEnd <= nEnd) ) )
+( (nHtStt >= m_nStt && nHtStt < m_nEnd) ||
+ (nHtEnd > m_nStt && nHtEnd <= m_nEnd) ) )
{
pAttr = pHt;
}
}
-++nPos;
+++m_nPos;
}
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 96ccada206c2..293ec2667ac6 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/
[Libreoffice-commits] core.git: sfx2/source starmath/source svx/source
sfx2/source/appl/newhelp.cxx | 23 ---
sfx2/source/control/unoctitm.cxx |7 ---
sfx2/source/dialog/filedlghelper.cxx |6 ++
sfx2/source/dialog/styledlg.cxx| 12 +---
sfx2/source/dialog/templdlg.cxx| 10 +-
sfx2/source/doc/docfilt.cxx|8
sfx2/source/view/lokhelper.cxx | 14 --
starmath/source/mathtype.cxx | 18 +-
starmath/source/mathtype.hxx |2 +-
svx/source/dialog/ClassificationCommon.cxx |8
svx/source/fmcomp/fmgridcl.cxx |8 ++--
svx/source/form/fmobj.cxx |3 +--
svx/source/gallery2/galbrws1.cxx | 12 +++-
13 files changed, 60 insertions(+), 71 deletions(-)
New commits:
commit 70bfdd828b01e9db0713b87645ffe39f3dc21c7e
Author: Noel Grandin
AuthorDate: Sat Jul 28 18:01:57 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 30 11:06:14 2018 +0200
loplugin:stringloop in sfx2..svx
Change-Id: Ie4ca2421f00259f974b6d94f883adfa11600b1fe
Reviewed-on: https://gerrit.libreoffice.org/58251
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index c7bd7f9300ea..eebd30f46362 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -198,7 +198,7 @@ namespace sfx2
OUString PrepareSearchString( const OUString& rSearchString,
const Reference< XBreakIterator >& xBreak,
bool bForSearch )
{
-OUString sSearchStr;
+OUStringBuffer sSearchStr;
sal_Int32 nStartPos = 0;
const lang::Locale aLocale =
Application::GetSettings().GetUILanguageTag().getLocale();
Boundary aBoundary = xBreak->getWordBoundary(
@@ -220,18 +220,18 @@ namespace sfx2
if ( !sSearchStr.isEmpty() )
{
if ( bForSearch )
-sSearchStr += " ";
+sSearchStr.append(" ");
else
-sSearchStr += "|";
+sSearchStr.append("|");
}
-sSearchStr += sSearchToken;
+sSearchStr.append(sSearchToken);
}
}
aBoundary = xBreak->nextWord( rSearchString, nStartPos,
aLocale,
WordType::ANYWORD_IGNOREWHITESPACES );
}
-return sSearchStr;
+return sSearchStr.makeStringAndClear();
}
// namespace sfx2
@@ -954,20 +954,21 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
void SearchTabPage_Impl::dispose()
{
SvtViewOptions aViewOpt( EViewType::TabPage, CONFIGNAME_SEARCHPAGE );
-OUString aUserData =
-OUString::number( m_pFullWordsCB->IsChecked() ? 1 : 0 ) + ";" +
-OUString::number( m_pScopeCB->IsChecked() ? 1 : 0 );
+OUStringBuffer aUserData;
+aUserData.append(OUString::number( m_pFullWordsCB->IsChecked() ? 1 : 0 ))
+.append(";")
+.append(OUString::number( m_pScopeCB->IsChecked() ? 1 : 0 ));
sal_Int32 nCount = std::min( m_pSearchED->GetEntryCount(), sal_Int32(10)
); // save only 10 entries
for ( sal_Int32 i = 0; i < nCount; ++i )
{
-aUserData += ";" + INetURLObject::encode(
+aUserData.append(";").append(INetURLObject::encode(
m_pSearchED->GetEntry(i),
INetURLObject::PART_UNO_PARAM_VALUE,
-INetURLObject::EncodeMechanism::All );
+INetURLObject::EncodeMechanism::All ));
}
-Any aUserItem = makeAny( aUserData );
+Any aUserItem = makeAny( aUserData.makeStringAndClear() );
aViewOpt.SetUserItem( USERITEM_NAME, aUserItem );
m_pSearchED.clear();
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 15e488fb1f87..2bf002844284 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -531,13 +531,14 @@ void UsageInfo::save()
if( file.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write |
osl_File_OpenFlag_Create) == osl::File::E_None )
{
-OString aUsageInfoMsg = "Document Type;Command;Count";
+OStringBuffer aUsageInfoMsg("Document Type;Command;Count");
for (auto const& elem : maUsage)
-aUsageInfoMsg += "\n" + elem.first.toUtf8() + ";" +
OString::number(elem.second);
+
aUsageInfoMsg.append("\n").append(elem.first.toUtf8()).append(";").append(OString::number(elem.second));
sal_uInt64 written = 0;
-file.write(aUsageInfoMsg.pData->buffer, aUsageInfoMsg.getLength(),
written);
+auto s = aUsageInfoMsg.makeStringAndClear();
+file.write(s.getStr(), s.getLength(), written);
file.close();
}
}
diff --git a/sfx2/source/di
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - lotuswordpro/source
lotuswordpro/source/filter/lwplayout.cxx | 31 ---
lotuswordpro/source/filter/lwplayout.hxx | 12 ++--
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 089b7c342b5e64f45bf279d37b7261cca5c25d32
Author: Caolán McNamara
AuthorDate: Fri Jul 27 08:58:56 2018 +0100
Commit: Michael Stahl
CommitDate: Mon Jul 30 10:55:14 2018 +0200
ofz#9603 infinite recursion
Change-Id: Ia4d0e3c1bb12330bd2f754e663055e1218da926f
Reviewed-on: https://gerrit.libreoffice.org/58179
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index 9c27ae7e8dab..29ba8482f375 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -592,6 +592,7 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm)
LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream*
pStrm )
: LwpVirtualLayout(objHdr, pStrm)
, m_bGettingGeometry(false)
+, m_bGettingBackgroundStuff(false)
{
}
@@ -659,21 +660,28 @@ rtl::Reference
LwpMiddleLayout::GetBasedOnStyle()
* @descr: Get the geometry of current layout
*
*/
-LwpLayoutGeometry* LwpMiddleLayout::Geometry()
+LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
{
+if (m_bGettingGeometry)
+throw std::runtime_error("recursion in layout");
+m_bGettingGeometry = true;
+
+LwpLayoutGeometry* pRet = nullptr;
if( !m_LayGeometry.IsNull() )
{
-return dynamic_cast (m_LayGeometry.obj().get());
+pRet = dynamic_cast (m_LayGeometry.obj().get());
}
else
{
rtl::Reference xBase(GetBasedOnStyle());
if (LwpMiddleLayout* pLay =
dynamic_cast(xBase.get()))
{
-return pLay->GetGeometry();
+pRet = pLay->GetGeometry();
}
}
-return nullptr;
+
+m_bGettingGeometry = false;
+return pRet;
}
/**
@@ -822,21 +830,30 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
*/
LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
{
+if (m_bGettingBackgroundStuff)
+throw std::runtime_error("recursion in layout");
+m_bGettingBackgroundStuff = true;
+
+LwpBackgroundStuff* pRet = nullptr;
+
if(m_nOverrideFlag & OVER_BACKGROUND)
{
LwpLayoutBackground* pLayoutBackground =
dynamic_cast(m_LayBackgroundStuff.obj().get());
-return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() :
nullptr;
+pRet = pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() :
nullptr;
}
else
{
rtl::Reference xBase(GetBasedOnStyle());
if (LwpMiddleLayout* pLay =
dynamic_cast(xBase.get()))
{
-return pLay->GetBackgroundStuff();
+pRet = pLay->GetBackgroundStuff();
}
}
-return nullptr;
+
+m_bGettingBackgroundStuff = false;
+return pRet;
}
+
/**
* @descr: create xfborder.
*/
diff --git a/lotuswordpro/source/filter/lwplayout.hxx
b/lotuswordpro/source/filter/lwplayout.hxx
index 518da035ea14..97610408c05a 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -347,19 +347,11 @@ class LwpMiddleLayout : public LwpVirtualLayout
public:
LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
virtual ~LwpMiddleLayout() override;
-LwpLayoutGeometry* GetGeometry()
-{
-if (m_bGettingGeometry)
-throw std::runtime_error("recursion in layout");
-m_bGettingGeometry = true;
-auto pRet = Geometry();
-m_bGettingGeometry = false;
-return pRet;
-}
double GetGeometryHeight();
double GetGeometryWidth();
LwpBorderStuff* GetBorderStuff();
LwpBackgroundStuff* GetBackgroundStuff();
+LwpLayoutGeometry* GetGeometry();
enumXFTextDir GetTextDirection();
XFBorders* GetXFBorders();
LwpColor* GetBackColor();
@@ -405,7 +397,6 @@ protected:
virtual bool IsAutoGrowDown() override;
private:
LwpObjectID m_BasedOnStyle;
-LwpLayoutGeometry* Geometry();
protected:
enum
{
@@ -425,6 +416,7 @@ protected:
LwpObjectID m_LayBackgroundStuff;
LwpObjectID m_LayExtBorderStuff;
boolm_bGettingGeometry;
+boolm_bGettingBackgroundStuff;
public:
LwpObjectID& GetContent() { return m_Content; }
LwpTabOverride* GetTabOverride();
___
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' - lotuswordpro/source
lotuswordpro/source/filter/lwplayout.cxx | 31 ---
lotuswordpro/source/filter/lwplayout.hxx | 12 ++--
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 6e3db4997a81f4139169ce9d44da6b5e4c4475ed
Author: Caolán McNamara
AuthorDate: Fri Jul 27 08:58:56 2018 +0100
Commit: Michael Stahl
CommitDate: Mon Jul 30 10:55:19 2018 +0200
ofz#9603 infinite recursion
Change-Id: Ia4d0e3c1bb12330bd2f754e663055e1218da926f
Reviewed-on: https://gerrit.libreoffice.org/58178
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index 4423178aeeeb..dfb9883f0714 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -588,6 +588,7 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm)
LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream*
pStrm )
: LwpVirtualLayout(objHdr, pStrm)
, m_bGettingGeometry(false)
+, m_bGettingBackgroundStuff(false)
{
}
@@ -655,21 +656,28 @@ rtl::Reference
LwpMiddleLayout::GetBasedOnStyle()
* @descr: Get the geometry of current layout
*
*/
-LwpLayoutGeometry* LwpMiddleLayout::Geometry()
+LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
{
+if (m_bGettingGeometry)
+throw std::runtime_error("recursion in layout");
+m_bGettingGeometry = true;
+
+LwpLayoutGeometry* pRet = nullptr;
if( !m_LayGeometry.IsNull() )
{
-return dynamic_cast (m_LayGeometry.obj().get());
+pRet = dynamic_cast (m_LayGeometry.obj().get());
}
else
{
rtl::Reference xBase(GetBasedOnStyle());
if (LwpMiddleLayout* pLay =
dynamic_cast(xBase.get()))
{
-return pLay->GetGeometry();
+pRet = pLay->GetGeometry();
}
}
-return nullptr;
+
+m_bGettingGeometry = false;
+return pRet;
}
/**
@@ -818,21 +826,30 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
*/
LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
{
+if (m_bGettingBackgroundStuff)
+throw std::runtime_error("recursion in layout");
+m_bGettingBackgroundStuff = true;
+
+LwpBackgroundStuff* pRet = nullptr;
+
if(m_nOverrideFlag & OVER_BACKGROUND)
{
LwpLayoutBackground* pLayoutBackground =
dynamic_cast(m_LayBackgroundStuff.obj().get());
-return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() :
nullptr;
+pRet = pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() :
nullptr;
}
else
{
rtl::Reference xBase(GetBasedOnStyle());
if (LwpMiddleLayout* pLay =
dynamic_cast(xBase.get()))
{
-return pLay->GetBackgroundStuff();
+pRet = pLay->GetBackgroundStuff();
}
}
-return nullptr;
+
+m_bGettingBackgroundStuff = false;
+return pRet;
}
+
/**
* @descr: create xfborder.
*/
diff --git a/lotuswordpro/source/filter/lwplayout.hxx
b/lotuswordpro/source/filter/lwplayout.hxx
index 2d0694b67864..98d7ca515906 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -347,19 +347,11 @@ class LwpMiddleLayout : public LwpVirtualLayout
public:
LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
virtual ~LwpMiddleLayout() override;
-LwpLayoutGeometry* GetGeometry()
-{
-if (m_bGettingGeometry)
-throw std::runtime_error("recursion in layout");
-m_bGettingGeometry = true;
-auto pRet = Geometry();
-m_bGettingGeometry = false;
-return pRet;
-}
double GetGeometryHeight();
double GetGeometryWidth();
LwpBorderStuff* GetBorderStuff();
LwpBackgroundStuff* GetBackgroundStuff();
+LwpLayoutGeometry* GetGeometry();
enumXFTextDir GetTextDirection();
XFBorders* GetXFBorders();
LwpColor* GetBackColor();
@@ -402,7 +394,6 @@ protected:
virtual bool IsAutoGrowDown() override;
private:
LwpObjectID m_BasedOnStyle;
-LwpLayoutGeometry* Geometry();
protected:
enum
{
@@ -422,6 +413,7 @@ protected:
LwpObjectID m_LayBackgroundStuff;
LwpObjectID m_LayExtBorderStuff;
boolm_bGettingGeometry;
+boolm_bGettingBackgroundStuff;
public:
LwpObjectID& GetContent() { return m_Content; }
LwpTabOverride* GetTabOverride();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/strbuf.cxx | 18 +-
sal/rtl/strimp.hxx |7 ++-
sal/rtl/strtmpl.cxx |2 +-
sal/rtl/ustrbuf.cxx | 19 +--
4 files changed, 33 insertions(+), 13 deletions(-)
New commits:
commit dead246b1955a99b66b0a69e8da3db1a61f3ab88
Author: Noel Grandin
AuthorDate: Sun Jul 29 15:20:46 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 30 10:18:13 2018 +0200
avoid writing StringBuffer twice
Change-Id: Ib0a8914cc1967f89a2cd3b062e7a0b52de7a972c
Reviewed-on: https://gerrit.libreoffice.org/58281
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx
index 194e9b159af5..2b7d8e96a8d1 100644
--- a/sal/rtl/strbuf.cxx
+++ b/sal/rtl/strbuf.cxx
@@ -21,6 +21,7 @@
#include
#include
+#include "strimp.hxx"
/*
* rtl_stringbuffer_newFromStr_WithLength
@@ -37,9 +38,13 @@ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength(
rtl_String ** newStr,
return;
}
-rtl_string_new_WithLength( newStr, count + 16 );
+// use raw alloc to avoid overwriting the buffer twice
+if ( *newStr)
+rtl_string_release( *newStr );
+*newStr = rtl_string_ImplAlloc( count + 16 );
(*newStr)->length = count;
memcpy( (*newStr)->buffer, value, count );
+memset( (*newStr)->buffer + count, 0, 16 );
}
/*
@@ -78,16 +83,19 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity
{
rtl_String * pTmp = *This;
rtl_String * pNew = nullptr;
-*capacity = ((*This)->length + 1) * 2;
+auto nLength = (*This)->length;
+*capacity = (nLength + 1) * 2;
if (minimumCapacity > *capacity)
/* still lower, set to the minimum capacity */
*capacity = minimumCapacity;
-rtl_string_new_WithLength(&pNew, *capacity);
-pNew->length = (*This)->length;
+// use raw alloc to avoid overwriting the buffer twice
+pNew = rtl_string_ImplAlloc( *capacity );
+pNew->length = nLength;
*This = pNew;
-memcpy( (*This)->buffer, pTmp->buffer, pTmp->length );
+memcpy( (*This)->buffer, pTmp->buffer, nLength );
+memset( (*This)->buffer + nLength, 0, *capacity - nLength );
rtl_string_release( pTmp );
}
}
diff --git a/sal/rtl/strimp.hxx b/sal/rtl/strimp.hxx
index a5767fea6917..b3446db1fdb2 100644
--- a/sal/rtl/strimp.hxx
+++ b/sal/rtl/strimp.hxx
@@ -25,8 +25,9 @@
#include
#endif
-
#include
+#include
+#include
/* === */
/* Help functions for String and UString */
@@ -49,6 +50,10 @@ sal_Int16 rtl_ImplGetDigit( sal_Unicode ch, sal_Int16 nRadix
);
bool rtl_ImplIsWhitespace( sal_Unicode c );
+rtl_uString* rtl_uString_ImplAlloc( sal_Int32 nLen );
+
+rtl_String* rtl_string_ImplAlloc( sal_Int32 nLen );
+
extern "C" {
typedef void *(*rtl_allocateStringFn)(sal_Size size);
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 341a84d01052..e1ab1dce278c 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -1134,7 +1134,7 @@ sal_uInt64 SAL_CALL IMPL_RTL_STRNAME( toUInt64 )( const
IMPL_RTL_STRCODE* pStr,
/* Internal String-Class help functions*/
/* === */
-static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen )
+IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen )
{
IMPL_RTL_STRINGDATA * pData
= (sal::static_int_cast< sal_uInt32 >(nLen)
diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx
index 4ebfbbbc994c..df8250e71a1d 100644
--- a/sal/rtl/ustrbuf.cxx
+++ b/sal/rtl/ustrbuf.cxx
@@ -41,9 +41,13 @@ void SAL_CALL rtl_uStringbuffer_newFromStr_WithLength(
rtl_uString ** newStr,
return;
}
-rtl_uString_new_WithLength( newStr, count + 16 );
+// use raw alloc to avoid overwriting the buffer twice
+if ( *newStr)
+rtl_uString_release( *newStr );
+*newStr = rtl_uString_ImplAlloc( count + 16 );
(*newStr)->length = count;
-memcpy( (*newStr)->buffer, value, count * sizeof(sal_Unicode));
+memcpy( (*newStr)->buffer, value, count * sizeof(sal_Unicode) );
+memset( (*newStr)->buffer + count, 0, 16 * sizeof(sal_Unicode) );
RTL_LOG_STRING_NEW( *newStr );
}
@@ -103,16 +107,19 @@ void SAL_CALL rtl_uStringbuffer_ensureCapacity
{
rtl_uString * pTmp = *This;
rtl_uString * pNew = nullptr;
-*capacity = ((*This)->length + 1) * 2;
+auto nLength = (*This)->length;
+*capacity = (nLength + 1) * 2;
if (minimumCapacity > *capacity)
/* still lower, set to the minimum capacity */
*capacity = minimumCapacity;
-
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - svx/source
svx/source/unodraw/UnoGraphicExporter.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 770afb4868a08cd6952500a39aec7d4d7bdcd595
Author: Miklos Vajna
AuthorDate: Fri Jul 27 15:23:18 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Jul 30 09:50:43 2018 +0200
svx UnoGraphicExporter: allow a custom AA just for that particular export
This has an effect for text only since the cairo text renderer no longer
ignores the "disable AA" requests.
To use it, instantiate com.sun.star.drawing.GraphicExportFilter, call
its filter() method with an argument that has a FilterData, which has an
AntiAliasing sub-key with a boolean value.
(cherry picked from commit b197a4488adcf37b5460f5f7a5edc8adff0edabb)
Conflicts:
svx/source/unodraw/UnoGraphicExporter.cxx
Change-Id: I4f51bc685a97141eb0fdeae5e4afed26787b1fb8
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 17eabdd5c360..2d9bd17bfb67 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -112,6 +112,8 @@ namespace {
FractionmaScaleX;
FractionmaScaleY;
+TriState meAntiAliasing = TRISTATE_INDET;
+
explicit ExportSettings( SdrModel* pDoc );
};
@@ -582,6 +584,12 @@ void GraphicExporter::ParseSettings( const Sequence<
PropertyValue >& aDescripto
if( pDataValues->Value >>= nVal )
rSettings.maScaleY = Fraction(
rSettings.maScaleY.GetNumerator(), nVal );
}
+else if (pDataValues->Name == "AntiAliasing")
+{
+bool bAntiAliasing;
+if (pDataValues->Value >>= bAntiAliasing)
+rSettings.meAntiAliasing = bAntiAliasing ?
TRISTATE_TRUE : TRISTATE_FALSE;
+}
pDataValues++;
}
@@ -1013,7 +1021,14 @@ sal_Bool SAL_CALL GraphicExporter::filter( const
Sequence< PropertyValue >& aDes
// create the output stuff
Graphic aGraphic;
+SvtOptionsDrawinglayer aOptions;
+bool bAntiAliasing = aOptions.IsAntiAliasing();
+if (aSettings.meAntiAliasing != TRISTATE_INDET)
+// This is safe to do globally as we own the solar mutex.
+aOptions.SetAntiAliasing(aSettings.meAntiAliasing == TRISTATE_TRUE);
sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ?
GRFILTER_OK : GRFILTER_FILTERERROR;
+if (aSettings.meAntiAliasing != TRISTATE_INDET)
+aOptions.SetAntiAliasing(bAntiAliasing);
if( nStatus == GRFILTER_OK )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ODF specification for border around text portions
Hi Regina Thanks for bringing this up. What would be nice to have is an equivalent feature of the "between" border element, as described in [1] An example document using this is in bug #104345 [2] and we currently don't seem to have a similar feature neither on the UI nor in ODF. So, if we could have a copy of this, that could be good for interoperability. [1] http://officeopenxml.com/WPborders.php [2] https://bugs.documentfoundation.org/show_bug.cgi?id=104345 Best Regards Gabor Kelemen 2018-07-30 0:36 GMT+02:00 Regina Henschel : > Hi all, > > you can draw borders on portions of text in Writer. This is currently in > loext namespace. I'm working to get this feature to ODF. > > I have noticed the problems described below, when looking what would be > needed for interoperability with Word and what would be needed for EPUB > export. > > I would be happy to hear some suggestions from you. > > Problem line height > --- > EPUB: EPUB uses XHTML and CSS3. Border, margin and padding does not > influence the line-height calculation in CSS. Therefore the margin-, > border- and padding-box might overlap previous or next lines. But the text > inside the box is always regularly visible. Overlapping happens in document > order. The border will be painted on top of the previous line and the next > line will be painted on top of the border. > > MS Word: Word acts different. If the line-height is proportional (e.g. 1.5 > lines) the distance between lines is increased, so that the entire box fits > into the line. The additional space is distributed so that the text in the > box has the same baseline as the text outside the box. If the line-height > is fixed (e.g. 24pt), the height of the box is reduced (not the border > width) so that the border might overlap the text inside the box. The border > is drawn on top of the text. > > LibreOffice's line height implementation has currently bug > https://bugs.documentfoundation.org/show_bug.cgi?id=69647 > > Problem line break > -- > EPUB: If the text portion, which has got border, margin, padding is split > so that the start of the text portion is in line A and the end is in the > next line B, then the border box is split in CSS. That means, that the box > in line A has no right border and the box in line B has not left border (in > ltr script). > > MS Word: Word acts different. It enclosed the text porting in line A with > a complete box and encloses the text porting in line B with a complete box > too. > > Currently LibreOffice follows the way Word does it. > > Kind regards > Regina > > ___ > 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] core.git: filter/qa filter/source forms/source formula/source fpicker/source framework/source helpcompiler/source i18nlangtag/qa i18nlangtag/source idl/source include/canvas incl
filter/qa/cppunit/xslt-test.cxx |1 + filter/source/config/cache/filtercache.cxx|1 + filter/source/config/cache/typedetection.cxx |1 + filter/source/flash/swfwriter1.cxx|1 + filter/source/graphicfilter/icgm/cgm.cxx |1 + filter/source/graphicfilter/ieps/ieps.cxx |1 + filter/source/graphicfilter/ios2met/ios2met.cxx |1 + filter/source/graphicfilter/ipict/ipict.cxx |1 + filter/source/graphicfilter/ipsd/ipsd.cxx |1 + filter/source/graphicfilter/iras/iras.cxx |1 + filter/source/graphicfilter/itiff/itiff.cxx |1 + filter/source/graphicfilter/itiff/lzwdecom.cxx|1 + filter/source/msfilter/escherex.cxx |1 + filter/source/msfilter/eschesdo.cxx |1 + filter/source/msfilter/msdffimp.cxx |1 + filter/source/msfilter/mstoolbar.cxx |1 + filter/source/msfilter/msvbahelper.cxx|1 + filter/source/msfilter/rtfutil.cxx|1 + filter/source/msfilter/svdfppt.cxx|1 + filter/source/odfflatxml/OdfFlatXml.cxx |1 + filter/source/pdf/impdialog.cxx |1 + filter/source/svg/svgfilter.cxx |1 + filter/source/svg/svgwriter.cxx |1 + filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |1 + filter/source/xsltfilter/XSLTFilter.cxx |1 + forms/source/component/Edit.cxx |1 + forms/source/component/FormComponent.cxx |1 + forms/source/component/FormsCollection.cxx|1 + forms/source/component/ListBox.cxx|1 + forms/source/component/errorbroadcaster.cxx |1 + forms/source/component/formcontrolfont.cxx|1 + forms/source/misc/InterfaceContainer.cxx |1 + forms/source/richtext/attributedispatcher.cxx |1 + forms/source/richtext/richtextcontrol.cxx |1 + forms/source/richtext/richtextimplcontrol.cxx |1 + forms/source/runtime/formoperations.cxx |1 + forms/source/xforms/datatypes.cxx |1 + forms/source/xforms/submission/replace.cxx|1 + formula/source/core/api/FormulaCompiler.cxx |1 + formula/source/core/api/token.cxx |1 + formula/source/core/api/vectortoken.cxx |1 + formula/source/ui/dlg/formula.cxx |1 + formula/source/ui/dlg/parawin.cxx |1 + fpicker/source/office/OfficeControlAccess.cxx |1 + fpicker/source/office/OfficeFilePicker.cxx|1 + fpicker/source/office/commonpicker.cxx|1 + fpicker/source/office/fpinteraction.cxx |2 ++ fpicker/source/office/iodlg.cxx |1 + fpicker/source/win32/folderpicker/MtaFop.cxx |1 + framework/source/accelerators/acceleratorconfiguration.cxx|1 + framework/source/accelerators/storageholder.cxx |1 + framework/source/classes/framecontainer.cxx |1 + framework/source/dispatch/dispatchprovider.cxx|1 + framework/source/dispatch/loaddispatcher.cxx |1 + framework/source/dispatch/popupmenudispatcher.cxx |1 + framework/source/dispatch/servicehandler.cxx |1 + framework/source/fwe/classes/addonsoptions.cxx|1 + framework/source/fwe/classes/framelistanalyzer.cxx|1 + framework/source/fwi/classes/protocolhandlercache.cxx |1 + framework/source/fwi/helper/mischelper.cxx|1 + framework/source/fwi/jobs/configaccess.cxx|1 + framework/source/fwi/threadhelp/transactionmanager.cxx|1 + framework/source/helper/ocomponentaccess.cxx |1 + framework/source/helper/ocomponentenumeration.cxx |1 + framework/source/helper/oframes.cxx |1 + framework/source/jobs/job.cxx
Re: ODF specification for border around text portions
Hi Regina, On Mon, Jul 30, 2018 at 12:36:01AM +0200, Regina Henschel wrote: > I have noticed the problems described below, when looking what would be > needed for interoperability with Word and what would be needed for EPUB > export. I think it was on purpose that Tamas implemented this feature in terms of what Word does. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
