[Libreoffice-commits] core.git: chart2/source filter/source sc/source sd/source sw/source
chart2/source/controller/dialogs/res_DataLabel.cxx |2 +-
chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 +-
chart2/source/controller/dialogs/tp_LegendPosition.cxx |2 +-
chart2/source/controller/dialogs/tp_TitleRotation.cxx |2 +-
filter/source/msfilter/svdfppt.cxx |2 +-
sc/source/core/data/documen8.cxx |2 +-
sc/source/ui/drawfunc/drtxtob.cxx |2 +-
sc/source/ui/view/formatsh.cxx |2 +-
sd/source/filter/eppt/pptx-text.cxx|2 +-
sd/source/ui/func/futext.cxx |6 --
sw/source/ui/frmdlg/column.cxx |5 +++--
sw/source/ui/frmdlg/frmpage.cxx|8
12 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 8ee4530b90ca7c7967fad00f059236a2b0b57607
Author: Jochen Nitschke
Date: Mon Aug 14 15:37:34 2017 +0200
remove redundant SvxFrameDirection casts
and replace remaining C-style casts
Change-Id: Ie83e2706391c05946ab46dfd7d26059101579153
Reviewed-on: https://gerrit.libreoffice.org/41143
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index ea48698aadb1..74c4e786c1b0 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -357,7 +357,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
m_pLB_LabelPlacement->SetNoSelection();
if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::SET )
-m_pLB_TextDirection->SelectEntryValue(
SvxFrameDirection(static_cast(pPoolItem)->GetValue()) );
+m_pLB_TextDirection->SelectEntryValue( static_cast(pPoolItem)->GetValue() );
if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true, &pPoolItem ) ==
SfxItemState::SET )
{
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 56b8f28c4d89..0527e080c184 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -204,7 +204,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs
)
m_pOrientHlp->SetStackedState( TRISTATE_INDET );
if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::SET )
-m_pLbTextDirection->SelectEntryValue(
SvxFrameDirection(static_cast(pPoolItem)->GetValue()) );
+m_pLbTextDirection->SelectEntryValue( static_cast(pPoolItem)->GetValue() );
// Text overlap --
aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false,
&pPoolItem );
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 659ffcb645af..b36163dfda7c 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -74,7 +74,7 @@ void SchLegendPosTabPage::Reset(const SfxItemSet* rInAttrs)
const SfxPoolItem* pPoolItem = nullptr;
if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) ==
SfxItemState::SET )
-m_pLbTextDirection->SelectEntryValue(
SvxFrameDirection(static_cast(pPoolItem)->GetValue()) );
+m_pLbTextDirection->SelectEntryValue( static_cast(pPoolItem)->GetValue() );
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 9e966778871c..4ae20c5b07f6 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -113,7 +113,7 @@ void SchAlignmentTabPage::Reset(const SfxItemSet* rInAttrs)
m_pOrientHlp->SetStackedState( bStacked ? TRISTATE_TRUE : TRISTATE_FALSE );
if( rInAttrs->GetItemState(EE_PARA_WRITINGDIR, true, &pItem) ==
SfxItemState::SET)
-m_pLbTextDirection->SelectEntryValue(
SvxFrameDirection(static_cast(pItem)->GetValue())
);
+m_pLbTextDirection->SelectEntryValue( static_cast(pItem)->GetValue() );
}
} //namespace chart
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 889e44eefe3d..87b5b1284bdb 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7403,7 +7403,7 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference< XCell > const & xCel
//set textHorizontalAdjust and TextWritingMode attr
const sal_Int32 eHA(static_cast(pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
-const SvxFrameDirection eDirection =
(SvxFrameDirection)(static_cast(pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
+const SvxFrameDirection eDirection = static_cast(pOb
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/strings.hrc|1 +
sfx2/source/dialog/titledockwin.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit bebaac5eb6ebd2db3e1ea22b1630111343a9c25c
Author: Takeshi Abe
Date: Sun Aug 6 16:34:46 2017 +0900
tdf#100864 Assign a tooltip to the button to close pane
which appears at the top-right corner of both Impress's
Slide Pane and Draw's Page Pane.
Change-Id: Ida52ccc35e42546cd6260001e22335b04608034d
Reviewed-on: https://gerrit.libreoffice.org/40803
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index bf3a85569661..9f0b9657a729 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -255,6 +255,7 @@
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
+#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close
Pane")
#define STR_SFX_DOCKNC_("STR_SFX_DOCK", "Dock")
#define STR_SFX_UNDOCK NC_("STR_SFX_UNDOCK", "Undock")
diff --git a/sfx2/source/dialog/titledockwin.cxx
b/sfx2/source/dialog/titledockwin.cxx
index 8b43c8c23fb4..f7ba40f5311a 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -217,6 +217,7 @@ namespace sfx2
// Get the closer bitmap and set it as right most button.
BitmapEx aBitmapEx(SFX_BMP_CLOSE_DOC);
m_aToolbox->InsertItem(1, Image(aBitmapEx));
+m_aToolbox->SetQuickHelpText(1, SfxResId(STR_CLOSE_PANE));
m_aToolbox->ShowItem( 1 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Infra call on Tue, Aug 15 at 16:30 UTC
On Wed, 09 Aug 2017 at 23:09:26 +0200, Guilhem Moulin wrote: > The next infra call will take place at `date -d 'Tue Aug 15 16:30:00 UTC > 2017'` > (18:30:00 Berlin time). Reminder: that's tomorrow! > See https://pad.documentfoundation.org/p/infra for details; agenda TBA. Here is what we currently have in the pad: * Salt refactoring + Testing salt states with Docker can be difficult due to lack of init system/service manager. + Refactoring testing progress: https://infratools.documentfoundation.org/infra/salt/issues/3 + Deduplication is pretty much done. + Brett has been creating issues on gitlab's issue tracker: Should it be on redmine instead? + ufw vs shorewall: Which is supported? * Revive AOO-svn script * Migrations + gimli migrated to our infra (vm201) * Mail setup refactoring + https://redmine.documentfoundation.org/issues/2256 + https://redmine.documentfoundation.org/issues/2257 -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/prltempl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a19dc104ec008f0bb44676d63d4764c6d7442a0d Author: Tamás Zolnai Date: Mon Aug 14 22:33:13 2017 +0200 Related to tdf#109863: Crash when trying to modify background slide style Remove character highlighting tab from background style since there is no text content in the background. Change-Id: I5fcc3c76a3e60a37c3be72a14fa2f6668875bab6 Reviewed-on: https://gerrit.libreoffice.org/41154 Tested-by: Jenkins Reviewed-by: Tamás Zolnai diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index e2e428772fc8..2d0b88118800 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -207,6 +207,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell const * pDocSh, RemoveTabPage( "RID_SVXPAGE_TABULATOR"); RemoveTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH"); RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" ); +RemoveTabPage( "RID_SVXPAGE_BACKGROUND" ); } // set title and add corresponding pages to dialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sc/qa sc/source vcl/source
compilerplugins/clang/droplong.cxx|2 +-
sc/qa/unit/subsequent_export-test.cxx |2 +-
sc/source/filter/excel/xistream.cxx |2 +-
vcl/source/control/tabctrl.cxx|2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 882e9ff39f1a6a450fff3569d09124ab1b7ceae1
Author: Andrea Gelmini
Date: Mon Aug 14 22:21:06 2017 +0200
Fix typos
Change-Id: Ic95ec7c8a36ef5d19eac93b7eed8a7de2ec8904f
Reviewed-on: https://gerrit.libreoffice.org/41153
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/compilerplugins/clang/droplong.cxx
b/compilerplugins/clang/droplong.cxx
index 78129e78c323..553405bac480 100644
--- a/compilerplugins/clang/droplong.cxx
+++ b/compilerplugins/clang/droplong.cxx
@@ -17,7 +17,7 @@
#include "check.hxx"
/**
-The types 'long' and 'unsigned long' are different sizes on different
platforms, making them wholy unsuitable
+The types 'long' and 'unsigned long' are different sizes on different
platforms, making them wholly unsuitable
for portable code.
And when I mean different sizes, I mean 64bit Linux and 64bit Windows have
different sizes.
*/
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 467e3bb2ff23..882dc4faea68 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -545,7 +545,7 @@ void ScExportTest::testPivotExportXLSX()
// MS Excel is very sensitive for proper values of fields:
// containsMixedTypes, containsSemiMixedTypes, containsInteger,
containsBlank
// If it is not properly set, then Excel is not opening spreadsheet
properly.
-// This test case ensures, that such values are properly set according to
documentaion:
+// This test case ensures, that such values are properly set according to
documentation:
//
https://technet.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.shareditems.aspx
ScDocShellRef xShell = loadDoc("pivot.", FORMAT_XLSX);
diff --git a/sc/source/filter/excel/xistream.cxx
b/sc/source/filter/excel/xistream.cxx
index a3dbf8a0693a..0a4cf612f4a5 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -128,7 +128,7 @@ uno::Sequence< beans::NamedValue >
XclImpBiff5Decrypter::OnVerifyPassword( const
{
maEncryptionData.realloc( 0 );
-/* Convert password to a byte string. TODO: this needs some finetuning
+/* Convert password to a byte string. TODO: this needs some fine tuning
according to the spec... */
OString aBytePassword = OUStringToOString( rPassword,
osl_getThreadTextEncoding() );
sal_Int32 nLen = aBytePassword.getLength();
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index aa87d4800bd4..aa6775d03570 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2533,7 +2533,7 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
}
}
-// potition the shortcutbox
+// position the shortcutbox
m_pShortcuts->SetPosPixel(Point(0, 0));
// position the menu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/source/ui/dataprovider/dataprovider.cxx | 12
sc/source/ui/dataprovider/datatransformation.cxx | 36 +
sc/source/ui/dataprovider/datatransformation.hxx | 43 +++
sc/source/ui/dataprovider/htmldataprovider.cxx | 63 ++-
sc/source/ui/inc/dataprovider.hxx| 10 +++
6 files changed, 152 insertions(+), 13 deletions(-)
New commits:
commit b0080a8c69f1ff1fd19a0c735012a2037569b8f1
Author: Markus Mohrhard
Date: Mon Aug 14 16:46:40 2017 +0200
external data: add initial work for data transformations
Change-Id: I728ca764a2ea2926f8b8f76ea576b8be1091a29a
Reviewed-on: https://gerrit.libreoffice.org/41146
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 8df21d883a2b..849beeb3dad6 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -385,6 +385,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/condformat/colorformat \
sc/source/ui/dataprovider/csvdataprovider \
sc/source/ui/dataprovider/dataprovider \
+sc/source/ui/dataprovider/datatransformation \
sc/source/ui/dataprovider/htmldataprovider \
sc/source/ui/dbgui/asciiopt \
sc/source/ui/dbgui/consdlg \
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx
b/sc/source/ui/dataprovider/dataprovider.cxx
index 57893197fdc3..4efc255be20d 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -15,6 +15,7 @@
#include
#include "htmldataprovider.hxx"
+#include "datatransformation.hxx"
using namespace com::sun::star;
@@ -175,6 +176,12 @@ DataProvider::~DataProvider()
void ScDBDataManager::WriteToDoc(ScDocument& rDoc)
{
+// first apply all data transformations
+for (auto& itr : maDataTransformations)
+{
+itr->Transform(rDoc);
+}
+
bool bShrunk = false;
SCCOL nStartCol = 0;
SCROW nStartRow = 0;
@@ -215,6 +222,11 @@ void ScDBDataManager::SetDatabase(const OUString& rDBName)
maDBName = rDBName;
}
+void
ScDBDataManager::AddDataTransformation(std::unique_ptr
mpDataTransformation)
+{
+maDataTransformations.push_back(std::move(mpDataTransformation));
+}
+
ScDBData* ScDBDataManager::getDBData()
{
ScDBData* pDBData =
mpDoc->GetDBCollection()->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(maDBName));
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx
b/sc/source/ui/dataprovider/datatransformation.cxx
new file mode 100644
index ..5c581782e220
--- /dev/null
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -0,0 +1,36 @@
+/* -*- 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 "datatransformation.hxx"
+
+#include "document.hxx"
+
+namespace sc {
+
+DataTransformation::~DataTransformation()
+{
+}
+
+ColumnRemoveTransformation::ColumnRemoveTransformation(SCCOL nCol):
+mnCol(nCol)
+{
+}
+
+ColumnRemoveTransformation::~ColumnRemoveTransformation()
+{
+}
+
+void ColumnRemoveTransformation::Transform(ScDocument& rDoc)
+{
+rDoc.DeleteCol(0, 0, MAXROW, 0, mnCol, 1);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dataprovider/datatransformation.hxx
b/sc/source/ui/dataprovider/datatransformation.hxx
new file mode 100644
index ..cbe181aa921d
--- /dev/null
+++ b/sc/source/ui/dataprovider/datatransformation.hxx
@@ -0,0 +1,43 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_SC_SOURCE_UI_DATAPROVIDER_DATATRANSFORMATION_HXX
+#define INCLUDED_SC_SOURCE_UI_DATAPROVIDER_DATATRANSFORMATION_HXX
+
+#include
+
+class ScDocument;
+
+namespace sc {
+
+class DataTransformation
+{
+public:
+virtual ~DataTransformation();
+
+virtual void Transform(ScDocument& rDoc) = 0;
+};
+
+class ColumnRemoveTransformation : public DataTransformation
+{
+SCCOL mnCol;
+
+public:
+
+ColumnRemoveTransformation(SCCOL nCol);
+virtual ~ColumnRemoveTransformation() override;
+
+virtual void Transform(ScDocument& rDoc) override;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dataprovider.hxx
b/sc/source/ui/inc/dataprovider.hxx
index c45adc9616a1..bd5561e382c8 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/data
[Libreoffice-commits] core.git: include/vcl sfx2/source vcl/source
include/vcl/tabctrl.hxx |3
sfx2/source/notebookbar/NotebookbarTabControl.cxx |3
vcl/source/control/tabctrl.cxx| 108 +-
3 files changed, 54 insertions(+), 60 deletions(-)
New commits:
commit 16b3a46ce0c94f7dfba8d391dd48ee82ba0f1d0f
Author: Gökhan GurbetoÄlu
Date: Mon Jul 3 19:07:21 2017 +0300
Creating a button for the hamburger menu
Things done in this commit:
- Created a hamburger menu button on the right.
- Moved the opening menu to match the new hamburger button.
- Added 1 pixel at the end of shortcut toolbox so no overlapping with
the tabs would occur.
Change-Id: I3d05eec72e260575563e4d016945af0777541cfb
Reviewed-on: https://gerrit.libreoffice.org/38450
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 0e195f10890d..4b48874ab40e 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -221,6 +222,8 @@ private:
Link m_aIconClickHdl;
static sal_uInt16 m_nHeaderHeight;
VclPtr m_pShortcuts;
+VclPtr m_pOpenMenu;
+DECL_LINK(OpenMenu, Button*, void);
};
#endif // INCLUDED_VCL_TABCTRL_HXX
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index bd6c147b87c5..87c05ae9179c 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -130,6 +130,7 @@ public:
NotebookbarTabControl::NotebookbarTabControl( Window* pParent )
: NotebookbarTabControlBase( pParent )
+, m_pListener( nullptr )
, m_bInitialized( false )
, m_bInvalidate( true )
{
@@ -255,7 +256,7 @@ IMPL_LINK(NotebookbarTabControl, OpenNotebookbarPopupMenu,
NotebookBar*, pNotebo
xPopupController->setPopupMenu(xPopupMenu);
VCLXMenu* pAwtMenu = VCLXMenu::GetImplementation(xPopupMenu);
PopupMenu* pVCLMenu = static_cast(pAwtMenu->GetMenu());
-Point aPos(0, NotebookbarTabControl::GetHeaderHeight());
+Point aPos(pNotebookbar->GetSizePixel().getWidth(),
NotebookbarTabControl::GetHeaderHeight() - ICON_SIZE + 10);
pVCLMenu->Execute(pNotebookbar, tools::Rectangle(aPos,
aPos),PopupMenuFlags::ExecuteDown|PopupMenuFlags::NoMouseUpClose);
Reference xComponent(xPopupController,
UNO_QUERY);
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 746c6c0acc4e..aa87d4800bd4 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -50,7 +50,7 @@ struct ImplTabItem
OUStringmaHelpText;
OString maHelpId;
OString maTabName;
-tools::Rectangle maRect;
+tools::RectanglemaRect;
sal_uInt16 mnLine;
boolmbFullVisible;
boolmbEnabled;
@@ -73,6 +73,7 @@ struct ImplTabCtrlData
// for the Tab positions
#define TAB_PAGERECT0x
+#define HAMBURGER_DIM 28
void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
@@ -1179,7 +1180,7 @@ void TabControl::ImplPaint(vcl::RenderContext&
rRenderContext, const tools::Rect
ImplTabItem* pLastTab = nullptr;
size_t idx;
-// Event though there is a tab overlap with GTK+, the first tab is not
+// Even though there is a tab overlap with GTK+, the first tab is not
// overlapped on the left side. Other toolkits ignore this option.
if (bDrawTabsRTL)
{
@@ -2201,14 +2202,23 @@ FactoryFunction TabControl::GetUITestFactory() const
sal_uInt16 NotebookbarTabControlBase::m_nHeaderHeight = 0;
+IMPL_LINK_NOARG(NotebookbarTabControlBase, OpenMenu, Button*, void)
+{
+m_aIconClickHdl.Call(static_cast(GetParent()->GetParent()));
+}
+
NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent)
: TabControl(pParent, WB_STDTABCONTROL)
, bLastContextWasSupported(true)
, eLastContext(vcl::EnumContext::Context::Any)
{
BitmapEx aBitmap(SV_RESID_BITMAP_NOTEBOOKBAR);
-InsertPage(1, "");
-SetPageImage(1, Image(aBitmap));
+
+m_pOpenMenu = VclPtr::Create(this);
+m_pOpenMenu->SetSizePixel(Size(HAMBURGER_DIM, HAMBURGER_DIM));
+m_pOpenMenu->SetClickHdl(LINK(this, NotebookbarTabControlBase, OpenMenu));
+m_pOpenMenu->SetModeImage(Image(aBitmap));
+m_pOpenMenu->Show();
}
NotebookbarTabControlBase::~NotebookbarTabControlBase()
@@ -2258,6 +2268,7 @@ void NotebookbarTabControlBase::SetContext(
vcl::EnumContext::Context eContext )
void NotebookbarTabControlBase::dispose()
{
m_pShortcuts.disposeAndClear();
+m_pOpenMenu.disposeAndClear();
TabControl::dispose();
}
@@ -2285,22 +2296,14 @@ sal_uInt16 NotebookbarTabControlBase::GetPageId( const
Point& rPos ) const
void NotebookbarTabControlBase::SelectTabPag
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - loleaflet/src
loleaflet/src/map/handler/Map.WOPI.js |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit dd604fea10cb2dc126e0e8b6ebd7bf14babdaf7c
Author: Pranav Kant
Date: Mon Aug 14 17:42:07 2017 +0530
loleaflet: Handle Close_Session even if document is not loaded
Now the Close_Session Post message command can be used to close the
documents while it is loading.
Change-Id: If60391834fedc90b3dcb63848aa72503eb43888d
(cherry picked from commit 1a9d5c2cccaec2c845af012b2dea3dab89b5241e)
Reviewed-on: https://gerrit.libreoffice.org/41139
Reviewed-by: Ashod Nakashian
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index 70efcea4..3b3f31e2 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -109,6 +109,12 @@ L.Map.WOPI = L.Handler.extend({
return;
}
+ // allow closing documents before they are completely loaded
+ if (msg.MessageId === 'Close_Session') {
+ this._map._socket.sendMessage('closedocument');
+ return;
+ }
+
// For all other messages, warn if trying to interact before we
are completely loaded
if (!this._appLoaded) {
console.error('LibreOffice Online not loaded yet.
Listen for App_LoadingStatus (Document_Loaded) event before using PostMessage
API. Ignoring post message \'' + msg.MessageId + '\'.');
@@ -170,9 +176,6 @@ L.Map.WOPI = L.Handler.extend({
this._postMessage({msgId: 'Get_Views_Resp', args:
getMembersRespVal});
}
- else if (msg.MessageId === 'Close_Session') {
- this._map._socket.sendMessage('closedocument');
- }
else if (msg.MessageId === 'Action_Save') {
var dontTerminateEdit = msg.Values &&
msg.Values['DontTerminateEdit'];
var dontSaveIfUnmodified = msg.Values &&
msg.Values['DontSaveIfUnmodified'];
___
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' - loleaflet/src
loleaflet/src/map/handler/Map.WOPI.js | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f7e5b5f2e8eca1a857c1b0e0e361253c7334b717
Author: Pranav Kant
Date: Tue Jun 20 17:12:43 2017 +0530
Warn users if they try to use post message API incorrectly
Change-Id: I09ce1a14587f558765e02fc8197030f4a5d2cee0
(cherry picked from commit 2abf2421f3e984693b114e8597d2e88fd1430ba8)
Reviewed-on: https://gerrit.libreoffice.org/41138
Reviewed-by: Ashod Nakashian
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index b13bff44..70efcea4 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -104,6 +104,17 @@ L.Map.WOPI = L.Handler.extend({
}
var msg = JSON.parse(e.data);
+ if (msg.MessageId === 'Host_PostmessageReady') {
+ // We already have a listener for this in
loleaflet.html, so ignore it here
+ return;
+ }
+
+ // For all other messages, warn if trying to interact before we
are completely loaded
+ if (!this._appLoaded) {
+ console.error('LibreOffice Online not loaded yet.
Listen for App_LoadingStatus (Document_Loaded) event before using PostMessage
API. Ignoring post message \'' + msg.MessageId + '\'.');
+ return;
+ }
+
if (msg.MessageId === 'Insert_Button') {
if (msg.Values) {
if (msg.Values.id &&
!w2ui['toolbar-up'].get(msg.Values.id)
___
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' - kit/ChildSession.cpp wsd/DocumentBroker.cpp
kit/ChildSession.cpp |7 ---
wsd/DocumentBroker.cpp |6 ++
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit e6fd8fcc0ac33c5fe874e0a812eb5fda34982a2e
Author: Pranav Kant
Date: Fri Aug 11 23:10:34 2017 +0530
wsd: Ignore useractive, userinactive when doc is not loaded
Sometimes client sends a userinactive message while the document is
already being loaded, which leads to the kit process skipping sending
the result of LOK callbacks to the client.
Handling this in child session is futile in the case when userinactive
message is sent when the document is being loaded, since kit process
handles the 'userinactive' message only after document is loaded (i.e
isLoaded() returns true). Moving this handling to DocumentBroker will
take care of both the cases - when 'userinactive' is sent before load
starts, and during load of the document.
Change-Id: I4ea3ac7b184d2ca373eb3ff4fb7b4ae394d454df
(cherry picked from commit ef54b6ea167471ba5dc50947bc071a4c5f58c43f)
Reviewed-on: https://gerrit.libreoffice.org/41059
Reviewed-by: Ashod Nakashian
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 4fd77800..7ad0cdd0 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -183,13 +183,6 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
}
else if (!_isDocLoaded)
{
-// Be forgiving to these messages while we load.
-if (tokens[0] == "useractive" ||
-tokens[0] == "userinactive")
-{
-return true;
-}
-
sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded");
return false;
}
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 818ecfb1..84e7441c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1255,6 +1255,12 @@ bool DocumentBroker::forwardToChild(const std::string&
viewId, const std::string
{
assertCorrectThread();
+// Ignore userinactive, useractive message until document is loaded
+if (!isLoaded() && (message == "userinactive" || message == "useractive"))
+{
+return true;
+}
+
LOG_TRC("Forwarding payload to child [" << viewId << "]: " << message);
std::string msg = "child-" + viewId + ' ' + message;
___
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' - loleaflet/src
loleaflet/src/map/Map.js |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 23a4a887f2ce1102d802837851efd85c1fd9d9d9
Author: Pranav Kant
Date: Fri Aug 11 22:32:34 2017 +0530
loleaflet: activate the inactivity timer after document load
The timer is cancelled right after 'statusindicator' is received, so a
document never really go to inactive mode after set inactivity time
period (unless user refocuses the document). Call _activate() to ensure
that timer is started after document is completely loaded.
Also timer shouldn't really start when the document is not yet loaded.
Change-Id: I58f5d7718c65cc37da9c3feb99ee6b16741a22a2
(cherry picked from commit 8c74d4a38d0fc13e859ea0e936fca0102a0e9d0d)
Reviewed-on: https://gerrit.libreoffice.org/41058
Reviewed-by: Ashod Nakashian
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 5d6f08a2..3d80e4ba 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -152,14 +152,16 @@ L.Map = L.Evented.extend({
}, this);
this.on('docloaded', function(e) {
- if (e.status) {
+ this._docLoaded = e.status;
+ if (this._docLoaded) {
// so that dim timer starts from now()
this.lastActiveTime = Date.now();
if (!document.hasFocus()) {
this._deactivate();
+ } else {
+ this._activate();
}
}
- this._docLoaded = e.status;
}, this);
},
@@ -906,7 +908,7 @@ L.Map = L.Evented.extend({
},
_startInactiveTimer: function () {
- if (this._serverRecycling || this._documentIdle) {
+ if (this._serverRecycling || this._documentIdle ||
!this._docLoaded) {
return;
}
___
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' - loleaflet/src
loleaflet/src/core/Socket.js | 109 ++
loleaflet/src/map/Map.js | 19 +
loleaflet/src/map/handler/Map.WOPI.js | 12 ++-
3 files changed, 84 insertions(+), 56 deletions(-)
New commits:
commit e952a0a6ed8814849e1cf084025966093a0a77ea
Author: Pranav Kant
Date: Fri Aug 11 21:39:12 2017 +0530
loleaflet: new event, docloaded, to sync. various things
First, use the docloaded event to see whether we should be dimming the
document (make it inactive) or not. There is no point in inactivating a
document before document has completely loaded; so don't start the timer
until after the document is completely loaded.
It turns out that we were only emitting the WOPI's App_LoadingStatus
with DocumentLoaded for the first document load, but not for subsequent
reconnections. The problem here was that doclayerinit event is only
emitted during first document load (when TileLayer is -actually-
initialized), which was responsible for emitting this event. By
bifurcating the document load from document layer initialization, we
solve this problem.
Change-Id: I0b7b97fc6244ba9ebd6318d68d78d3abef2c0c08
(cherry picked from commit d0be89bffa339e6cefc88cd3ca56ccd86ec1f517)
Reviewed-on: https://gerrit.libreoffice.org/41057
Reviewed-by: Ashod Nakashian
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9843d6e7..e37473be 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -62,6 +62,9 @@ L.Socket = L.Class.extend({
this.socket.onmessage = function () {};
this.socket.close();
+ // Reset wopi's app loaded so that reconnecting again informs
outerframe about initialization
+ this._map['wopi'].resetAppLoaded();
+ this._map.fire('docloaded', {status: false});
clearTimeout(this._accessTokenExpireTimeout);
},
@@ -509,59 +512,64 @@ L.Socket = L.Class.extend({
var img = 'data:image/png;base64,' +
window.btoa(strBytes);
}
- if (textMsg.startsWith('status:') && !this._map._docLayer) {
- // first status message, we need to create the document
layer
- var tileWidthTwips = this._map.options.tileWidthTwips;
- var tileHeightTwips = this._map.options.tileHeightTwips;
- if (this._map.options.zoom !==
this._map.options.defaultZoom) {
- var scale =
this._map.options.crs.scale(this._map.options.defaultZoom -
this._map.options.zoom);
- tileWidthTwips = Math.round(tileWidthTwips *
scale);
- tileHeightTwips = Math.round(tileHeightTwips *
scale);
- }
+ if (textMsg.startsWith('status:')) {
+ if (!this._map._docLayer) {
+ // first status message, we need to create the
document layer
+ var tileWidthTwips =
this._map.options.tileWidthTwips;
+ var tileHeightTwips =
this._map.options.tileHeightTwips;
+ if (this._map.options.zoom !==
this._map.options.defaultZoom) {
+ var scale =
this._map.options.crs.scale(this._map.options.defaultZoom -
this._map.options.zoom);
+ tileWidthTwips =
Math.round(tileWidthTwips * scale);
+ tileHeightTwips =
Math.round(tileHeightTwips * scale);
+ }
- var docLayer = null;
- if (command.type === 'text') {
- docLayer = new L.WriterTileLayer('', {
- permission:
this._map.options.permission,
- tileWidthTwips: tileWidthTwips,
- tileHeightTwips: tileHeightTwips,
- docType: command.type
- });
- }
- else if (command.type === 'spreadsheet') {
- docLayer = new L.CalcTileLayer('', {
- permission:
this._map.options.permission,
- tileWidthTwips: tileWidthTwips,
- tileHeightTwips: tileHeightTwips,
- docType: command.type
- });
- }
- else {
- if (command.type === 'presentation' &&
- this._map.options.defaultZoom
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/handler/Map.WOPI.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8537d4372fad988137bd3be2fa696c274008f3de
Author: Pranav Kant
Date: Mon Aug 14 19:51:43 2017 +0530
Reset the flag when doc unloads
Though no harm as of now because we are calling resetAppLoaded whenever
we are emitting 'docloaded' with false status at the caller site, better
safe than sorry for future.
Change-Id: Id6d86ca2ae01a6eb32c8120df435d0535d906938
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index 47a39dc3..f434c433 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -84,7 +84,10 @@ L.Map.WOPI = L.Handler.extend({
if (e.type === 'docloaded') {
// doc unloaded
if (!e.status)
+ {
+ this._appLoadedConditions[e.type] = false;
return;
+ }
this.DocumentLoadedTime = Date.now();
}
___
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-2-1' - loolwsd.spec.in
loolwsd.spec.in | 63 +---
1 file changed, 42 insertions(+), 21 deletions(-)
New commits:
commit a0dc3b13d679d6219cf50f860645572685fb2449
Author: Andras Timar
Date: Fri Aug 11 07:09:25 2017 +0200
SLES11SP4 packaging bits
Change-Id: If245e4dd16cbde4d061c9a3143c50f7c65cf2b2b
Reviewed-on: https://gerrit.libreoffice.org/41001
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 0fdf0382..ed120148 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -13,17 +13,29 @@ Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
Release:3%{?dist}
+%if 0%{?suse_version} == 1110
+Group: Productivity/Office/Suite
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%endif
Vendor: Collabora
Summary:LibreOffice On-Line WebSocket Daemon
License:MPL
Source0:loolwsd-@package_vers...@.tar.gz
BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5
-%if 0%{?fedora} || 0%{?rhel} >= 7
+
+# Red Hat and CentOS
+%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libpcap
-%else
-%if 0%{?suse_version}
+%endif
+
+# openSUSE and SLES12
+%if 0%{?suse_version} >= 1300
BuildRequires: libcap-progs systemd-rpm-macros
%endif
+
+# SLES11SP4
+%if 0%{?suse_version} == 1110
+BuildRequires: libcap-progs
%endif
Requires: collaboraoffice5.3 >= 5.3.10.22 collaboraoffice5.3-ure >=
5.3.10.22 collaboraofficebasis5.3-core >= 5.3.10.22
collaboraofficebasis5.3-writer >= 5.3.10.22 collaboraofficebasis5.3-impress >=
5.3.10.22 collaboraofficebasis5.3-graphicfilter >= 5.3.10.22
collaboraofficebasis5.3-en-US >= 5.3.10.22 collaboraofficebasis5.3-calc >=
5.3.10.22 collaboraofficebasis5.3-en-US-res >= 5.3.10.22
collaboraofficebasis5.3-en-US-calc >= 5.3.10.22
collaboraofficebasis5.3-ooofonts >= 5.3.10.22 collaboraofficebasis5.3-images >=
5.3.10.22 collaboraofficebasis5.3-noto-fonts >= 5.3.10.22
collaboraofficebasis5.3-draw >= 5.3.10.22
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.22
@@ -42,17 +54,27 @@ Requires: expat keyutils-libs krb5-libs libattr
libcap libcom_err libgcc l
Requires: poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >=
1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >=
1.7.5
# Collabora Office dependencies (unfortunately Collabora Office RPM packages
do not have real dependencies)
Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib
dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2
gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM
libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext
libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm
mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
-%else
+%endif
+
%if 0%{?suse_version}
# loolwsd dependencies
-Requires: systemd
Requires(post): libcap-progs
-Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1
%{?systemd_requires} %{fillup_prereq}
+Requires: libcap2 libpng12-0 %{fillup_prereq}
Requires: libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
+%endif
+
+%if 0%{?suse_version} >= 1300
+Requires: systemd
+Requires: libopenssl1_0_0 libpcre1 libz1
# Collabora Office dependencies (unfortunately Collabora Office RPM packages
do not have real dependencies)
-# /opt/collaboraoffice5.3/program # for i in soffice.bin *.so ;do ldd $i |
grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs
rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
+# cd /opt/collaboraoffice5.3/program ; for i in soffice.bin *.so ;do ldd $i |
grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs
rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
+
+# SLES11SP4
+%if 0%{?suse_version} == 1110
+Requires: libattr libopenssl0_9_8 pcre zlib
+Requires: cairo cups-libs dbus-1 dbus-1-glib fontconfig freetype2 glibc
keyutils-libs krb5 libcom_err
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui |1 - filter/uiconfig/ui/pdfsecuritypage.ui |1 - filter/uiconfig/ui/pdfuserinterfacepage.ui |1 - filter/uiconfig/ui/pdfviewpage.ui |1 - 4 files changed, 4 deletions(-) New commits: commit 2aa1c7d95ee35c39498ca8a62e8cd7f50941c07b Author: Adolfo Jayme Barrientos Date: Wed Oct 28 01:09:27 2015 -0600 tdf#95178 Homogeneous columns are a huge waste of space This becomes a problem in other languages, such as German and Spanish, which have longer strings. A downside of this patch is that the options no longer look aligned when you switch tabs. Change-Id: Iffb49d5411cc655bd16b78a9470da7dc661077ca (cherry picked from commit 5f3baf45723a11987c0a0ddaa1ca1cebafcccde3) Reviewed-on: https://gerrit.libreoffice.org/41072 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 67612f59c197..1fb662225479 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -14,7 +14,6 @@ False 6 12 -True True diff --git a/filter/uiconfig/ui/pdfsecuritypage.ui b/filter/uiconfig/ui/pdfsecuritypage.ui index 6d2658dbbe9a..8d1b7319efc3 100644 --- a/filter/uiconfig/ui/pdfsecuritypage.ui +++ b/filter/uiconfig/ui/pdfsecuritypage.ui @@ -7,7 +7,6 @@ False 6 12 -True True diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui b/filter/uiconfig/ui/pdfuserinterfacepage.ui index ab359c815277..46af8d2de2f9 100644 --- a/filter/uiconfig/ui/pdfuserinterfacepage.ui +++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui @@ -21,7 +21,6 @@ False 12 12 -True True diff --git a/filter/uiconfig/ui/pdfviewpage.ui b/filter/uiconfig/ui/pdfviewpage.ui index 4640de4438aa..9b7016b54e70 100644 --- a/filter/uiconfig/ui/pdfviewpage.ui +++ b/filter/uiconfig/ui/pdfviewpage.ui @@ -21,7 +21,6 @@ False 6 12 -True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/source
cui/source/customize/SvxToolbarConfigPage.cxx | 14 ++
cui/source/inc/SvxToolbarConfigPage.hxx |2 ++
2 files changed, 16 insertions(+)
New commits:
commit 66e13a9b6ba020c8821e26eeefa9dbee81598f6b
Author: Muhammet Kara
Date: Sun Aug 13 07:36:46 2017 +0300
Initialize and update command categories and functions for the Toolbar tab
Change-Id: I27a12fc9e337796fc153e1d243eeba37564ef5c1
Reviewed-on: https://gerrit.libreoffice.org/41104
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index e6d52476c330..51f7d0485ae4 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -125,6 +125,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window
*pParent, const SfxItemSe
LINK( this, SvxToolbarConfigPage, SelectToolbar ) );
m_pContentsListBox->SetSelectHdl(
LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) );
+m_pCommandCategoryListBox->SetSelectHdl(
+LINK( this, SvxToolbarConfigPage, SelectCategory ) );
m_pMoveUpButton->SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl)
);
m_pMoveDownButton->SetClickHdl ( LINK( this, SvxToolbarConfigPage,
MoveHdl) );
@@ -291,6 +293,12 @@ void SvxToolbarConfigPage::Init()
m_pTopLevelListBox->SelectEntryPos(nPos);
m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
+
+m_pCommandCategoryListBox->Init(
+comphelper::getProcessComponentContext(),
+m_xFrame,
+vcl::CommandInfoProvider::GetModuleIdentifier(m_xFrame));
+m_pCommandCategoryListBox->categorySelected( m_pFunctions );
}
SaveInData* SvxToolbarConfigPage::CreateSaveInData(
@@ -308,6 +316,12 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbarEntry,
SvTreeListBox *, void
UpdateButtonStates();
}
+IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectCategory, ListBox&, void )
+{
+m_pCommandCategoryListBox->categorySelected( m_pFunctions );
+}
+
+
void SvxToolbarConfigPage::UpdateButtonStates()
{
m_pDescriptionField->SetText("");
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx
b/cui/source/inc/SvxToolbarConfigPage.hxx
index 02a23979865e..21d63fbe81ff 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -56,6 +56,8 @@ private:
DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void );
DECL_LINK( MoveHdl, Button *, void );
+DECL_LINK( SelectCategory, ListBox&, void );
+
voidUpdateButtonStates() override;
short QueryReset() override;
voidInit() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: onlineupdate/Executable_update_service.mk
onlineupdate/Executable_update_service.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ba7aea158e201441a134e30e323323e7ef145e8 Author: Markus Mohrhard Date: Mon Aug 14 14:39:40 2017 +0200 updater: reference the correct new static library name Change-Id: Ib5920b27429f8414db761387645713498a60904f Reviewed-on: https://gerrit.libreoffice.org/41142 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 73adc82bd65f..1ce5c9fb3efd 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Executable_set_include,update_service,\ $(eval $(call gb_Executable_use_static_libraries,update_service,\ updatehelper \ - winhelper \ + windows_process \ )) $(eval $(call gb_Executable_add_libs,update_service,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sw-delete-undo-rework' - 2 commits - sw/source
Rebased ref, commits from common ancestor:
commit eccc5c200ae1c56f823038ca284068ada49adda5
Author: Rosemary Sebastian
Date: Mon Aug 14 16:25:03 2017 +0530
Do not continue grouping if the Track Changes mode has changed
Change-Id: I8331c11fd7ce3b7b464a57a5710e9f4ee0cfb4fb
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 95842c89c49f..005a54e5a4fb 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3602,7 +3602,7 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
SwUndoDelete * const pUndoDel( dynamic_cast< SwUndoDelete*
>( pLastUndo ) );
if( pUndoDel )
{
-bMerged = pUndoDel->CanGrouping( &m_rDoc, rPam );
+bMerged = pUndoDel->CanGrouping( &m_rDoc, rPam,
bRedlineDelete );
// if CanGrouping() returns true it's already merged
}
}
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index ac22b3217a1e..fc934aa702ad 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -88,7 +88,7 @@ public:
*/
virtual SwRewriter GetRewriter() const override;
-bool CanGrouping( SwDoc*, const SwPaM& );
+bool CanGrouping( SwDoc*, const SwPaM&, bool bRedlineDelete = false );
void SetTableDelLastNd() { m_bTableDelLastNd = true; }
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 9e82c2541e88..0e9681af5b6d 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -444,8 +444,12 @@ bool SwUndoDelete::SaveContent( const SwPosition* pStt,
const SwPosition* pEnd,
return true;// move Nodes lying in between
}
-bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
+bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam, bool
bRedlineDelete )
{
+// Make sure the Track Changes mode is the same
+if( m_bRedlineDelete != bRedlineDelete )
+return false;
+
// Is Undo greater than one Node (that is Start and EndString)?
if( !m_pSttStr || m_pSttStr->isEmpty() || m_pEndStr )
return false;
commit b2fa5f3f5ee68a0aa2225d7b5aa80ccef2cb70ac
Author: Rosemary Sebastian
Date: Mon Jul 17 16:31:36 2017 +0530
tdf#109151: Enable grouping of undo actions for delete redlines
Change-Id: I74183e5df58d8d0c5e892182f545a5ff17eb7936
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index df6455ed33bc..95842c89c49f 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3552,54 +3552,71 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
OSL_ENSURE( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn(),
"DeleteAndJoinWithRedline: redline off" );
{
-SwUndoRedlineDelete* pUndo = nullptr;
+SwUndo *const pLastUndo( m_rDoc.GetUndoManager().GetLastUndo() );
RedlineFlags eOld =
m_rDoc.getIDocumentRedlineAccess().GetRedlineFlags();
m_rDoc.GetDocumentRedlineManager().checkRedlining( eOld );
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
-
/* please don't translate -- for cultural reasons this comment is
protected
until the redline implementation is finally fixed some day */
//JP 06.01.98: MUSS noch optimiert werden!!!
+
+m_rDoc.GetIDocumentUndoRedo().ClearRedo();
m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::On | RedlineFlags::ShowInsert |
RedlineFlags::ShowDelete );
+bool bAppendUndo(true);
+bool bRedlineDelete(true);
-pUndo = new SwUndoRedlineDelete( rPam, SwUndoId::DELETE );
-const SwRewriter aRewriter = pUndo->GetRewriter();
-m_rDoc.GetIDocumentUndoRedo().StartUndo( SwUndoId::DELETE,
&aRewriter );
-m_rDoc.GetIDocumentUndoRedo().AppendUndo( pUndo );
-}
-
-if ( *rPam.GetPoint() != *rPam.GetMark() )
-m_rDoc.getIDocumentRedlineAccess().AppendRedline( new
SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, rPam ), true );
-m_rDoc.getIDocumentState().SetModified();
+const SwPosition* pStt = rPam.Start();
+const SwPosition* pEnd = rPam.End();
+const SwRedlineTable& rTable =
rPam.GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+SwRedlineTable::size_type n = 0;
+/* Check whether the delete redline falls inside an existing
redline
+ We don't have to add an undo action if the redline lies inside
an exi
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/parallelism.cxx | 34 ++
1 file changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 1a4cb299def3e98dc4968c82b5c9ed12717061fc
Author: Tor Lillqvist
Date: Mon Aug 14 15:32:23 2017 +0300
Fix testVLOOKUP to actually use formula groups
Change-Id: I3e2b626731a3508d1c4cd8abbe6de1660dbef11f
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index f7d70f6b5e1f..5876c83e9b91 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -198,9 +198,11 @@ void ScParallelismTest::testVLOOKUP()
{
m_pDoc->InsertTab(0, "1");
-for (auto i = 1; i < 1000; i++)
+for (auto i = 1; i < 2000; i++)
{
-if (i%5)
+if (i == 1042)
+m_pDoc->SetValue(0, i, 0, 1042.42);
+else if (i%5)
m_pDoc->SetValue(0, i, 0, i);
else
m_pDoc->SetValue(0, i, 0, i+0.1);
@@ -210,29 +212,35 @@ void ScParallelismTest::testVLOOKUP()
else
m_pDoc->SetString(1, i, 0, "N" + OUString::number(i*10));
-if (i%3)
+if (i < 1000)
{
m_pDoc->SetFormula(ScAddress(2, i, 0),
"=VLOOKUP(" + OUString::number(i) + "; "
- "A$2:B$1000; 2; 0)",
+ "A$2:B$2000; 2; 0)",
formula::FormulaGrammar::GRAM_NATIVE_UI);
}
else
{
-m_pDoc->SetFormula(ScAddress(2, i, 0),
- "=VLOOKUP(42.42; "
- "A$2:B$1000; 2; 0)",
- formula::FormulaGrammar::GRAM_NATIVE_UI);
+if (i == 1042)
+m_pDoc->SetFormula(ScAddress(2, i, 0),
+ "=VLOOKUP(1042.42; "
+ "A$2:B$2000; 2; 0)",
+ formula::FormulaGrammar::GRAM_NATIVE_UI);
+else
+m_pDoc->SetFormula(ScAddress(2, i, 0),
+ "=VLOOKUP(1.234; "
+ "A$2:B$2000; 2; 0)",
+ formula::FormulaGrammar::GRAM_NATIVE_UI);
}
}
m_xDocShell->DoHardRecalc();
-for (auto i = 1; i < 1000; i++)
+for (auto i = 1; i < 2000; i++)
{
OString sMessage = "At row " + OString::number(i+1);
-if (i%3)
+if (i < 1000)
{
if (i%5)
{
@@ -249,8 +257,10 @@ void ScParallelismTest::testVLOOKUP()
}
else
{
-// The 42.42 is never found
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), OUString("#N/A"),
m_pDoc->GetString(2, i, 0));
+if (i == 1042)
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), OUString("N" +
OUString::number(i*10)), m_pDoc->GetString(2, i, 0));
+else
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(),
OUString("#N/A"), m_pDoc->GetString(2, i, 0));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/source
sd/source/ui/dlg/prltempl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 798d9e301d520b2a94cf0cf125ffa96e226e78b0 Author: Tamás Zolnai Date: Mon Aug 14 06:36:34 2017 +0200 tdf#109863: Crash while trying to set pattern fill in Impress This line was missed to add in this commit: 76585ae33f3ca75c05c0ccbf6a621b6e2d42bc00 Change-Id: I2fb8c90b34ecbdfdd2bdc62adaa5e0a0d074ce33 Reviewed-on: https://gerrit.libreoffice.org/41129 Tested-by: Jenkins Reviewed-by: Tamás Zolnai (cherry picked from commit e980d98dea38e71379f3ec02ab03fbff15022e5c) Reviewed-on: https://gerrit.libreoffice.org/41131 Reviewed-by: Katarina Behrens diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 7c254907be91..0e28ee5e9ab5 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -243,6 +243,7 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); +aSet.Put (SvxPatternListItem(pPatternList,SID_PATTERN_LIST)); aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source
sd/source/ui/dlg/prltempl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 86ce5b2a9e50305f261882079465861319dbbd8f Author: Tamás Zolnai Date: Mon Aug 14 06:36:34 2017 +0200 tdf#109863: Crash while trying to set pattern fill in Impress This line was missed to add in this commit: 76585ae33f3ca75c05c0ccbf6a621b6e2d42bc00 Change-Id: I2fb8c90b34ecbdfdd2bdc62adaa5e0a0d074ce33 Reviewed-on: https://gerrit.libreoffice.org/41129 Tested-by: Jenkins Reviewed-by: Tamás Zolnai (cherry picked from commit e980d98dea38e71379f3ec02ab03fbff15022e5c) Reviewed-on: https://gerrit.libreoffice.org/41132 Reviewed-by: Katarina Behrens diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 3573b27bd929..ea873f8e802e 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -244,6 +244,7 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); +aSet.Put (SvxPatternListItem(pPatternList,SID_PATTERN_LIST)); aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/parallelism.cxx | 65 +
1 file changed, 65 insertions(+)
New commits:
commit 872c130afbf314478c35c868ed24a2449489838b
Author: Tor Lillqvist
Date: Mon Aug 14 13:04:53 2017 +0300
Test VLOOKUP, try to handle various special cases and errors
Change-Id: I0ea9b9d882bf95c81ad784537671e22cb48d8c65
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 0f4ccaad5e01..f7d70f6b5e1f 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -45,10 +45,12 @@ public:
void testSUMIFS();
void testDivision();
+void testVLOOKUP();
CPPUNIT_TEST_SUITE(ScParallelismTest);
CPPUNIT_TEST(testSUMIFS);
CPPUNIT_TEST(testDivision);
+CPPUNIT_TEST(testVLOOKUP);
CPPUNIT_TEST_SUITE_END();
private:
@@ -192,6 +194,69 @@ void ScParallelismTest::testDivision()
m_pDoc->DeleteTab(0);
}
+void ScParallelismTest::testVLOOKUP()
+{
+m_pDoc->InsertTab(0, "1");
+
+for (auto i = 1; i < 1000; i++)
+{
+if (i%5)
+m_pDoc->SetValue(0, i, 0, i);
+else
+m_pDoc->SetValue(0, i, 0, i+0.1);
+
+if (i%2)
+m_pDoc->SetValue(1, i, 0, i*10);
+else
+m_pDoc->SetString(1, i, 0, "N" + OUString::number(i*10));
+
+if (i%3)
+{
+m_pDoc->SetFormula(ScAddress(2, i, 0),
+ "=VLOOKUP(" + OUString::number(i) + "; "
+ "A$2:B$1000; 2; 0)",
+ formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+else
+{
+m_pDoc->SetFormula(ScAddress(2, i, 0),
+ "=VLOOKUP(42.42; "
+ "A$2:B$1000; 2; 0)",
+ formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+}
+
+m_xDocShell->DoHardRecalc();
+
+for (auto i = 1; i < 1000; i++)
+{
+OString sMessage = "At row " + OString::number(i+1);
+if (i%3)
+{
+if (i%5)
+{
+if (i%2)
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(),
static_cast(i*10), m_pDoc->GetValue(2, i, 0), 1e-10);
+else
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(),
OUString("N" + OUString::number(i*10)), m_pDoc->GetString(2, i, 0));
+}
+else
+{
+// The corresponding value in A is i+0.1
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(),
OUString("#N/A"), m_pDoc->GetString(2, i, 0));
+}
+}
+else
+{
+// The 42.42 is never found
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), OUString("#N/A"),
m_pDoc->GetString(2, i, 0));
+}
+}
+
+m_pDoc->DeleteTab(0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScParallelismTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Online: Add-ons and IDE integration
There is no lack of ideas. There doesn't exist any pool of volunteers just waiting to implement them. As with all ideas for LibreOffice development, either you need to start working on it yourself, or fund/hire somebody else to do it. In case it is something totally new that takes the software in a previously unheard-of direction, you will also have to convince others (more specifically, the "Engineering Steering Committee") that it is a good idea and should be accepted into the codebase. Historically, the bar has sadly not been set especially high for accepting new directions. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx | 50 -
1 file changed, 50 deletions(-)
New commits:
commit ec2abbca3d9befc4192452555a9433d267a47d58
Author: Varun Dhall
Date: Sun Aug 13 03:55:03 2017 +0530
Removing unused SetVersionMap from editeng
Change-Id: I04b2cb17271365a7967e51c7d551f538ee9a5c68
Reviewed-on: https://gerrit.libreoffice.org/41102
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index e443e81f53d1..36c101fa8146 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -216,49 +216,6 @@ const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
{ SID_ATTR_CHAR_CHARSETCOLOR, true }, // EE_FEATURE_NOTCONV
};
-const sal_uInt16 aV1Map[] = {
-3999, 4001, 4002, 4003, 4004, 4005, 4006,
-4007, 4008, 4009, 4010, 4011, 4012, 4013, 4017, 4018, 4019 // MI: 4019?
-};
-
-const sal_uInt16 aV2Map[] = {
-3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009,
-4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020
-};
-
-const sal_uInt16 aV3Map[] = {
-3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007,
-4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019,
-4020, 4021
-};
-
-const sal_uInt16 aV4Map[] = {
-3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
-4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
-4014, 4015, 4016, 4017, 4018,
-/* CJK Items inserted here: EE_CHAR_LANGUAGE - EE_CHAR_XMLATTRIBS */
-4034, 4035, 4036, 4037
-};
-
-const sal_uInt16 aV5Map[] = {
-3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
-4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
-4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023,
-4024, 4025, 4026, 4027, 4028, 4029, 4030, 4031, 4032, 4033,
-/* EE_CHAR_OVERLINE inserted here */
-4035, 4036, 4037, 4038
-};
-
-const sal_uInt16 aV6Map[] = {
-3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
-4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
-4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023,
-4024, 4025, 4026, 4027, 4028, 4029, 4030, 4031, 4032, 4033,
-4035, 4036, 4037, 4038,
-/* EE_CHAR_GRABBAG inserted here */
-4039
-};
-
EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr,
sal_Int32 nS, sal_Int32 nE )
{
// Create a new attribute in the pool
@@ -3068,13 +3025,6 @@ EditEngineItemPool::EditEngineItemPool( bool
bPersistenRefCounts )
: SfxItemPool( "EditEngineItemPool", EE_ITEMS_START, EE_ITEMS_END,
aItemInfos, nullptr, bPersistenRefCounts )
{
-SetVersionMap( 1, 3999, 4015, aV1Map );
-SetVersionMap( 2, 3999, 4019, aV2Map );
-SetVersionMap( 3, 3997, 4020, aV3Map );
-SetVersionMap( 4, 3994, 4022, aV4Map );
-SetVersionMap( 5, 3994, 4037, aV5Map );
-SetVersionMap( 6, 3994, 4038, aV6Map );
-
m_xDefItems = EditDLL::Get().GetGlobalData()->GetDefItems();
SetDefaults(m_xDefItems->getDefaults());
}
___
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/inc/docpool.hxx | 16 --
sc/source/core/data/docpool.cxx | 261
sc/source/core/data/global.cxx |2
sc/source/ui/app/scdll.cxx |2
4 files changed, 281 deletions(-)
New commits:
commit 78b3e279ca3a3da1e7a49756bc1edee82fc943a0
Author: Varun Dhall
Date: Sun Aug 13 03:49:12 2017 +0530
Removing unused SetVersionMap from sc
Change-Id: I16e4a80b721e8f419352ed2d546bd3d7197ed4f7
Reviewed-on: https://gerrit.libreoffice.org/41101
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index bafb72403692..064481952fcc 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -30,19 +30,6 @@ class ScDocument;
class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool
{
std::vector* mpPoolDefaults;
-static sal_uInt16* pVersionMap1;
-static sal_uInt16* pVersionMap2;
-static sal_uInt16* pVersionMap3;
-static sal_uInt16* pVersionMap4;
-static sal_uInt16* pVersionMap5;
-static sal_uInt16* pVersionMap6;
-static sal_uInt16* pVersionMap7;
-static sal_uInt16* pVersionMap8;
-static sal_uInt16* pVersionMap9;
-static sal_uInt16* pVersionMap10;
-static sal_uInt16* pVersionMap11;
-static sal_uInt16* pVersionMap12;
-
sal_uInt64 mnCurrentMaxKey;
public:
@@ -62,9 +49,6 @@ public:
MapUnit ePresentationMetric,
OUString& rText,
const IntlWrapper& rIntl ) const override;
-
-static void InitVersionMaps();
-static void DeleteVersionMaps();
};
#endif
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index fa44eb812358..85b57a7d8088 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -74,19 +74,6 @@
#include "document.hxx"
#include "sc.hrc"
-sal_uInt16* ScDocumentPool::pVersionMap1 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap2 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap3 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap4 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap5 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap6 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap7 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap8 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap9 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap10 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap11 = nullptr;
-sal_uInt16* ScDocumentPool::pVersionMap12 = nullptr;
-
// ATTR_FONT_TWOLINES (not used) was changed to ATTR_USERDEF (not saved in
binary format) in 641c
static SfxItemInfo const aItemInfos[] =
@@ -195,11 +182,6 @@ ScDocumentPool::ScDocumentPool()
aItemInfos, nullptr, false/*bLoadRefCounts*/ ),
mnCurrentMaxKey(0)
{
-// this is a hack for unit tests that need to have a ScDocument
-// but don't want to depend on BootstrapFixture
-if (!pVersionMap1)
-InitVersionMaps();
-
// latin font from GetDefaultFonts is not used,
DEFAULTFONT_LATIN_SPREADSHEET instead
vcl::Font aStdFont = OutputDevice::GetDefaultFont(
DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US,
GetDefaultFontFlags::OnlyOne );
@@ -337,44 +319,6 @@ ScDocumentPool::ScDocumentPool()
rPoolDefaults[ ATTR_HIDDEN - ATTR_STARTINDEX ] = new SfxBoolItem(
ATTR_HIDDEN, false );
SetDefaults( mpPoolDefaults );
-
-// ATTR_LANGUAGE_FORMAT from sv329 inserted, VersionMap in _ScGlobal__Init
-SetVersionMap( 1, 100, 157, pVersionMap1 );
-
-// ATTR_VALIDDATA, ATTR_CONDITIONAL from 341
-SetVersionMap( 2, 100, 158, pVersionMap2 );
-
-// ATTR_INDENT from 350
-SetVersionMap( 3, 100, 160, pVersionMap3 );
-
-// ATTR_ROTATE_VALUE, ATTR_ROTATE_MODE from 367
-SetVersionMap( 4, 100, 161, pVersionMap4 );
-
-// CJK, CTL, EMPHASISMARK, TWOLINES from 614
-SetVersionMap( 5, 100, 163, pVersionMap5 );
-
-// ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES from 614d
-SetVersionMap( 6, 100, 175, pVersionMap6 );
-
-// ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE from 632b
-SetVersionMap( 7, 100, 178, pVersionMap7 );
-
-// ATTR_VERTICAL_ASIAN from 642q
-SetVersionMap( 8, 100, 181, pVersionMap8 );
-
-// ATTR_WRITINGDIR from 643y
-SetVersionMap( 9, 100, 182, pVersionMap9 );
-
-// ATTR_PAGE_SCALETO added in 680/sab008
-// new version map not required
-
-// ATTR_SHRINKTOFIT, ATTR_BORDER_TL_BR, ATTR_BORDER_BL_TR added in 680/dr14
-SetVersionMap( 10, 100, 184, pVersionMap10 );
-
-// ATTR_FONT_OVERLINE added in DEV300/overline2
-SetVersionMap( 11, 100, 187, pVersionMap11 );
-// ATTR_HYERLINK added
-SetVersionMap( 12, 100, 192, pVersionMap12 );
}
ScDocumentPool::~ScDocumentPool()
@@ -390,211 +334,6 @@ ScDocumentPool::~ScDocumentPoo
[Libreoffice-commits] core.git: include/svx svx/inc svx/source
include/svx/chrtitem.hxx | 11 --
include/svx/sdangitm.hxx |2
include/svx/sdgcoitm.hxx |6 -
include/svx/sdgcpitm.hxx |1
include/svx/sdggaitm.hxx |2
include/svx/sdginitm.hxx |2
include/svx/sdgluitm.hxx |4
include/svx/sdgmoitm.hxx |4
include/svx/sdgtritm.hxx |2
include/svx/sdmetitm.hxx |2
include/svx/sdooitm.hxx|2
include/svx/sdprcitm.hxx |4
include/svx/sdtaaitm.hxx |2
include/svx/sdtaditm.hxx |2
include/svx/sdtaitm.hxx|4
include/svx/sdtakitm.hxx |2
include/svx/sdtayitm.hxx |2
include/svx/sdtfsitm.hxx |2
include/svx/sdynitm.hxx|2
include/svx/svx3ditems.hxx |6 -
include/svx/sxcecitm.hxx |2
include/svx/sxctitm.hxx|2
include/svx/sxekitm.hxx|2
include/svx/sxmtpitm.hxx | 10 --
include/svx/sxmuitm.hxx|2
include/svx/xfillit0.hxx |2
include/svx/xflbckit.hxx |3
include/svx/xflbmpit.hxx |2
include/svx/xflbmsli.hxx |2
include/svx/xflbmsxy.hxx |4
include/svx/xflbmtit.hxx |2
include/svx/xflboxy.hxx|4
include/svx/xflbstit.hxx |2
include/svx/xflbtoxy.hxx |4
include/svx/xfltrit.hxx|2
include/svx/xftadit.hxx|2
include/svx/xftdiit.hxx|2
include/svx/xftmrit.hxx|2
include/svx/xftouit.hxx|2
include/svx/xftshit.hxx|2
include/svx/xftshtit.hxx |2
include/svx/xftshxy.hxx|4
include/svx/xftstit.hxx|2
include/svx/xgrscit.hxx|2
include/svx/xlineit0.hxx |2
include/svx/xlinjoit.hxx |2
include/svx/xlncapit.hxx |2
include/svx/xlnedcit.hxx |2
include/svx/xlnedwit.hxx |2
include/svx/xlnstcit.hxx |2
include/svx/xlnstwit.hxx |2
include/svx/xlntrit.hxx|2
include/svx/xlnwtit.hxx|2
include/svx/xtextit0.hxx |4
svx/inc/sxcikitm.hxx |2
svx/inc/sxmkitm.hxx|2
svx/source/engine3d/svx3ditems.cxx | 78
svx/source/items/chrtitem.cxx | 48 -
svx/source/svdraw/svdattr.cxx | 110 --
svx/source/xoutdev/xattr.cxx | 170 --
svx/source/xoutdev/xattr2.cxx | 180 -
61 files changed, 741 deletions(-)
New commits:
commit 38984e9351a0230b0a56fb7277f7b19722350d8d
Author: Varun Dhall
Date: Fri Aug 11 22:40:31 2017 +0530
Removing unused SfxItemPool serialisation from svx
Change-Id: I778ae09c4b0fd3e18a37db4aa3f2affda2c8e86c
Reviewed-on: https://gerrit.libreoffice.org/41053
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index b7b311b50d6c..71bf9ab2cfc1 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -84,10 +84,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem :
public SfxEnumItem {
protected:
SdrGrafModeItem_Base(GraphicDrawMode eMode):
SfxEnumItem(SDRATTR_GRAFMODE, eMode) {}
-
-SdrGrafModeItem_Base(SvStream& rIn): SfxEnumItem(SDRATTR_GRAFMODE, rIn) {}
};
class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base
{
public:
SdrGrafModeItem( GraphicDrawMode eMode =
GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {}
-SdrGrafModeItem( SvStream& rIn ) :
SdrGrafModeItem_Base( rIn ) {}
virtual SfxPoolItem*Clone( SfxItemPool* pPool = nullptr ) const
override;
-virtual SfxPoolItem*Create( SvStream& rIn, sal_uInt16 nVer ) const
override;
virtual sal_uInt16 GetValueCount() const override;
virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const
override;
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index 9b24c0329faf..8e84db29f235 100644
--- a/include/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
@@ -33,10 +33,8 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public
SdrPercentItem
public:
SdrGrafTransparenceItem( sal_uInt16
nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE,
nTransparencePercent ) {}
-SdrGrafTransparenceItem( SvStream& rIn ) :
SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
virtual SfxPoolItem*Clone( SfxItemPool* pPool = nullptr ) const
override;
-virtual SfxPoolItem*Create( SvStream& rIn, sal_uInt16 nVer ) c
Weekly QA Report (W32-2017)
Hello, What have happened in QA in the last 7 days? * 186 have been created, of which, 73 are still unconfirmed ( Total Unconfirmed bugs: 478 ) Link: http://tinyurl.com/yawcpwu2 * 1212 comments have been written. == STATUS CHANGED == * 14 bugs have been changed to 'ASSIGNED'. Link: http://tinyurl.com/y7d27648 Done by: Xisco Faulí ( 7 ), Julien Nabet ( 2 ), Tamás Zolnai ( 1 ), Miklos Vajna ( 1 ), Paul Trojahn ( 1 ), Khaled Hosny ( 1 ), Dennis Francis ( 1 ) * 4 bugs have been changed to 'CLOSED'. Link: http://tinyurl.com/yc5ra8rm Done by: Regina Henschel ( 3 ), Adolfo Jayme ( 1 ) * 20 bugs have been changed to 'NEEDINFO'. Link: http://tinyurl.com/yctrhuyr Done by: Xisco Faulí ( 7 ), Buovjaga ( 3 ), Jean-Baptiste Faure ( 3 ), Julien Nabet ( 2 ), m.a.riosv ( 2 ), robert ( 1 ), Alex Thurgood ( 1 ), Cor Nouws ( 1 ) * 112 bugs have been changed to 'NEW'. Link: http://tinyurl.com/yber2kkh Done by: Xisco Faulí ( 23 ), Buovjaga ( 15 ), Telesto ( 12 ), Heiko Tietze ( 6 ), V Stuart Foote ( 5 ), Jacques Guilleron ( 5 ), Adolfo Jayme ( 5 ), Julien Nabet ( 4 ), Regina Henschel ( 4 ), Cor Nouws ( 4 ), raal ( 3 ), Yousuf Philips (jay) ( 3 ), Jean-Baptiste Faure ( 3 ), Timur ( 3 ), Aron Budea ( 3 ), Olivier Hallot ( 2 ), Mike Kaganski ( 2 ), m.a.riosv ( 2 ), Samuel Mehrbrodt (CIB) ( 1 ), MM ( 1 ), Markus Mohrhard ( 1 ), Alex Thurgood ( 1 ), GerardF ( 1 ), Urmas ( 1 ), beimaginativeegroup ( 1 ), Evgen ( 1 ) * 4 bugs have been changed to 'REOPENED'. Link: http://tinyurl.com/yb3m8glu Done by: Piter Sadroc ( 2 ), Francis Butler ( 1 ), Edmund Laugasson ( 1 ) * 34 bugs have been changed to 'RESOLVED DUPLICATE'. Link: http://tinyurl.com/y8r7cpdj Done by: Xisco Faulí ( 9 ), Telesto ( 5 ), Regina Henschel ( 4 ), Buovjaga ( 3 ), Timur ( 3 ), V Stuart Foote ( 2 ), Alex Thurgood ( 2 ), Heiko Tietze ( 1 ), Volga ( 1 ), robert ( 1 ), Jan Holesovsky ( 1 ), Jean-Baptiste Faure ( 1 ), Aron Budea ( 1 ) * 32 bugs have been changed to 'RESOLVED FIXED'. Link: http://tinyurl.com/ydd447u8 Done by: Julien Nabet ( 5 ), Adolfo Jayme ( 5 ), Dennis Francis ( 4 ), Tamas Bunth ( 3 ), Miklos Vajna ( 2 ), Paul Trojahn ( 2 ), Heiko Tietze ( 1 ), Stephan Bergmann ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Regina Henschel ( 1 ), Oliver Sander ( 1 ), Mike Kaganski ( 1 ), Jan Holesovsky ( 1 ), Cor Nouws ( 1 ), Caolán McNamara ( 1 ), Akshay Deep ( 1 ), Christian.Barth ( 1 ) * 4 bugs have been changed to 'RESOLVED INVALID'. Link: http://tinyurl.com/y837546e Done by: Xisco Faulí ( 1 ), Kovács Viktor ( 1 ), Jean-Baptiste Faure ( 1 ), Timur ( 1 ) * 17 bugs have been changed to 'RESOLVED NOTABUG'. Link: http://tinyurl.com/yaavef4r Done by: m.a.riosv ( 5 ), Jean-Baptiste Faure ( 3 ), Jacques Guilleron ( 3 ), Tamás Zolnai ( 1 ), Xavier Van Wijmeersch ( 1 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ), Michael Stahl ( 1 ), Michel ( 1 ) * 1 bug has been changed to 'RESOLVED NOTOURBUG'. Link: http://tinyurl.com/ybj3z4cc Done by: Buovjaga ( 1 ) * 9 bugs have been changed to 'RESOLVED WONTFIX'. Link: http://tinyurl.com/yckda6d5 Done by: Buovjaga ( 2 ), Heiko Tietze ( 2 ), Adolfo Jayme ( 2 ), Xisco Faulí ( 1 ), Thorsten Behrens (CIB) ( 1 ), Jean-Baptiste Faure ( 1 ) * 21 bugs have been changed to 'RESOLVED WORKSFORME'. Link: http://tinyurl.com/y8bq34n4 Done by: Buovjaga ( 4 ), Heiko Tietze ( 4 ), Xisco Faulí ( 3 ), Cor Nouws ( 3 ), Timur ( 2 ), stefan alexandru ( 1 ), m.a.riosv ( 1 ), Jorendc ( 1 ), Christian Lohmaier ( 1 ), George Alfradique ( 1 ) * 7 bugs have been changed to 'UNCONFIRMED'. Link: http://tinyurl.com/ybtd2z6x Done by: Gabor Kelemen ( 2 ), Tom Turelinckx ( 1 ), Buovjaga ( 1 ), m.a.riosv ( 1 ), Michael ( 1 ), Jacques Guilleron ( 1 ) * 16 bugs have been changed to 'VERIFIED FIXED'. Link: http://tinyurl.com/y858bmyo Done by: Xisco Faulí ( 3 ), Alex Thurgood ( 3 ), Julien Nabet ( 2 ), Luke ( 2 ), Timur ( 2 ), Cor Nouws ( 2 ), Heiko Tietze ( 1 ), Telesto ( 1 ) == KEYWORDS ADDED == * 'accessibility' has been added to 2 bugs. Link: http://tinyurl.com/ydbo4w5m Done by: Alex ARNAUD ( 2 ) * 'bibisectRequest' has been added to 7 bugs. Link: http://tinyurl.com/ybczqlnw Done by: Buovjaga ( 4 ), Xisco Faulí ( 3 ) * 'bibisected' has been added to 18 bugs. Link: http://tinyurl.com/y7q87rv5 Done by: Xisco Faulí ( 13 ), Aron Budea ( 3 ), raal ( 1 ), Mike Kaganski ( 1 ) * 'bisected' has been added to 10 bugs. Link: http://tinyurl.com/yd6jcp8s Done by: Xisco Faulí ( 6 ), Aron Budea ( 2 ), raal ( 1 ), Mike Kaganski ( 1 ) * 'easyHack' has been added to 3 bugs. Link: http://tinyurl.com/ybozufrz Done by: Heiko Tietze ( 2 ), Cor Nouws ( 1 ) * 'filter:doc' has been added to 1 bugs. Link: http://tinyurl.com/ycfj54yn Done by: Buovjaga ( 1 ) * 'filter:docx' has been added to 3 bugs. Link: http://tinyurl.com/y9bmsuwb Done by: Buovjaga ( 1 ), Jacques Guilleron ( 1 ),
[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - sw/qa
Rebased ref, commits from common ancestor:
commit 99061131d39f110650312d2063312815aa186af5
Author: Rosemary Sebastian
Date: Mon Aug 14 13:54:00 2017 +0530
Remove redline import tests for now
This commit should be reverted after change-tracking import is implemented
Change-Id: I9443bc6bba39556aa92706ee02d6fff547133de1
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index bbebd6b24afc..bf2c823368da 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -304,15 +304,6 @@ DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded,
"oooxml_embedded.sxw")
CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8),
comphelper::OStorageHelper::GetXStorageFormat(xStorage4));
}
-DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
-{
-//Note this is for a crash test
-//Counting the Number of Frames and checking with the expected count
-uno::Reference xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Reference
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-}
-
DECLARE_ODFEXPORT_TEST(testFdo38244, "fdo38244.odt")
{
// See ooxmlexport's testFdo38244().
@@ -1109,44 +1100,6 @@ DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
CPPUNIT_ASSERT(!xPortions->hasMoreElements());
-xPara.set(getParagraphOrTable(17), uno::UNO_QUERY);
-xPortions.set(xPara->createEnumeration());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT(!getProperty(xPortion, "IsCollapsed"));
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT(!getProperty(xPortion, "IsCollapsed"));
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
-CPPUNIT_ASSERT(!xPortions->hasMoreElements());
-
-xPara.set(getParagraphOrTable(18), uno::UNO_QUERY);
-xPortions.set(xPara->createEnumeration());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT(!getProperty(xPortion, "IsCollapsed"));
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT(!getProperty(xPortion, "IsCollapsed"));
-xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty(xPortion,
"TextPortionType"));
-CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
-CPPUNIT_ASSERT(!xPortions->hasMoreElements());
-
xPara.set(getParagraphOrTable(19), uno::UNO_QUERY);
xPortions.set(xPara->createEnumeration());
xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: codemaker/source comphelper/source compilerplugins/clang jurt/source solenv/CompilerTest_compilerplugins_clang.mk soltools/cpp soltools/mkdepend
codemaker/source/cppumaker/cppuoptions.cxx |2
codemaker/source/javamaker/javaoptions.cxx |2
comphelper/source/misc/backupfilehelper.cxx |8
compilerplugins/clang/droplong.cxx | 123
++
compilerplugins/clang/test/droplong.cxx | 20 +
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c |2
solenv/CompilerTest_compilerplugins_clang.mk|1
soltools/cpp/_eval.c|6
soltools/mkdepend/def.h |2
9 files changed, 155 insertions(+), 11 deletions(-)
New commits:
commit 0c3bd1d482ece1f2217cc87069179161f6a5bb56
Author: Noel Grandin
Date: Mon Aug 14 08:28:13 2017 +0200
new loplugin:droplong
The types 'long' and 'unsigned long' are different sizes on different
platforms, making them wholy unsuitable for portable code.
And when I mean different sizes, I mean 64bit Linux and 64bit Windows
have different bit sizes.
Change-Id: Id4d8cd709bf71a3f85ed6515fae2b0a21ae8c25d
Reviewed-on: https://gerrit.libreoffice.org/41130
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx
b/codemaker/source/cppumaker/cppuoptions.cxx
index d6f31e89aeee..b399de19147e 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -278,7 +278,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool
bCmdFile)
ret = initOptions(rargc, rargv, bCmdFile);
-for (long j=0; j < rargc; j++)
+for (int j=0; j < rargc; j++)
{
free(rargv[j]);
}
diff --git a/codemaker/source/javamaker/javaoptions.cxx
b/codemaker/source/javamaker/javaoptions.cxx
index a09107a99b53..08c5a7f4dbf8 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -208,7 +208,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool
bCmdFile)
ret = initOptions(rargc, rargv, bCmdFile);
-for (long j=0; j < rargc; j++)
+for (int j=0; j < rargc; j++)
{
free(rargv[j]);
}
diff --git a/comphelper/source/misc/backupfilehelper.cxx
b/comphelper/source/misc/backupfilehelper.cxx
index ebf93aeb8282..abc8579a542b 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -654,9 +654,9 @@ namespace
if (aList.is())
{
-const long nLength(aList->getLength());
+const sal_Int32 nLength(aList->getLength());
-for (long a(0); a < nLength; a++)
+for (sal_Int32 a(0); a < nLength; a++)
{
const uno::Reference< xml::dom::XElement >
aChild(aList->item(a), uno::UNO_QUERY);
@@ -765,9 +765,9 @@ namespace
if (aList.is())
{
-const long nLength(aList->getLength());
+const sal_Int32 nLength(aList->getLength());
-for (long a(0); a < nLength; a++)
+for (sal_Int32 a(0); a < nLength; a++)
{
const uno::Reference< xml::dom::XElement >
aChild(aList->item(a), uno::UNO_QUERY);
diff --git a/compilerplugins/clang/droplong.cxx
b/compilerplugins/clang/droplong.cxx
new file mode 100644
index ..78129e78c323
--- /dev/null
+++ b/compilerplugins/clang/droplong.cxx
@@ -0,0 +1,123 @@
+/* -*- 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
+#include
+#include
+#include
+#include
+#include
+#include "plugin.hxx"
+#include "check.hxx"
+
+/**
+The types 'long' and 'unsigned long' are different sizes on different
platforms, making them wholy unsuitable
+for portable code.
+And when I mean different sizes, I mean 64bit Linux and 64bit Windows have
different sizes.
+ */
+namespace {
+
+static bool startswith(const std::string& rStr, const char* pSubStr) {
+return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
+}
+
+class DropLong:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit DropLong(InstantiationData const & data): Plugin(data) {}
+
+virtual void run() override
+{
+
