[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
| 61 +++---
1 file changed, 48 insertions(+), 13 deletions(-)
New commits:
commit c728bb5420f19eb6fbec859ec927f35d772694be
Author: Todor Balabanov
AuthorDate: Thu May 2 15:17:38 2019 +0300
Commit: Tomaž Vajngerl
CommitDate: Sun May 12 04:04:54 2019 +0200
Generate behavior code simplification and very small speed-up.
Change-Id: Ib13080e4c21738affa129d12a07f5380f665e7a4
Reviewed-on: https://gerrit.libreoffice.org/71673
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index a58a66196372..dc7f7400cd58 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -48,24 +48,59 @@ public class DEGTBehavior extends AbsGTBehavior implements
ILibEngine {
pbest_t = pbest;
}
+ /**
+ * Crossover and mutation for a single vector element done in a single step.
+ *
+ * @param index
+ *Index of the trial vector element to be changed.
+ * @param trialVector
+ *Trial vector reference.
+ * @param globalVector
+ *Global best found vector reference.
+ * @param differenceVectors
+ *List of vectors used for difference delta calculation.
+ */
+ private void crossoverAndMutation(int index, double trialVector[], double
globalVector[], BasicPoint differenceVectors[]) {
+double delta = 0D;
+
+for (int i = 0; i < differenceVectors.length; i++) {
+ delta += (i % 2 == 0 ? +1D : -1D) *
differenceVectors[i].getLocation()[index];
+}
+
+trialVector[index] = globalVector[index] + FACTOR * delta;
+ }
+
@Override
public void generateBehavior(SearchPoint trailPoint, ProblemEncoder
problemEncoder) {
-SearchPoint gbest_t = socialLib.getGbest();
-
BasicPoint[] referPoints = getReferPoints();
int DIMENSION = problemEncoder.getDesignSpace().getDimension();
-int rj = RandomGenerator.intRangeRandom(0, DIMENSION-1);
-for (int k=0; khttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ GSOC ] UI logger using new DSL discussion
Hi, I am Ahmed El-Shreif. I am working on improve the UI tesing DSL and the log files for UI action with Markus Mohrhard and Xisco Fauli as my mentors. I need to discuss about something. First I will explain with small description what I will do during this summer with LO then I will take all opinions about something. We have now a UI logger for user interaction that you can enable by run this command LO_COLLECT_UIINFO="test.log" instdir/program/soffice then it will create a file in instdir/uitest/test.log that record all your actions last year the approach was to create a python code that work as interpreter starts reading the log file line-by-line and tries to convert the statements into a UI test case. This year we approach to make a DSL language that we log all user actions in it's grammer and when you run it it internally generate the UI test corresponding to the user actions. I was intend to use Xtext tool to build this DSL but when I focus more in it's features and advantages I found most of it's advantage related to Eclipse usage as a editor for the new DSL. Which I think not our target. So after searching more I intend to used TextX instead as i found it's implementation and integration with LO will be better. textX is a Python framework inspired by Xtext. You can define the grammar of your language with a syntax very, very close to the one used by Xtext. textX does not use EMF or generate code but it use instead the metaprogramming power of Python to define classes in memory. While it seems nice and easy to use, textX does not generate editor support like Xtext, so that is a major difference. I need your opinions about the textX choice. I am very sorry for this long message. Thanks Ahmed ElShreif nick : shiko ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Failure
The cppcheck job failed with message: "Failed to run cppcheck." Note: The script generating this report was run at : 2019-12-05 00:12:43 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh cppcheck-report.log.gz Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7c604cbb9d7a17712d3a02a577ac7736767d86aa
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:13:33 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 23:44:07 2019 +0200
Fix typo
Change-Id: I3292e784ff82c5e71d9b3b931f21db963d681016
Reviewed-on: https://gerrit.libreoffice.org/72170
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index e83516797a6d..1baa163ace99 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -786,7 +786,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName
,OTableFieldDescRef co
// and the function is different to count
clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId);
}
-// do we have a aggregate function and only a function?
+// do we have an aggregate function and only a function?
else if ( SQL_ISRULE(pColumnRef,general_set_fct) )
{
OUString sLocalizedFunctionName;
@@ -1481,7 +1481,7 @@ void OSelectionBrowseBox::InsertColumn(const
OTableFieldDescRef& pEntry, sal_uIn
// remember the column id of the current position
sal_uInt16 nColumnId = GetColumnId(_nColumnPosition);
-// put at the end of the list if to small or to big,
+// put at the end of the list if too small or too big,
if ((_nColumnPosition == BROWSER_INVALIDID) || (_nColumnPosition >=
getFields().size())) // append the field
{
if (FindFirstFreeCol(_nColumnPosition) == nullptr) // no more free
columns
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/QueryTableView.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 723cdb06b658595e92647707427b67101c0e858a
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:13:35 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 23:42:57 2019 +0200
Fix typo
Change-Id: I572453ea9cac59f7dce0abe79e6f034960555081
Reviewed-on: https://gerrit.libreoffice.org/72169
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index bbb35068ff2b..25a2cb93f26b 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -94,7 +94,7 @@ namespace
return bOk;
}
-/** connectionModified adds an undo action for the modified connection and
forces an redraw
+/** connectionModified adds an undo action for the modified connection and
forces a redraw
@param _pView the view which we use
@param _pConnectionthe connection which was modified
@param _bAddUndo true when an undo action should be appended
@@ -449,7 +449,7 @@ void OQueryTableView::AddTabWin(const OUString&
_rComposedName, const OUString&
try
{
-// find relations between the table an the tables already inserted
+// find relations between the table and the tables already inserted
Reference< XIndexAccess> xKeyIndex =
pNewTabWin->GetData()->getKeys();
if ( !xKeyIndex.is() )
break;
@@ -771,7 +771,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow*
pTabWin, OQueryTabWinUndoAc
pUndoAction->InsertConnection(xTmpEntry);
// call base class because we append an undo action
-// but this time we are in a undo action list
+// but this time we are in an undo action list
OJoinTableView::RemoveConnection(xTmpEntry, false);
aIter2 = rTabConList.begin();
++nCnt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/inc dbaccess/source
cui/inc/tipoftheday.hrc| 10 +-
dbaccess/source/ui/misc/WCopyTable.cxx |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b03a2d037492b839788da3de076e6cdea30a691d
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:16:47 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 23:03:03 2019 +0200
Fix typo
Change-Id: I18654893dc0454708619e1c021c84a56d5ad950e
Reviewed-on: https://gerrit.libreoffice.org/71952
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 81c53dc3d48c..24987ca49d93 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -37,7 +37,7 @@
* image:
* leave the image string empty for the default tipoftheday.png
* place new images at extra/source/tipoftheday and don't forget to add the
files to vcl/Package_tipoftheday.mk
- * don't exceed 100x120px too much - images dont get scaled
+ * don't exceed 100x120px too much - images don't get scaled
*/
const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
@@ -54,7 +54,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows
alphabetically or numerically per Tools > Sort."),
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"},
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/0610.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to
protect part of a text, show/hide text, reuse parts from other documents, use
different column layout."), "modules/swriter/ui/sectionpage/SectionPage",
"tipoftheday_w.png"},
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/04020100.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to
generate a random series based on various distributions."),
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog",
"tipoftheday_c.png"},
//https://help.libreoffice.org/6.2/en-US/text/scalc/01/02140700.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formating > Manage
in Calc to find out which cells have been defined with conditional
formating."),
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog",
"tipoftheday_c.png"},
//https://help.libreoffice.org/6.2/en-US/text/scalc/01/0512.html
+ { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting >
Manage in Calc to find out which cells have been defined with conditional
formatting."),
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog",
"tipoftheday_c.png"},
//https://help.libreoffice.org/6.2/en-US/text/scalc/01/0512.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Apart from table of contents, %PRODUCTNAME
can create Alphabetical, Illustrations, Tables, Objects, Bibliography,
User-Defined indexes."), "modules/swriter/ui/tocdialog/TocDialog",
"tipoftheday_w.png"},
//https://help.libreoffice.org/6.2/en-US/text/swriter/guide/indices_toc.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a series in %PRODUCTNAME Calc
such as A1, A2, A3, A11, A15, not in alphabetical order but on the number?
Enable natural sort in the Options tab."),
"modules/scalc/ui/sortoptionspage/SortOptionsPage", "tipoftheday_c.png"},
//https://help.libreoffice.org/6.2/en-US/text/scalc/01/12030200.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Enable massive parallel calculations of
formula cells via Tools > Options > OpenCL."),
"cui/ui/optopenclpage/OptOpenCLPage", "tipoftheday_c.png"},
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/opencl.html
@@ -105,7 +105,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Run %PRODUCTNAME in any browser via
rollApp."), "https://www.rollapp.com/app/lowriter";, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and xml filters?"),
"http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html";,
""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Easily convert your documents to PDF with
one click by clicking on the PDF icon inthe toolbar."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Easily convert your documents to PDF with
one click by clicking on the PDF icon in the toolbar."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools >
Options > %PRODUCTNAME > View > User Interface > Icon size and style."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater
interoperability with other office suites at File > Properties > Font."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents
with the exact format, image compression, comments, access rights, password,
etc., via File > Export as PDF."), "", ""},
@@ -162,7 +162,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Keep column headers of a sheet visible when
scrolling lines via View > Freeze Cells > Freeze Firs
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aa2cd3f6398ef80770d63ac44f37e98f49716d74
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:13:36 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 23:02:26 2019 +0200
Fix typo
Change-Id: If7ecd8501a6dfae0d56d98f6f5fa134ed7bbc60b
Reviewed-on: https://gerrit.libreoffice.org/72168
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 1c50c178e733..8ed6ad6d858b 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2250,7 +2250,7 @@ namespace
{
if( eOk == FillDragInfo(_pView,pArgument,aDragLeft))
_pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i);
-else // it could be a alias name for a field
+else // it could be an alias name for a field
{
OUString aTableRange,aColumnName;
::connectivity::OSQLParseTreeIterator& rParseIter =
rController.getParseIterator();
@@ -2742,7 +2742,7 @@ OUString OQueryDesignView::getStatement()
// Exception handling, if no fields have been passed we should not
// change the tab page
// TabBarSelectHdl will query the SQL-OUString for STATEMENT_NOFIELDS
-// and trigger a error message
+// and trigger an error message
// - Build table list --
const auto& rConnList = m_pTableView->getTableConnections();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
sc/inc/globstr.hrc |3
sc/inc/scabstdlg.hxx|2
sc/source/ui/attrdlg/scdlgfact.cxx | 23 ++-
sc/source/ui/attrdlg/scdlgfact.hxx | 15 +-
sc/source/ui/condformat/condformatmgr.cxx | 173 +--
sc/source/ui/inc/condformatmgr.hxx | 41 ++---
sc/source/ui/view/cellsh1.cxx |5
sc/uiconfig/scalc/ui/condformatmanager.ui | 178 +++-
sc/uiconfig/scalc/ui/conditionalformatdialog.ui |4
9 files changed, 232 insertions(+), 212 deletions(-)
New commits:
commit b8061f41373cc90823c93cf9f025647c93496293
Author: Caolán McNamara
AuthorDate: Sat May 11 19:51:21 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat May 11 22:19:28 2019 +0200
weld ScCondFormatManagerDlg
Change-Id: Iccf2657f2c8fe98b4e975936fb75d56fc9523b5a
Reviewed-on: https://gerrit.libreoffice.org/72162
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 614beb5300bb..78437dc9f9d3 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -423,7 +423,6 @@
#define STR_UNDO_INSERT_CURRENT_TIME
NC_("STR_UNDO_INSERT_CURRENT_TIME", "Insert Current Time")
#define STR_MANAGE_NAMESNC_("STR_MANAGE_NAMES",
"Manage Names...")
#define STR_HEADER_NAME NC_("STR_HEADER_NAME", "Name")
-#define STR_HEADER_RANGE_OR_EXPR
NC_("STR_HEADER_RANGE_OR_EXPR", "Range or formula expression")
#define STR_HEADER_SCOPENC_("STR_HEADER_SCOPE",
"Scope")
#define STR_MULTI_SELECTNC_("STR_MULTI_SELECT",
"(multiple)")
#define STR_GLOBAL_SCOPENC_("STR_GLOBAL_SCOPE",
"Document (Global)")
@@ -431,8 +430,6 @@
#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID",
"Invalid name. Only use letters, numbers and underscore.")
#define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF",
"This Document contains external references to unsaved documents.\n\nDo you
want to continue?")
#define STR_CLOSE_WITH_UNSAVED_REFS
NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another
document and not yet saved. Closing it without saving will result in data
loss.")
-#define STR_HEADER_RANGENC_("STR_HEADER_RANGE",
"Range")
-#define STR_HEADER_COND NC_("STR_HEADER_COND", "First
Condition")
#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value is")
#define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE",
"ColorScale")
#define STR_COND_DATABARNC_("STR_COND_DATABAR",
"DataBar")
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index cb6ba6933ee7..afada832cfa0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -410,7 +410,7 @@ public:
virtual VclPtr
CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText,
const OUString& rCurrentText ) = 0;
-virtual VclPtr
CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const
ScConditionalFormatList* pFormatList ) = 0;
+virtual VclPtr
CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument* pDoc, const
ScConditionalFormatList* pFormatList ) = 0;
virtual VclPtr
CreateScDataPilotDatabaseDlg(weld::Window* pParent) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 057935500c69..a2b4e4c2b02f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -82,7 +82,15 @@ short AbstractScColRowLabelDlg_Impl::Execute()
return m_xDlg->run();
}
-IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl);
+short AbstractScCondFormatManagerDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
+bool
AbstractScCondFormatManagerDlg_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContext
&rCtx)
+{
+return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
short AbstractScDataPilotDatabaseDlg_Impl::Execute()
{
@@ -510,22 +518,22 @@ sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh()
std::unique_ptr
AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList()
{
-return pDlg->GetConditionalFormatList();
+return m_xDlg->GetConditionalFormatList();
}
bool AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged() const
{
-return pDlg->CondFormatsChanged();
+return m_xDlg->CondFormatsChanged();
}
void AbstractScCondFormatManagerDlg_Impl::SetModified()
{
-return pDlg->SetModified();
+return m_xDlg->SetModified();
}
ScConditionalFormat*
AbstractScCondFormatManagerDlg_Impl::GetCondFormatSelected()
{
-return pDlg->GetCondFormatSelected();
+return m_xDlg->GetCondFormatSelected();
}
int AbstractScMetricI
[Libreoffice-commits] core.git: 4 commits - dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx |8
dbaccess/source/ui/dlg/finteraction.hxx |2 +-
dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 +-
dbaccess/source/ui/inc/JoinTableView.hxx |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 28e9dcca1f2f0e1bd91e779bf772bcb4a9d8a9f4
Author: Andrea Gelmini
AuthorDate: Sat May 11 16:10:18 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 21:30:57 2019 +0200
Fix typos
Change-Id: I5ea79480c097fb9d317303981021135a102d8c19
Reviewed-on: https://gerrit.libreoffice.org/72151
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index beaeea3c7d06..200b8edfa7c4 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1129,7 +1129,7 @@ SvTreeListEntry*
SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour
}
}
if (_ppDataSourceEntry)
-// (caller wants to have it ...)
+// (caller wants to have it...)
*_ppDataSourceEntry = pDataSource;
if (pDataSource)
@@ -1630,7 +1630,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16
nId) const
aReturn.bEnabled = !m_bEnableBrowser;
return aReturn;
-// "toggle explorer" is always enabled (if we have a explorer)
+// "toggle explorer" is always enabled (if we have an explorer)
case ID_BROWSER_EXPLORER:
aReturn.bEnabled = m_bEnableBrowser;
aReturn.bChecked = haveExplorer();
@@ -1972,7 +1972,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const
Sequence< PropertyValue
case ID_BROWSER_CLOSE:
closeTask();
-// if it's not 0, such a async close is already pending
+// if it's not 0, such an async close is already pending
break;
case ID_BROWSER_COPY:
@@ -3121,7 +3121,7 @@ void SbaTableQueryBrowser::impl_initialize()
}
// if we have a connection at this point, it was either passed from
outside, our
-// determined from a outer DB document. In both cases, do not dispose it
later on.
+// determined from an outer DB document. In both cases, do not dispose it
later on.
SharedConnection xConnection( xForeignConnection,
SharedConnection::NoTakeOwnership );
// should we display all registered databases in the left hand side tree?
commit c6eddeca7da7bb86087af212e5409aa6c75513ce
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:13:52 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 21:30:30 2019 +0200
Fix typo
Change-Id: I6af2b1ead6448be9b5a47fcd6ef3fb16a52b
Reviewed-on: https://gerrit.libreoffice.org/72153
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 27beb4654d78..e7782a560c8a 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -385,7 +385,7 @@ static constexpr auto BROWSER_STANDARD_FLAGS =
BrowserMode::COLUMNSELECTION | Br
OSL_ENSURE((static_cast(m_aFields.size() + 1)) ==
rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!");
if (!sSelectedEntry.isEmpty() && (nCurrentRow == rowCount - 1)
/*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ )
-{ // in the last row, an non-empty string has been selected
+{ // in the last row, a non-empty string has been selected
// -> insert a new row
m_aFields.emplace_back();
RowInserted(GetRowCount());
commit 9f7d2cefe0b0ce2ce2e9c7010b08dee24596dc2a
Author: Andrea Gelmini
AuthorDate: Wed May 8 10:13:54 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 21:30:10 2019 +0200
Fix typo
Change-Id: Ic7973dc408ba7cd19b958675b5e27320dfea5c92
Reviewed-on: https://gerrit.libreoffice.org/72152
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx
b/dbaccess/source/ui/dlg/finteraction.hxx
index 350cd9f8029a..fdc70b7fc49c 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -30,7 +30,7 @@ namespace dbaui
typedef ::cppu::WeakImplHelper< css::task::XInteractionHandler
> OFilePickerInteractionHandler_Base;
-/** a InteractionHandler implementation which extends another handler with
some customizability
+/** an InteractionHandler implementation which extends another handler
with some customizability
*/
class OFilePickerInteractionHandler final : public
OFilePickerInteractionHandler_Base
{
commit eff075852e7c9f8e5b49fd35107
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/inc/TypeInfo.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56406398dbb5c245552926eaecccfa7ea9c3a4c5 Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:46 2019 + Commit: Julien Nabet CommitDate: Sat May 11 21:29:14 2019 +0200 Fix typo Change-Id: If4b7b256b913864c0916383ff6aee918a6f7bf38 Reviewed-on: https://gerrit.libreoffice.org/72158 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 4304bfd82c16..97c1e150c00f 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -107,7 +107,7 @@ const sal_uInt16 TYPE_BIT = 31; @param _sCreateParams the create params @param _nPrecision the precision @param _nScale the scale -@param _bAutoIncrement if it is a auto increment +@param _bAutoIncrement if it is an auto increment @param _brForceToType true when type was found which has some differences */ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/inc/TableController.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f86384e312d5a98867ccd60859d1159607a9a550 Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:49 2019 + Commit: Julien Nabet CommitDate: Sat May 11 21:28:16 2019 +0200 Fix typo Change-Id: If3bf3f12aba80d4f3fb99867953fb046a86659fa Reviewed-on: https://gerrit.libreoffice.org/72156 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 1e542c10c19e..e6ab7c5ee3a8 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -48,7 +48,7 @@ namespace dbaui OUStringm_sTypeNames; // these type names are the ones out of the resource file TOTypeInfoSPm_pTypeInfo;// fall back when type is unknown because database driver has a failure -boolm_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property +boolm_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has an AutoIncrementValue property in their info property boolm_bNew : 1;// is true when we create a new table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source
dbaccess/source/ui/inc/TableWindow.hxx |4 ++-- dbaccess/source/ui/inc/WCopyTable.hxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 3451b39dd00c4303e4839b43bbad0119eb7f42c1 Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:43 2019 + Commit: Julien Nabet CommitDate: Sat May 11 21:27:47 2019 +0200 Fix typo Change-Id: I49398e07d8d62d21bb9327fddbf589fc23a16720 Reviewed-on: https://gerrit.libreoffice.org/72161 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 2bd96a013a20..8098abebe847 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -400,7 +400,7 @@ namespace dbaui OUString createUniqueName(const OUString& _sName); -// displays a error message that a column type is not supported +// displays an error message that a column type is not supported void showColumnTypeNotSupported(const OUString& _rColumnName); void removeColumnNameFromNameMap(const OUString& _sName); commit b96397450777c0a83b7bfac76cf8f35b25f65544 Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:48 2019 + Commit: Julien Nabet CommitDate: Sat May 11 21:27:18 2019 +0200 Fix typo Change-Id: I80d1f60646803bc3a519c310671bb7062d503726 Reviewed-on: https://gerrit.libreoffice.org/72157 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 306f9cbcd5ea..879ab4beae8e 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -95,9 +95,9 @@ namespace dbaui /** HandleKeyInput tries to handle the KeyEvent. Movement or deletion @param rEvt -The KEyEvent +The KeyEvent @return - when the table could handle the keyevent. + when the table could handle the KeyEvent. */ boolHandleKeyInput( const KeyEvent& rEvt ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/inc/brwctrlr.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit ab7e35ea76c036bc6ab54c76aa067a9fcd36355c Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:41 2019 + Commit: Julien Nabet CommitDate: Sat May 11 21:26:55 2019 +0200 Fix typo Change-Id: I7dfc0835d54a67c2031af9726eb86831779cb0df Reviewed-on: https://gerrit.libreoffice.org/72163 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index c6cd9d8c3d20..708e47329cdc 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -107,7 +107,7 @@ namespace dbaui sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction boolm_bLoadCanceled : 1;// the load was canceled somehow -boolm_bCannotSelectUnfiltered : 1; // received an DATA_CANNOT_SELECT_UNFILTERED error +boolm_bCannotSelectUnfiltered : 1; // received a DATA_CANNOT_SELECT_UNFILTERED error protected: class FormErrorHelper final @@ -260,7 +260,7 @@ namespace dbaui virtual bool LoadForm(); // load the form -// the default implementation does an direct load or starts a load thread, depending on the multithread capabilities +// the default implementation does a direct load or starts a load thread, depending on the multithread capabilities // of the data source. // the default implementation also calls LoadFinished after a synchronous load, so be sure to do the same if you override // this method and don't call the base class' method @@ -270,7 +270,7 @@ namespace dbaui virtual void criticalFail(); // called whenever a reload operation on the rowset failed -// (a "operation" is not only a simple reload: If the user sets a filter, an reloading the form +// (an "operation" is not only a simple reload: if the user sets a filter, and reloading the form // after setting this filter fails, the filter is reset and the form is reloaded, again. Only the // whole process (_both_ XLoadable::reload calls _together_) form the "reload operation" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula reportdesign/source sc/source
formula/source/ui/dlg/ControlHelper.hxx| 10 formula/source/ui/dlg/formula.cxx | 55 - formula/source/ui/dlg/funcutl.cxx | 244 -- formula/source/ui/dlg/parawin.cxx | 12 formula/source/ui/dlg/parawin.hxx | 12 include/formula/IControlReferenceHandler.hxx |4 include/formula/formula.hxx| 10 include/formula/funcutl.hxx| 105 -- reportdesign/source/ui/dlg/Formula.cxx | 15 reportdesign/source/ui/inc/Formula.hxx |4 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 14 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 24 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 24 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 28 sc/source/ui/condformat/condformatdlg.cxx | 10 sc/source/ui/condformat/condformatdlgentry.cxx |8 sc/source/ui/dbgui/PivotLayoutDialog.cxx | 22 sc/source/ui/dbgui/consdlg.cxx | 16 sc/source/ui/dbgui/dbnamdlg.cxx| 10 sc/source/ui/dbgui/filtdlg.cxx |4 sc/source/ui/dbgui/foptmgr.cxx |6 sc/source/ui/dbgui/sfiltdlg.cxx| 18 sc/source/ui/dbgui/validate.cxx| 16 sc/source/ui/formdlg/formula.cxx | 21 sc/source/ui/inc/IAnyRefDialog.hxx |1 sc/source/ui/inc/PivotLayoutDialog.hxx | 20 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 14 sc/source/ui/inc/SamplingDialog.hxx| 20 sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 20 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 24 sc/source/ui/inc/anyrefdg.hxx | 131 --- sc/source/ui/inc/areasdlg.hxx | 20 sc/source/ui/inc/condformatdlg.hxx | 10 sc/source/ui/inc/condformatdlgentry.hxx|8 sc/source/ui/inc/consdlg.hxx | 16 sc/source/ui/inc/crnrdlg.hxx | 22 sc/source/ui/inc/dbnamdlg.hxx |6 sc/source/ui/inc/filtdlg.hxx | 20 sc/source/ui/inc/foptmgr.hxx | 14 sc/source/ui/inc/formula.hxx |3 sc/source/ui/inc/highred.hxx |4 sc/source/ui/inc/namedefdlg.hxx|6 sc/source/ui/inc/namedlg.hxx |8 sc/source/ui/inc/optsolver.hxx | 50 - sc/source/ui/inc/simpref.hxx |4 sc/source/ui/inc/solvrdlg.hxx | 18 sc/source/ui/inc/tabopdlg.hxx | 22 sc/source/ui/inc/validate.hxx | 29 sc/source/ui/inc/xmlsourcedlg.hxx |8 sc/source/ui/miscdlgs/anyrefdg.cxx | 374 -- sc/source/ui/miscdlgs/crnrdlg.cxx | 24 sc/source/ui/miscdlgs/highred.cxx |4 sc/source/ui/miscdlgs/optsolver.cxx| 60 - sc/source/ui/miscdlgs/simpref.cxx |4 sc/source/ui/miscdlgs/solvrdlg.cxx | 20 sc/source/ui/miscdlgs/tabopdlg.cxx | 26 sc/source/ui/namedlg/namedefdlg.cxx|6 sc/source/ui/namedlg/namedlg.cxx |8 sc/source/ui/pagedlg/areasdlg.cxx | 22 sc/source/ui/xmlsource/xmlsourcedlg.cxx|8 60 files changed, 494 insertions(+), 1252 deletions(-) New commits: commit d56ee7339f1a2ca73167791a5b39b6da38b401d5 Author: Caolán McNamara AuthorDate: Wed May 8 11:14:52 2019 +0100 Commit: Caolán McNamara CommitDate: Sat May 11 20:31:04 2019 +0200 remove unused RefEdit/RefButton and rename WeldRefEdit/WeldRefButton back Change-Id: I3aab8585d4ba1017cc755bf21e827522e7ee6980 Reviewed-on: https://gerrit.libreoffice.org/71957 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx ind
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_class.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d6a43b40736fef259402177cb50e6d1428112cfc Author: Luboš Luňák AuthorDate: Thu May 9 13:45:33 2019 +0200 Commit: Luboš Luňák CommitDate: Sat May 11 19:19:26 2019 +0200 disable ccache for PCH generation Ccache can't handle it well with -gsplit-dwarf, and it's a question if it even makes sense to spend cache space on large PCHs. https://github.com/ccache/ccache/issues/419 Change-Id: I9a458c1793fcd503f7d29ea76c6e7651ab378783 Reviewed-on: https://gerrit.libreoffice.org/72041 Reviewed-by: Luboš Luňák Tested-by: Luboš Luňák diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index bdd1412aea75..8ece06fd66f0 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -94,6 +94,7 @@ define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ + CCACHE_DISABLE=1 $(gb_COMPILER_SETUP) \ $(gb_CXX) \ -x c++-header \ $(4) $(5) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/charmapcontrol.hxx|4 ++-
sfx2/source/control/charmapcontrol.cxx | 40 -
2 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit caa6de6c97b0c2fc82c6a2699a1e84b9d2eb9dbd
Author: Jim Raykowski
AuthorDate: Sun May 5 17:22:59 2019 -0800
Commit: Jim Raykowski
CommitDate: Sat May 11 18:58:12 2019 +0200
tdf#123793 Add kb tab navigation to special chars popup window
...and keep the 'More Characters...' button as first focused
Change-Id: Iab4cb00aaed9250f0cc7f35f27af48eb326f2a48
Reviewed-on: https://gerrit.libreoffice.org/71834
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 9b58bdd6a4da..1c15ae77b60d 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -39,6 +39,8 @@ public:
virtual void dispose() override;
+virtual bool EventNotify( NotifyEvent& rNEvt ) override;
+
private:
VclPtr m_pRecentCharView[16];
VclPtr m_pFavCharView[16];
@@ -49,7 +51,7 @@ private:
VclPtr maDlgBtn;
DECL_LINK(CharClickHdl, SvxCharViewControl*, void);
-DECL_STATIC_LINK(SfxCharmapCtrl, LoseFocusHdl, Control&, void);
+DECL_STATIC_LINK(SfxCharmapCtrl, FocusHdl, Control&, void);
DECL_LINK(OpenDlgHdl, Button*, void);
voidgetFavCharacterList();
diff --git a/sfx2/source/control/charmapcontrol.cxx
b/sfx2/source/control/charmapcontrol.cxx
index 8bb684b8e9c1..7f757a7eb4df 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
using namespace css;
@@ -64,10 +65,14 @@ SfxCharmapCtrl::SfxCharmapCtrl(sal_uInt16 nId, vcl::Window*
pParent, const css::
for(int i = 0; i < 16; i++)
{
+m_pRecentCharView[i]->SetStyle(m_pRecentCharView[i]->GetStyle() |
WB_GROUP);
m_pRecentCharView[i]->setMouseClickHdl(LINK(this,SfxCharmapCtrl,
CharClickHdl));
-m_pRecentCharView[i]->SetLoseFocusHdl(LINK(this,SfxCharmapCtrl,
LoseFocusHdl));
+m_pRecentCharView[i]->SetGetFocusHdl(LINK(this,SfxCharmapCtrl,
FocusHdl));
+m_pRecentCharView[i]->SetLoseFocusHdl(LINK(this,SfxCharmapCtrl,
FocusHdl));
+m_pFavCharView[i]->SetStyle(m_pFavCharView[i]->GetStyle() | WB_GROUP);
m_pFavCharView[i]->setMouseClickHdl(LINK(this,SfxCharmapCtrl,
CharClickHdl));
-m_pFavCharView[i]->SetLoseFocusHdl(LINK(this,SfxCharmapCtrl,
LoseFocusHdl));
+m_pFavCharView[i]->SetGetFocusHdl(LINK(this,SfxCharmapCtrl, FocusHdl));
+m_pFavCharView[i]->SetLoseFocusHdl(LINK(this,SfxCharmapCtrl,
FocusHdl));
}
maDlgBtn->SetClickHdl(LINK(this, SfxCharmapCtrl, OpenDlgHdl));
@@ -177,7 +182,32 @@ void SfxCharmapCtrl::updateRecentCharControl()
}
-IMPL_STATIC_LINK(SfxCharmapCtrl, LoseFocusHdl, Control&, pItem, void)
+bool SfxCharmapCtrl::EventNotify( NotifyEvent& rNEvt )
+{
+static bool bNeedsInit = true;
+if ( maDlgBtn->HasFocus() && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT
)
+{
+const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode();
+const sal_uInt16 nCode = rKey.GetCode();
+if ( nCode != KEY_TAB && nCode != KEY_RETURN && nCode != KEY_SPACE &&
nCode != KEY_ESCAPE )
+{
+return true;
+}
+if ( bNeedsInit && nCode == KEY_TAB )
+{
+for(int i = 0; i < 16; i++)
+{
+m_pRecentCharView[i]->set_property( "can-focus", "true" );
+m_pFavCharView[i]->set_property( "can-focus", "true" );
+}
+bNeedsInit = false;
+}
+}
+return SfxPopupWindow::EventNotify( rNEvt );
+}
+
+
+IMPL_STATIC_LINK(SfxCharmapCtrl, FocusHdl, Control&, pItem, void)
{
pItem.Invalidate();
}
@@ -185,10 +215,8 @@ IMPL_STATIC_LINK(SfxCharmapCtrl, LoseFocusHdl, Control&,
pItem, void)
IMPL_LINK(SfxCharmapCtrl, CharClickHdl, SvxCharViewControl*, rView, void)
{
-rView->GrabFocus();
-rView->Invalidate();
rView->InsertCharToDoc();
-
+GrabFocusToDocument();
Close();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: distro/collabora/cp-6.0* fails to build on my Ubuntu 16.04
Hi, Thank you for the quick answer, i've tried building core master now, there is no gperf 3.1 for Ubuntu 16.04 so it fails during autogen, it also asked for gcc and g++ at 7.0+ so i installed those, they don't help with building distro/collabora/cp-6.0 either, i get the same Error. Regards, Gerrit Am Freitag, den 10.05.2019, 13:43 +0200 schrieb Miklos Vajna: > Hi, > > If you plan to contribute, just build online.git master against > core.git > master, that has the latest code. It's best to work against that. > > 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] core.git: chart2/source extras/source formula/source include/vcl sc/inc sc/source sc/uiconfig solenv/bin solenv/gbuild solenv/sanitizers svx/source vcl/source vcl/unx
chart2/source/controller/dialogs/res_ErrorBar.cxx|4
chart2/source/controller/dialogs/tp_DataSource.cxx |2
chart2/source/controller/dialogs/tp_RangeChooser.cxx |6
extras/source/glade/libreoffice-catalog.xml.in | 12
formula/source/ui/dlg/funcutl.cxx|2
include/vcl/weld.hxx | 21
sc/inc/colorscale.hxx|1
sc/source/core/data/colorscale.cxx | 11
sc/source/ui/condformat/condformatdlg.cxx| 345 ++
sc/source/ui/condformat/condformatdlgentry.cxx | 1076 +++
sc/source/ui/inc/condformatdlg.hxx | 86 -
sc/source/ui/inc/condformatdlgentry.hxx | 189 +--
sc/source/ui/inc/tabvwsh.hxx |3
sc/source/ui/namedlg/namedefdlg.cxx |8
sc/source/ui/namedlg/namedlg.cxx |8
sc/source/ui/view/formatsh.cxx | 10
sc/source/ui/view/reffact.cxx| 43
sc/source/ui/view/tabvwshc.cxx | 91 -
sc/uiconfig/scalc/ui/conditionalentry.ui | 722 +++-
sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 179 ++-
sc/uiconfig/scalc/ui/conditionaliconset.ui |4
solenv/bin/native-code.py|3
solenv/gbuild/UIConfig.mk|4
solenv/sanitizers/ui/modules/scalc.false |1
solenv/sanitizers/ui/modules/scalc.suppr | 15
svx/source/dialog/langbox.cxx|4
svx/source/dialog/srchdlg.cxx|4
vcl/source/app/salvtables.cxx| 110 +
vcl/source/window/stacking.cxx |2
vcl/unx/gtk3/gtk3gtkinst.cxx | 160 ++
30 files changed, 1543 insertions(+), 1583 deletions(-)
New commits:
commit 492b0d5d076d38234fea4e4e7c5dbec578296fd2
Author: Caolán McNamara
AuthorDate: Tue May 7 12:27:43 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat May 11 18:34:23 2019 +0200
weld conditional formatting
Change-Id: Ia9c99a17d5a95d67a412cfde959192c99caa70be
Reviewed-on: https://gerrit.libreoffice.org/71956
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index d2788b8e2d3f..f8fa420120f5 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -713,11 +713,11 @@ void
ErrorBarResources::isRangeFieldContentValid(weld::Entry& rEdit)
if( bIsValid || !rEdit.get_sensitive())
{
-rEdit.set_error(false);
+rEdit.set_message_type(weld::EntryMessageType::Normal);
}
else
{
-rEdit.set_error(true);
+rEdit.set_message_type(weld::EntryMessageType::Error);
}
}
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 00963cf054f7..c650e7951af6 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -296,7 +296,7 @@ bool
DataSourceTabPage::isRangeFieldContentValid(weld::Entry& rEdit )
OUString aRange(rEdit.get_text());
bool bIsValid = aRange.isEmpty() ||
m_rDialogModel.getRangeSelectionHelper()->verifyCellRange(aRange);
-rEdit.set_error(!bIsValid);
+rEdit.set_message_type(bIsValid ? weld::EntryMessageType::Normal :
weld::EntryMessageType::Error);
return bIsValid;
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 6205f9f45a8d..a20a12f0ab4a 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -279,16 +279,14 @@ bool RangeChooserTabPage::isValid()
if( bIsValid )
{
-m_xED_Range->set_error(false);
-m_xED_Range->set_error(false);
+m_xED_Range->set_message_type(weld::EntryMessageType::Normal);
if( m_pTabPageNotifiable )
m_pTabPageNotifiable->setValidPage( this );
m_aLastValidRangeString = aRange;
}
else
{
-m_xED_Range->set_error(true);
-m_xED_Range->set_error(true);
+m_xED_Range->set_message_type(weld::EntryMessageType::Error);
if( m_pTabPageNotifiable )
m_pTabPageNotifiable->setInvalidPage( this );
}
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 7a450c288d92..581a3b844416 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -277,14 +277,6 @@
generic-name="LanguageBox" pa
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/graphicfilter.cxx | 405
1 file changed, 94 insertions(+), 311 deletions(-)
New commits:
commit acd290431fd39ed0602e057e036326b46a99f7a8
Author: Tomaž Vajngerl
AuthorDate: Sat May 11 09:31:31 2019 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat May 11 15:56:48 2019 +0200
change type detection to use GraphicFormatDetector
ImpPeekGraphicFormat now uses GraphicFormatDetector for type
detection.
Change-Id: I4ef2c3c57f72466fcb8c56c64a30f00ad6421d25
Reviewed-on: https://gerrit.libreoffice.org/72137
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index ecc90017037b..b5090fafecdc 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -246,13 +246,6 @@ bool ImpPeekGraphicFormat( SvStream& rStream, OUString&
rFormatExtension, bool b
if (!aDetector.detect())
return false;
-sal_uInt8* sFirstBytes = aDetector.maFirstBytes.data();
-sal_uLong nFirstLong = aDetector.mnFirstLong;
-sal_uLong nSecondLong = aDetector.mnSecondLong;
-
-sal_uLong nStreamPos = aDetector.mnStreamPosition;
-sal_uLong nStreamLen = aDetector.mnStreamLength;
-
// The following variable is used when bTest == true. It remains false
// if the format (rFormatExtension) has not yet been set.
bool bSomethingTested = false;
@@ -264,446 +257,236 @@ bool ImpPeekGraphicFormat( SvStream& rStream, OUString&
rFormatExtension, bool b
// Therefore, in the case of a format check (bTest == true) we only test
*exactly* this
// format. Everything else could have fatal consequences, for example if
the user says it is
// a BMP file (and it is a BMP) file, and the file would go through the
MET test ...
-//--- MET
-if( !bTest || rFormatExtension.startsWith( "MET" ) )
-{
-bSomethingTested=true;
-if( sFirstBytes[2] == 0xd3 )
-{
-rStream.SetEndian( SvStreamEndian::BIG );
-rStream.Seek( nStreamPos );
-sal_uInt16 nFieldSize;
-sal_uInt8 nMagic;
-bool bOK=true;
-rStream.ReadUInt16( nFieldSize ).ReadUChar( nMagic );
-for (int i=0; i<3; i++) {
-if (nFieldSize<6) { bOK=false; break; }
-if (nStreamLen < rStream.Tell() + nFieldSize ) { bOK=false;
break; }
-rStream.SeekRel(nFieldSize-3);
-rStream.ReadUInt16( nFieldSize ).ReadUChar( nMagic );
-if (nMagic!=0xd3) { bOK=false; break; }
-}
-rStream.SetEndian( SvStreamEndian::LITTLE );
-if (bOK && !rStream.GetError()) {
-rFormatExtension = "MET";
-return true;
-}
-}
-}
-//--- BMP
-if( !bTest || rFormatExtension.startsWith( "BMP" ) )
+if (!bTest || rFormatExtension.startsWith("MET"))
{
-sal_uInt8 nOffs;
-
-bSomethingTested=true;
-
-// We're possibly also able to read an OS/2 bitmap array
-// ('BA'), therefore we must adjust the offset to discover the
-// first bitmap in the array
-if ( sFirstBytes[0] == 0x42 && sFirstBytes[1] == 0x41 )
-nOffs = 14;
-else
-nOffs = 0;
-
-// Now we initially test on 'BM'
-if ( sFirstBytes[0+nOffs]==0x42 && sFirstBytes[1+nOffs]==0x4d )
+bSomethingTested = true;
+if (aDetector.checkMET())
{
-
-// OS/2 can set the Reserved flags to a value other than 0
-// (which they really should not do...);
-// In this case we test the size of the BmpInfoHeaders
-if ( ( sFirstBytes[6+nOffs]==0x00 &&
- sFirstBytes[7+nOffs]==0x00 &&
- sFirstBytes[8+nOffs]==0x00 &&
- sFirstBytes[9+nOffs]==0x00 ) ||
- sFirstBytes[14+nOffs] == 0x28 ||
- sFirstBytes[14+nOffs] == 0x0c )
-{
-rFormatExtension = "BMP";
-return true;
-}
+rFormatExtension = aDetector.msDetectedFormat;
+return true;
}
}
-//--- WMF/EMF
-
-if( !bTest ||
-rFormatExtension.startsWith( "WMF" ) ||
-rFormatExtension.startsWith( "EMF" ) )
+if (!bTest || rFormatExtension.startsWith("BMP"))
{
bSomethingTested = true;
-
-if ( nFirstLong==0xd7cdc69a || nFirstLong==0x01000900 )
+if (aDetector.checkBMP())
{
-rFormatExtension = "WMF";
-return true;
-}
-else if( nFirstLong == 0x0100 && sFirstBytes[ 40 ] == 0x20 &&
sFirstBytes[ 41 ] == 0x45 &&
-
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/browser/formadapter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bafd402ddca648a35d2a0059e37abe198e54e44e Author: Andrea Gelmini AuthorDate: Wed May 8 10:13:59 2019 + Commit: Julien Nabet CommitDate: Sat May 11 14:27:39 2019 +0200 Fix typo Change-Id: I437da2bfedce39379fb6d482ca6341038df1f786 Reviewed-on: https://gerrit.libreoffice.org/72149 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 23d665307b0a..cd1400a5c15f 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1401,7 +1401,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU m_aChildren.insert(m_aChildren.begin() + nIndex, xElement); m_aChildNames.insert(m_aChildNames.begin() + nIndex, sName); -// listen for a changes of the name +// listen for a change of the name xElementSet->addPropertyChangeListener(PROPERTY_NAME, static_cast(this)); // we are now the parent of the new element ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|5 +
sw/source/core/doc/DocumentRedlineManager.cxx |5 -
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2de1fd7d8b8bd42c66190140cc4506df0c3367f1
Author: László Németh
AuthorDate: Fri May 10 16:36:10 2019 +0200
Commit: László Németh
CommitDate: Sat May 11 13:09:32 2019 +0200
tdf#125187 DOCX track changes: fix w:del within w:ins
by removing deletions within insertions, because
Writer core doesn't support overlapping redlines,
ie. tracked deletion as part of a tracked insertion.
Note: Commit 7a810d6a9fb79a24d00e5dbd8e1223e6f8b09677
handled this by breaking the tracked changes, fixing
"Accept All", but not the "Reject All".
Change-Id: Iad5932d97cd45bdd62c2df21abd4bcc0b4c3d9a1
Reviewed-on: https://gerrit.libreoffice.org/72128
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 42677b6de0eb..70b6e79bc04d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -936,10 +936,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf116084, "tdf116084.docx")
// tracked line is not a single text portion: w:del is recognized within
w:ins
CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 1 ), 1
)->getString());
CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(1), 1), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL( OUString( "There " ), getRun( getParagraph( 1 ), 2
)->getString());
-CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 1 ), 4
)->getString());
-CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(1), 4), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL( OUString( "must" ), getRun( getParagraph( 1 ), 5
)->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "There should be a better start to this. "
), getRun( getParagraph( 1 ), 2 )->getString());
}
DECLARE_OOXMLIMPORT_TEST(testTdf121176, "tdf121176.docx")
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 47d52d6226c4..3056f8f27d12 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1471,7 +1471,10 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline*
pNewRedl, bool const bCall
bCompress = true;
}
if( !bCallDelete && !bDec && *pEnd == *pREnd )
-pRedl->SetEnd( *pStt, pREnd );
+{
+
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl );
+bCompress = true;
+}
else if ( bCallDelete || !bDec )
{
// delete new redline, except in some cases of
fallthrough from previous
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc4.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e5f23ede288b62ad259399a4d36e8d76ce59d1b8 Author: Andrea Gelmini AuthorDate: Sat May 11 08:36:21 2019 + Commit: Julien Nabet CommitDate: Sat May 11 12:05:23 2019 +0200 Removed duplicated include Change-Id: I4fa7ed467bb833dc8c406ecdd269cef25152e512 Reviewed-on: https://gerrit.libreoffice.org/72146 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 0a07572a7511..76f94d3e5845 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 351f2020a70a2089a55408c1bd072be9c7442787 Author: Andrea Gelmini AuthorDate: Sat May 11 08:36:00 2019 + Commit: Julien Nabet CommitDate: Sat May 11 12:04:33 2019 +0200 Removed duplicated include Change-Id: I4796ff31d46cb05d144257d4d6be7a2f7cc3e3c5 Reviewed-on: https://gerrit.libreoffice.org/72147 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index a5af9d164d1d..ee75a5d7848f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -135,7 +135,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/editeng
include/editeng/editstat.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42a57840a86665f1a74010ff1e3da27934c85df9 Author: Andrea Gelmini AuthorDate: Sat May 11 08:35:28 2019 + Commit: Julien Nabet CommitDate: Sat May 11 12:04:08 2019 +0200 Fix typo Change-Id: I677a3a23eb60311fd871d4b6d9b8f0de3afec54a Reviewed-on: https://gerrit.libreoffice.org/72148 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index 0d71fdda6625..242d179b36a5 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -38,7 +38,7 @@ enum class EEControlBits ALLOWBIGOBJS = 0x0800, // Portion info in text object ONLINESPELLING = 0x1000, // During the edit Spelling STRETCHING = 0x2000, // Stretch mode -MARKNONURLFIELDS = 0x4000, // Mark fields other tha URL with color +MARKNONURLFIELDS = 0x4000, // Mark fields other than URL with color MARKURLFIELDS = 0x8000, // Mark URL fields with color MARKFIELDS = (MARKNONURLFIELDS | MARKURLFIELDS), RTFSTYLESHEETS = 0x0002, // Use Stylesheets when imported ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/test
basegfx/test/B2DPolygonTest.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 665c763e8427155d427f4e580c4b6f26625982e7
Author: Andrea Gelmini
AuthorDate: Sat May 11 08:37:44 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 11:13:08 2019 +0200
Fix typo
Change-Id: I3ba8dc5a2519a85a2da88f1d40832dd2fb6c10a6
Reviewed-on: https://gerrit.libreoffice.org/72144
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/basegfx/test/B2DPolygonTest.cxx b/basegfx/test/B2DPolygonTest.cxx
index 316a916f931f..46458574a270 100644
--- a/basegfx/test/B2DPolygonTest.cxx
+++ b/basegfx/test/B2DPolygonTest.cxx
@@ -81,7 +81,7 @@ public:
void testContainsOnlyHorizontalOrVerticalLines()
{
-// First line is horziontal, second is vertical.
+// First line is horizontal, second is vertical.
B2DPolygon aPoly;
aPoly.append(B2DPoint(0, 1));
aPoly.append(B2DPoint(1, 1));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/table/tablefunction.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 10ff65d3a47e98af2113828b6ac60abcd188d1ea Author: Andrea Gelmini AuthorDate: Sat May 11 08:36:35 2019 + Commit: Julien Nabet CommitDate: Sat May 11 11:12:50 2019 +0200 Removed duplicated include Change-Id: Icd48d587af18ddf9e4a681ad56a6add1db38dba9 Reviewed-on: https://gerrit.libreoffice.org/72145 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 4d15f465510a..e145a98eea08 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -44,7 +44,6 @@ #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Ccache depend mode
On Thursday 09 of May 2019, Rene Engelhard wrote: > On Tue, May 07, 2019 at 11:32:12AM +0200, Luboš Luňák wrote: > > - We use -MMD, which exludes system headers (or even our externals, since > > for those we use -isystem too). This means that ccache could give > > incorrect hits if those headers change. That may seem bad, but I think > > it's unlikely to cause problems in practice, for several reasons: > > * System headers rarely change. > > They change all the time. > > > * If they change, it's generally a binary compatible change. > > No? There's many versions of the same compatible header where the header > stays the same? > > You seem to only think of people only developing on their stable, not > changing distro. > > People often build stuff for their distros (as distro packagers, where > this stuff *does* change - and that also compatibly because said new update > affected someting else or a specific header of even the same header but > compatibly. > > In development times, I upgrade my unstable chroot daily (and whatever > changed in unstable changes there, too. That includes system libs/headers > and compilers and whatever.) Fair enough, but does that actually change anything about what I said? Most people do not develop on a rolling distro, so in the usual case still system headers rarely change. And if your case is different, then the setup already doesn't suit it perfectly. You already have missing make dependencies, and now the same setup also needs --enable-ccache=nodepend. -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/xsltfilter/LibXSLTTransformer.cxx |4 ++--
filter/source/xsltfilter/LibXSLTTransformer.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c77895fe6fd4f9f38ab00f29cb1e47e8544ebbec
Author: Julien Nabet
AuthorDate: Sat May 11 08:28:05 2019 +0200
Commit: Julien Nabet
CommitDate: Sat May 11 10:54:49 2019 +0200
Replace list by deque in xsltfilter
+ replace remove by erase remove idiom
+ use push_front instead of using insert at beginning
Change-Id: I3320a4e4cadeee05c7ca347987360c3c75fe6b3d
Reviewed-on: https://gerrit.libreoffice.org/72139
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index acc81d4e1196..3be9e7351990 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -408,14 +408,14 @@ namespace XSLT
void
LibXSLTTransformer::addListener(const
css::uno::Reference& listener)
{
-m_listeners.insert(m_listeners.begin(), listener);
+m_listeners.push_front(listener);
}
void
LibXSLTTransformer::removeListener(
const css::uno::Reference& listener)
{
-m_listeners.remove(listener);
+m_listeners.erase( std::remove(m_listeners.begin(), m_listeners.end(),
listener ), m_listeners.end() );
}
void
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx
b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 7261978ed6ed..fb0b222ed29f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
#define INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
-#include
+#include
#include
#include
@@ -109,7 +109,7 @@ namespace XSLT
css::uno::Reference m_rOutputStream;
-typedef ::std::list >
ListenerList;
+typedef ::std::deque >
ListenerList;
ListenerList m_listeners;
___
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/helper/canvastools.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a813ada3f763a742aba23ec78fa89ed2eb0a360f
Author: Andrea Gelmini
AuthorDate: Sat May 11 08:12:54 2019 +
Commit: Julien Nabet
CommitDate: Sat May 11 10:20:26 2019 +0200
Fix typo
Change-Id: I6afc443ced9f4a6a436d9ba5beea22d1701c5d1e
Reviewed-on: https://gerrit.libreoffice.org/72143
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/vcl/source/helper/canvastools.cxx
b/vcl/source/helper/canvastools.cxx
index c3e15b3c697a..495038e4ecd1 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -399,7 +399,7 @@ namespace vcl
basegfx::B2DRange b2DRectangleFromRectangle( const ::tools::Rectangle&
rRect )
{
-// although B2DRange internally has separate heigh/width
emptiness, it doesn't
+// although B2DRange internally has separate height/width
emptiness, it doesn't
// expose any API to let us set them separately, so just do the
best we can.
if (rRect.IsWidthEmpty() && rRect.IsHeightEmpty())
return basegfx::B2DRange( basegfx::B2DTuple( rRect.Left(),
rRect.Top() ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/SfxRedactionHelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c47696e3bc68abcb04842529edf361c34b564292 Author: Andrea Gelmini AuthorDate: Sat May 11 07:47:39 2019 + Commit: Julien Nabet CommitDate: Sat May 11 10:20:05 2019 +0200 Fix typo Change-Id: Ibf2f7fec9b8840d8a844def4228415d8bcc9f142 Reviewed-on: https://gerrit.libreoffice.org/72141 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index 8f0b2ca5d1c0..4f1c01da4907 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -91,7 +91,7 @@ void fixMetaFile(GDIMetaFile& tmpMtf) } /* - * Sets page margins for a Draw page. Negative values are considered erronous. + * Sets page margins for a Draw page. Negative values are considered erroneous * */ void setPageMargins(uno::Reference& xPageProperySet, const PageMargins& aPageMargins) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - oox/source sd/qa
oox/source/drawingml/fillproperties.cxx|5 +
oox/source/export/drawingml.cxx|6 +++---
sd/qa/unit/data/odp/image_transparency.odp |binary
sd/qa/unit/export-tests-ooxml1.cxx | 26 ++
4 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit dc75d3cc5f2797dd5a8675004302a52bda1210c6
Author: Tamás Zolnai
AuthorDate: Thu May 9 13:03:13 2019 +0200
Commit: Andras Timar
CommitDate: Sat May 11 10:07:06 2019 +0200
PPTX: Fix import / export of image transparency
Reviewed-on: https://gerrit.libreoffice.org/71916
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit ae3aabdb951643af8d2f7aee9c9f900245e5b384)
Change-Id: Ib07c606083b833389fcb82aac57ca8535d6e861f
Reviewed-on: https://gerrit.libreoffice.org/72051
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index b255116b4a7b..a2fb6ee7a6c6 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -755,6 +755,11 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop);
}
}
+
+if ( maBlipProps.moAlphaModFix.has() )
+{
+rPropMap.setProperty(PROP_Transparency, static_cast(100
- (maBlipProps.moAlphaModFix.get() / PER_PERCENT)));
+}
}
rPropMap.setProperty(PROP_GraphicColorMode, eColorMode);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a797adbc1f1e..23065ec67678 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1154,14 +1154,14 @@ void
DrawingML::WriteImageBrightnessContrastTransparence(uno::Reference();
if (GetProperty(rXPropSet, "AdjustContrast"))
nContrast = mAny.get();
-if (GetProperty(rXPropSet, "FillTransparence"))
-nTransparence = mAny.get();
+if (GetProperty(rXPropSet, "Transparency"))
+nTransparence = mAny.get();
if (nBright || nContrast)
diff --git a/sd/qa/unit/data/odp/image_transparency.odp
b/sd/qa/unit/data/odp/image_transparency.odp
new file mode 100644
index ..6d3f6c232d91
Binary files /dev/null and b/sd/qa/unit/data/odp/image_transparency.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index f649d2723044..7cc50e21f963 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -101,6 +101,7 @@ public:
void testTdf111884();
void testTdf112633();
void testCustomXml();
+void testPictureTransparency();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
@@ -131,6 +132,7 @@ public:
CPPUNIT_TEST(testTdf111884);
CPPUNIT_TEST(testTdf112633);
CPPUNIT_TEST(testCustomXml);
+CPPUNIT_TEST(testPictureTransparency);
CPPUNIT_TEST_SUITE_END();
@@ -853,6 +855,30 @@ void SdOOXMLExportTest1::testCustomXml()
CPPUNIT_ASSERT(pStream);
}
+void SdOOXMLExportTest1::testPictureTransparency()
+{
+// Load document and export it to a temporary file.
+::sd::DrawDocShellRef xDocShRef
+=
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/image_transparency.odp"),
ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+uno::Reference
xDoc(xDocShRef->GetDoc()->getUnoModel(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDoc.is());
+
+uno::Reference
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPage.is());
+
+uno::Reference xGraphicShape(getShape(0, xPage));
+CPPUNIT_ASSERT(xGraphicShape.is());
+
+sal_Int16 nTransparency = 0;
+CPPUNIT_ASSERT(xGraphicShape->getPropertyValue("Transparency") >>=
nTransparency);
+CPPUNIT_ASSERT_EQUAL(static_cast(51), nTransparency);
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source sw/source
svx/source/dialog/dialcontrol.cxx |5 +++--
svx/source/svdraw/svdogrp.cxx | 27 ++-
svx/source/svdraw/svdopath.cxx|8
sw/source/uibase/uiview/view.cxx | 12
4 files changed, 37 insertions(+), 15 deletions(-)
New commits:
commit f8d29fea9915a5fe66e4ba24cbd3b248929b51b7
Author: Noel Grandin
AuthorDate: Fri May 10 15:47:53 2019 +0200
Commit: Noel Grandin
CommitDate: Sat May 11 09:09:52 2019 +0200
handle empty tools::Rectangle in svx
Change-Id: I45e26c9cdc00ae6d3bc56534d612b83b5ac26074
Reviewed-on: https://gerrit.libreoffice.org/72125
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/dialog/dialcontrol.cxx
b/svx/source/dialog/dialcontrol.cxx
index 547949ce5e2e..598caafc8201 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -212,8 +212,9 @@ void DialControlBmp::DrawBackground()
SetLineColor();
SetFillColor( GetBackgroundColor() );
-DrawEllipse( tools::Rectangle( maRect.Left() + DIAL_OUTER_WIDTH,
maRect.Top() + DIAL_OUTER_WIDTH,
-maRect.Right() - DIAL_OUTER_WIDTH, maRect.Bottom() - DIAL_OUTER_WIDTH
) );
+tools::Rectangle aEllipseRect = maRect;
+aEllipseRect.shrink(DIAL_OUTER_WIDTH);
+DrawEllipse( aEllipseRect );
}
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 61bca73c9a37..c50ba9524908 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -501,17 +501,26 @@ void SdrObjGroup::SetSnapRect(const tools::Rectangle&
rRect)
{
tools::Rectangle aBoundRect0; if (pUserCall!=nullptr)
aBoundRect0=GetLastBoundRect();
tools::Rectangle aOld(GetSnapRect());
-long nMulX=rRect.Right()-rRect.Left();
-long nDivX=aOld.Right()-aOld.Left();
-long nMulY=rRect.Bottom()-rRect.Top();
-long nDivY=aOld.Bottom()-aOld.Top();
-if (nDivX==0) { nMulX=1; nDivX=1; }
-if (nDivY==0) { nMulY=1; nDivY=1; }
-if (nMulX!=nDivX || nMulY!=nDivY) {
-Fraction aX(nMulX,nDivX);
-Fraction aY(nMulY,nDivY);
+if (aOld.IsEmpty())
+{
+Fraction aX(1,1);
+Fraction aY(1,1);
Resize(aOld.TopLeft(),aX,aY);
}
+else
+{
+long nMulX=rRect.Right()-rRect.Left();
+long nDivX=aOld.Right()-aOld.Left();
+long nMulY=rRect.Bottom()-rRect.Top();
+long nDivY=aOld.Bottom()-aOld.Top();
+if (nDivX==0) { nMulX=1; nDivX=1; }
+if (nDivY==0) { nMulY=1; nDivY=1; }
+if (nMulX!=nDivX || nMulY!=nDivY) {
+Fraction aX(nMulX,nDivX);
+Fraction aY(nMulY,nDivY);
+Resize(aOld.TopLeft(),aX,aY);
+}
+}
if (rRect.Left()!=aOld.Left() || rRect.Top()!=aOld.Top()) {
Move(Size(rRect.Left()-aOld.Left(),rRect.Top()-aOld.Top()));
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 4c3d0f2040b9..12a7b2c1af39 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2362,6 +2362,14 @@ void SdrPathObj::RecalcSnapRect()
void SdrPathObj::NbcSetSnapRect(const tools::Rectangle& rRect)
{
tools::Rectangle aOld(GetSnapRect());
+if (aOld.IsEmpty())
+{
+Fraction aX(1,1);
+Fraction aY(1,1);
+NbcResize(aOld.TopLeft(), aX, aY);
+NbcMove(Size(rRect.Left() - aOld.Left(), rRect.Top() - aOld.Top()));
+return;
+}
// Take empty into account when calculating scale factors
long nMulX = rRect.IsWidthEmpty() ? 0 : rRect.Right() - rRect.Left();
commit 08b79ade4f2e2fa98487696591123f71a7521dff
Author: Noel Grandin
AuthorDate: Fri May 10 15:47:05 2019 +0200
Commit: Noel Grandin
CommitDate: Sat May 11 09:09:39 2019 +0200
handle empty tools::Rectangle in sw
Change-Id: I44c4b5a6d4f0aada0ed95d8cd4d05366958c6207
Reviewed-on: https://gerrit.libreoffice.org/72124
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index c48a59c22841..67fce780a56a 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1527,13 +1527,17 @@ void SwView::WriteUserDataSequence ( uno::Sequence <
beans::PropertyValue >& rSe
aVector.push_back(comphelper::makePropertyValue("ViewTop",
convertTwipToMm100 ( rRect.Top() )));
-aVector.push_back(comphelper::makePropertyValue("VisibleLeft",
convertTwipToMm100 ( rVis.Left() )));
+auto visibleLeft = convertTwipToMm100 ( rVis.Left() );
+aVector.push_back(comphelper::makePropertyValue("VisibleLeft",
visibleLeft));
-aVector.push_back(comphelper::makePropertyValue("VisibleTop",
convertTwipToMm100 ( rVis.Top() )));
+auto visibleTop = convertTwipToMm100 ( rVis.Top() );
+aVector.push_back(comphelper::makePropertyValue("VisibleTop", visibleTop));
-aVector.push_back(comphelper::makePropertyValue("VisibleRight",
convertTwipToMm100 ( rVis.
