[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdedxv.hxx | 54 +++--
svx/source/svdraw/svdedxv.cxx | 429 +-
svx/source/svdraw/svdview.cxx | 22 +-
3 files changed, 266 insertions(+), 239 deletions(-)
New commits:
commit 93115d2c54d645bcf2f80fde325e3ede39dee4d5
Author: Tomaž Vajngerl
AuthorDate: Tue Sep 28 19:12:40 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Oct 7 23:40:05 2021 +0200
svx: add "m" prefix to some member variables in SdrObjEditView
Change-Id: I2877f63d97ff6d15f08bd2dbaee6128b8a689cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123219
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 7f25e3cfc459..a4f457c9aeba 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -76,16 +76,16 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public
SdrGlueEditView, public EditView
// The OverlayObjects used for visualizing active TextEdit (currently
// using TextEditOverlayObject, but not limited to it
-sdr::overlay::OverlayObjectList maTEOverlayGroup;
+sdr::overlay::OverlayObjectList maTEOverlayGroup;
protected:
// TextEdit
-tools::WeakReference
-mxTextEditObj; // current object in
TextEdit
-SdrPageView*pTextEditPV;
-std::unique_ptr pTextEditOutliner; // outliner for the
TextEdit
-OutlinerView* pTextEditOutlinerView; // current view of the
outliners
-VclPtr pTextEditWin; // matching window to
pTextEditOutlinerView
+tools::WeakReference mxTextEditObj; // current object in
TextEdit
+SdrPageView* mpTextEditPV;
+std::unique_ptr mpTextEditOutliner; // outliner for the
TextEdit
+OutlinerView* mpTextEditOutlinerView; // current view of the outliners
+VclPtr mpTextEditWin; // matching window to
pTextEditOutlinerView
+
vcl::Cursor*pTextEditCursorBuffer; // to restore the
cursor in each window
SdrObject* pMacroObj;
SdrPageView*pMacroPV;
@@ -98,11 +98,11 @@ protected:
sal_uInt16 nMacroTol;
-boolbTextEditDontDelete : 1; // do not delete
outliner and view of SdrEndTextEdit (f. spellchecking)
-boolbTextEditOnlyOneView : 1; // a single
OutlinerView (f. spellchecking)
-boolbTextEditNewObj : 1; // current edited
object was just recreated
-boolbQuickTextEditMode : 1;//
persistent(->CrtV). Default=TRUE
-boolbMacroDown : 1;
+bool mbTextEditDontDelete : 1; // do not delete outliner and view of
SdrEndTextEdit (f. spellchecking)
+bool mbTextEditOnlyOneView : 1; // a single OutlinerView (f. spellchecking)
+bool mbTextEditNewObj : 1; // current edited object was just recreated
+bool mbQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
+bool mbMacroDown : 1;
rtl::Reference< sdr::SelectionController > mxSelectionController;
rtl::Reference< sdr::SelectionController > mxLastSelectionController;
@@ -184,8 +184,14 @@ public:
// TextEdit over an outliner
// QuickTextEditMode = edit the text straight after selection.
Default=TRUE. Persistent.
-void SetQuickTextEditMode(bool bOn) { bQuickTextEditMode=bOn; }
-bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
+void SetQuickTextEditMode(bool bOn)
+{
+mbQuickTextEditMode = bOn;
+}
+bool IsQuickTextEditMode() const
+{
+return mbQuickTextEditMode;
+}
// Start the TextEditMode. If pWin==NULL, use the first window, which is
logged at the View.
// The cursor of the currently edited window is stored with
SdrBeginTextEdit()
@@ -233,10 +239,22 @@ public:
// Now at this outliner, events can be send, attributes can be set,
// call Cut/Copy/Paste, call Undo/Redo, and so on...
-const SdrOutliner* GetTextEditOutliner() const { return
pTextEditOutliner.get(); }
-SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner.get(); }
-const OutlinerView* GetTextEditOutlinerView() const { return
pTextEditOutlinerView; }
-OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
+const SdrOutliner* GetTextEditOutliner() const
+{
+return mpTextEditOutliner.get();
+}
+SdrOutliner* GetTextEditOutliner()
+{
+return mpTextEditOutliner.get();
+}
+const OutlinerView* GetTextEditOutlinerView() const
+{
+return mpTextEditOutlinerView;
+}
+OutlinerView* GetTextEditOutlinerView()
+{
+return mpTextEditOutlinerView;
+}
virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override;
virtual bool MouseButtonDown(const MouseEvent& rMEvt, OutputDevice* pWin)
override;
diff --git
[Libreoffice-commits] core.git: include/tools
include/tools/fldunit.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 33206d7ae6e91b264087981ae2e61d9c16babfd9 Author: Julien Nabet AuthorDate: Thu Oct 7 20:40:39 2021 +0200 Commit: Mike Kaganski CommitDate: Thu Oct 7 21:54:03 2021 +0200 Match order of the beginning of fldunit.hxx with FieldUnit.idl Change-Id: I5ddb120e66fed214cab484f9cd668dfa6f75d123 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123231 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/include/tools/fldunit.hxx b/include/tools/fldunit.hxx index c300ef2ef31f..a2838c32ff25 100644 --- a/include/tools/fldunit.hxx +++ b/include/tools/fldunit.hxx @@ -35,11 +35,11 @@ enum class FieldUnit : sal_uInt16 INCH, FOOT, MILE, -CHAR, -LINE, CUSTOM, PERCENT, MM_100TH, +CHAR, +LINE, PIXEL, DEGREE, SECOND,
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk |1
source/auxiliary/sbasic.tree |1
source/auxiliary/scalc.tree|4
source/text/sbasic/guide/read_write_values.xhp | 196 +
4 files changed, 201 insertions(+), 1 deletion(-)
New commits:
commit 7f942a62c3e173d25ec8e3d7ee786b2087d49e42
Author: Rafael Lima
AuthorDate: Sun Oct 3 15:25:22 2021 +0200
Commit: Rafael Lima
CommitDate: Thu Oct 7 21:28:32 2021 +0200
Create a guide on Calc macros on reading and writing cell values
This patch also creates a new entry in the Calc tree menu to store all
pages about Calc macros. Currently there are only two, but in future patches
new pages will be added.
Change-Id: Iac55c87d1159f4163ba3150e83160b4156d0d0f6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122936
Tested-by: Jenkins
Reviewed-by: Rafael Lima
diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 75a17ee3a..367bf03c8 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
helpcontent2/source/text/sbasic/guide/control_properties \
helpcontent2/source/text/sbasic/guide/create_dialog \
helpcontent2/source/text/sbasic/guide/insert_control \
+helpcontent2/source/text/sbasic/guide/read_write_values \
helpcontent2/source/text/sbasic/guide/sample_code \
helpcontent2/source/text/sbasic/guide/show_dialog \
helpcontent2/source/text/sbasic/guide/translation \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 73969aca1..5202b9087 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -377,7 +377,6 @@
Event-Driven Macros
%PRODUCTNAME Basic Programming
Examples
Calling Python Scripts from
Basic
-Formatting Borders in Calc with
Macros
Access2Base, the API for Base
users
diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree
index 4705fdff0..10af79f09 100644
--- a/source/auxiliary/scalc.tree
+++ b/source/auxiliary/scalc.tree
@@ -188,6 +188,10 @@
Protecting Cells from
Changes
Unprotecting
Cells
+
+
+Reading and Writing
values to Ranges
+Formatting Borders in
Calc with Macros
Deactivating Automatic
Changes
diff --git a/source/text/sbasic/guide/read_write_values.xhp
b/source/text/sbasic/guide/read_write_values.xhp
new file mode 100644
index 0..b8dab321c
--- /dev/null
+++ b/source/text/sbasic/guide/read_write_values.xhp
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+Reading and Writing values to
Ranges
+/text/sbasic/guide/read_write_values.xhp
+
+
+
+
+
+macros;read values from cells
+macros;write values to cells
+
+ Reading and Writing values to
Ranges
+ Macros in
%PRODUCTNAME Calc often need to read and write values from/to sheets. This help
page describes the various approaches to accessing sheets and ranges to read or
write their values.
+ All examples presented in this page can be
implemented both in Basic and Python.
+
+ Accessing a Single Cell
+ The example below
enters the numeric value 123 into cell "A1" of the current sheet.
+
+Dim
oSheet as Object
+Dim
oCell as Object
+oSheet =
ThisComponent.CurrentController.getActiveSheet()
+oCell = oSheet.getCellRangeByName("A1")
+oCell.setValue(123)
+
+ The same can be
accomplished with Python:
+
+doc =
XSCRIPTCONTEXT.getDocument()
+sheet
= doc.getCurrentController().getActiveSheet()
+cell
= sheet.getCellRangeByName("A1")
+cell.setValue(123)
+
+ Note that in the
previous examples the cell is accessed using its range name "A1". It is also
possible to access cells using indices as though the sheet were a matrix where
columns and rows are indexed starting from zero.
+ This can be done
using the getCellByPosition(colIndex, rowIndex) method, that
takes in a column and a row index. The example below in Basic changes the text
value in cell "C1" (column 2, row 0).
+
+oSheet =
ThisComponent.CurrentController.getActiveSheet()
+oCell
= oSheet.getCellByPosition(2, 0)
+oCell.setString("Hello")
+
+ This example can also
be implemented in Python as follows:
+
+doc =
XSCRIPTCONTEXT.getDocument()
+sheet
= doc.getCurrentController().getActiveSheet()
+cell
= sheet.getCellByPosition(2, 0)
+cell.setString("Hello")
+
+ The main difference between Python and
Basic scripts lies on how to get access to the sheet object by using the
XSCRIPTCONTEXT context variable. After that, all methods and
properties are identical in Basic and Python.
+ Values, Strings and Formulas
+ Calc cells can have
three types of values: numeric, strings and formulas. Each type has its own set
and get methods:
+
+
+
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0a735eba030cf294e661cfc4c6da693ef9bfd61 Author: Rafael Lima AuthorDate: Thu Oct 7 21:28:34 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Oct 7 21:28:34 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 7f942a62c3e173d25ec8e3d7ee786b2087d49e42 - Create a guide on Calc macros on reading and writing cell values This patch also creates a new entry in the Calc tree menu to store all pages about Calc macros. Currently there are only two, but in future patches new pages will be added. Change-Id: Iac55c87d1159f4163ba3150e83160b4156d0d0f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122936 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index 82e70eb6efa8..7f942a62c3e1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 82e70eb6efa88c3d21606292a042cd6978385480 +Subproject commit 7f942a62c3e173d25ec8e3d7ee786b2087d49e42
[Libreoffice-commits] core.git: editeng/inc editeng/source
editeng/inc/editdoc.hxx |2 +-
editeng/source/editeng/editdoc.cxx |2 +-
editeng/source/editeng/editobj.cxx |4 ++--
editeng/source/editeng/editobj2.hxx |2 +-
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/uno/unofdesc.cxx |6 ++
6 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 8167cc226960d635c9e68f603cb1ab2c57426828
Author: Noel Grandin
AuthorDate: Wed Oct 6 16:21:20 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 8 06:35:09 2021 +0200
use SfxItemSetFixed in editeng
Change-Id: I892a69d50f7d641f9a941a55c7b3952d1c59c435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123144
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 3fb103532f38..d56b4b385d7d 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -154,7 +154,7 @@ class ContentAttribs
{
private:
SfxStyleSheet* pStyle;
-SfxItemSet aAttribSet;
+SfxItemSetFixed aAttribSet;
public:
ContentAttribs( SfxItemPool& rItemPool );
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index a4ae6f064448..f04edc314abb 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1780,7 +1780,7 @@ void ContentNode::dumpAsXml(xmlTextWriterPtr pWriter)
const
ContentAttribs::ContentAttribs( SfxItemPool& rPool )
: pStyle(nullptr)
-, aAttribSet( rPool, svl::Items )
+, aAttribSet( rPool )
{
}
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 39e2bcbd22d8..6e0982b27dc0 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -93,7 +93,7 @@ const XParaPortion& XParaPortionList::operator [](size_t i)
const
ContentInfo::ContentInfo( SfxItemPool& rPool ) :
eFamily(SfxStyleFamily::Para),
-aParaAttribs(rPool, svl::Items)
+aParaAttribs(rPool)
{
}
@@ -102,7 +102,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom,
SfxItemPool& rPoolToUse
maText(rCopyFrom.maText),
aStyle(rCopyFrom.aStyle),
eFamily(rCopyFrom.eFamily),
-aParaAttribs(rPoolToUse, svl::Items)
+aParaAttribs(rPoolToUse)
{
// this should ensure that the Items end up in the correct Pool!
aParaAttribs.Set( rCopyFrom.GetParaAttribs() );
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 005624ede6e6..250341fd4283 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -122,7 +122,7 @@ private:
std::vector maCharAttribs;
SfxStyleFamily eFamily;
-SfxItemSet aParaAttribs;
+SfxItemSetFixed aParaAttribs;
std::unique_ptr
mpWrongs;
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 5a3fc449a9e3..c54405b3c30f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -726,7 +726,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet() const
{
if ( !pEmptyItemSet )
{
-pEmptyItemSet =
std::make_unique(const_cast(aEditDoc.GetItemPool()),
svl::Items);
+pEmptyItemSet = std::make_unique>(const_cast(aEditDoc.GetItemPool()));
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END;
nWhich++)
{
pEmptyItemSet->ClearItem( nWhich );
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 238bdc82320f..722ae7d7f9db 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -192,12 +192,10 @@ void SvxUnoFontDescriptor::setPropertyToDefault(
SfxItemSet& rSet )
uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool )
{
-SfxItemSet aSet(
-*pPool,
-svl::Items<
+SfxItemSetFixed<
EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT,
EE_CHAR_WEIGHT, EE_CHAR_ITALIC,
-EE_CHAR_WLM, EE_CHAR_WLM>);
+EE_CHAR_WLM, EE_CHAR_WLM> aSet(*pPool);
uno::Any aAny;
[Libreoffice-commits] core.git: include/vcl sfx2/source vcl/osx vcl/source vcl/unx
include/vcl/font/Feature.hxx |2 +-
include/vcl/graphictools.hxx |2 +-
include/vcl/svapp.hxx|4 ++--
sfx2/source/appl/appdde.cxx |2 +-
vcl/osx/vclnsapp.mm |8
vcl/source/font/Feature.cxx |4 ++--
vcl/source/font/FeatureCollector.cxx |5 +++--
vcl/source/gdi/graphictools.cxx |4 ++--
vcl/unx/generic/gdi/gdiimpl.cxx |8
9 files changed, 20 insertions(+), 19 deletions(-)
New commits:
commit bd7cf3915964ba80786e2ae77b33fc654fde1f31
Author: Noel Grandin
AuthorDate: Wed Oct 6 20:29:08 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 8 06:34:07 2021 +0200
loplugin:moveparam in vcl
Change-Id: Ic43e02576454e3ee174304db350659dd113a1d5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123186
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index b16843abea7d..3026f105fbfb 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -68,7 +68,7 @@ public:
FeatureDefinition();
FeatureDefinition(uint32_t nCode, OUString const& rDescription,
FeatureParameterType eType = FeatureParameterType::BOOL,
- std::vector const& rEnumParameters
+ std::vector&& rEnumParameters
= std::vector{},
uint32_t nDefault = 0);
FeatureDefinition(uint32_t nCode, TranslateId pDescriptionID,
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index 90dcbc360d1d..932df413cc58 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -84,7 +84,7 @@ public:
CapType aCap,
JoinType aJoin,
doublefMiterLimit,
- const DashArray& rDashArray ); // TODO: Dash
array offset (position where to start, see PS)
+ DashArray&& rDashArray ); // TODO: Dash
array offset (position where to start, see PS)
// accessors
/// Query path to stroke
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 519aad8bb27b..e422c47c66ad 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -161,8 +161,8 @@ public:
and are the \em only events that accept an array of strings. No other
events should use this constructor.
*/
-ApplicationEvent(Type type, std::vector const & data):
-aEvent(type), aData(data)
+ApplicationEvent(Type type, std::vector&& data):
+aEvent(type), aData(std::move(data))
{
assert(type == Type::Open || type == Type::Print);
}
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 2144cf5d9cc5..b5c6ee54b6fc 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -282,7 +282,7 @@ bool SfxAppEvent_Impl( const OUString& rCmd,
std::u16string_view rEvent,
}
}
-GetpApp()->AppEvent( ApplicationEvent(eType, aData) );
+GetpApp()->AppEvent( ApplicationEvent(eType, std::move(aData)) );
return true;
}
}
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 53d002a8aa46..727f58ed391e 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -230,7 +230,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
aFile.push_back( GetOUString( pFile ) );
if( ! AquaSalInstance::isOnCommandLine( aFile[0] ) )
{
-const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, aFile);
+const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, std::move(aFile));
AquaSalInstance::aAppEventList.push_back( pAppEvent );
AquaSalInstance *pInst = GetSalData()->mpInstance;
if( pInst )
@@ -261,7 +261,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
// we have no back channel here, we have to assume success, in which
case
// replyToOpenOrPrint does not need to be called according to
documentation
// [app replyToOpenOrPrint: NSApplicationDelegateReplySuccess];
-const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, aFileList);
+const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, std::move(aFileList));
AquaSalInstance::aAppEventList.push_back( pAppEvent );
AquaSalInstance *pInst = GetSalData()->mpInstance;
if( pInst )
@@ -274,7 +274,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
(void)app;
std::vector aFile;
aFile.push_back( GetOUString( pFile ) );
-const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Print, aFile);
+const ApplicationEvent* pAppEvent = new
[Libreoffice-commits] core.git: include/svl sc/source svl/source
include/svl/ilstitem.hxx |2 +-
sc/source/ui/view/tabvwsh3.cxx |2 +-
sc/source/ui/view/tabvwsha.cxx |5 ++---
svl/source/items/ilstitem.cxx |4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 2ad7e095078e09bc27608d5b1fedb8809656abbe
Author: Noel Grandin
AuthorDate: Wed Oct 6 20:32:58 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 8 07:28:43 2021 +0200
loplugin:moveparam in svl
Change-Id: I58c1ef97fd6cba281c90cc7ed9917e04b7f265ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123187
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index af4932999dbd..bb49d18c9dbb 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -33,7 +33,7 @@ class SVL_DLLPUBLIC SfxIntegerListItem final : public
SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
SfxIntegerListItem();
-SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >&
rList );
+SfxIntegerListItem( sal_uInt16 nWhich, std::vector < sal_Int32 >&& rList );
SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence <
sal_Int32 >& rList );
virtual ~SfxIntegerListItem() override;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 4ad0eb9de120..03e8dd4f9593 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -915,7 +915,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
aIndexList = pDlg->GetSelectedRows();
pDlg.disposeAndClear();
-rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES,
aIndexList ) );
+rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES,
std::vector(aIndexList) ) );
}
else
rReq.Ignore();
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 8a47fc8ff94b..31c087e00d41 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -517,7 +517,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq,
const OString
pOldSet->MergeRange(SID_ATTR_BORDER_STYLES, SID_ATTR_BORDER_DEFAULT_WIDTH);
// We only allow these border line types.
-const std::vector aBorderStyles{
+std::vector aBorderStyles{
table::BorderLineStyle::SOLID,
table::BorderLineStyle::DOTTED,
table::BorderLineStyle::DASHED,
@@ -526,8 +526,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq,
const OString
table::BorderLineStyle::DASH_DOT_DOT,
table::BorderLineStyle::DOUBLE_THIN };
-SfxIntegerListItem aBorderStylesItem(SID_ATTR_BORDER_STYLES,
aBorderStyles);
-pOldSet->Put(aBorderStylesItem);
+pOldSet->Put(SfxIntegerListItem(SID_ATTR_BORDER_STYLES,
std::move(aBorderStyles)));
// Set the default border width to 0.75 points.
SfxInt64Item aBorderWidthItem(SID_ATTR_BORDER_DEFAULT_WIDTH, 75);
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index d9ddeae2182e..0cb9ea8e6c49 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -31,9 +31,9 @@ SfxIntegerListItem::SfxIntegerListItem()
{
}
-SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const ::std::vector
< sal_Int32 >& rList )
+SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, ::std::vector <
sal_Int32 >&& rList )
: SfxPoolItem( which )
-, m_aList( rList )
+, m_aList( std::move(rList) )
{
}
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/textboxhelper.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f78aebd4c2a2b740559e54906a26653dc89fd610
Author: Miklos Vajna
AuthorDate: Wed Oct 6 20:06:19 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Oct 7 08:05:50 2021 +0200
sw: size() -> !empty() in textboxhelper
To avoid an implicit integer to boolean conversion.
Change-Id: If4f91d4ebfc0c2a66e0c526d3826aed4b7558ec2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123185
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index 7c6110e714d2..6d19209c4ad3 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -1388,7 +1388,7 @@ SwTextBoxNode::SwTextBoxNode(SwFrameFormat* pOwnerShape)
assert(pOwnerShape->Which() == RES_DRAWFRMFMT);
m_pOwnerShapeFormat = pOwnerShape;
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
m_pTextBoxes.clear();
}
@@ -1422,7 +1422,7 @@ void SwTextBoxNode::AddTextBox(SdrObject* pDrawObject,
SwFrameFormat* pNewTextBo
void SwTextBoxNode::DelTextBox(const SdrObject* pDrawObject)
{
assert(pDrawObject);
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
{
for (auto it = m_pTextBoxes.begin(); it != m_pTextBoxes.end();)
{
@@ -1442,7 +1442,7 @@ void SwTextBoxNode::DelTextBox(const SdrObject*
pDrawObject)
SwFrameFormat* SwTextBoxNode::GetTextBox(const SdrObject* pDrawObject) const
{
assert(pDrawObject);
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
{
for (auto it = m_pTextBoxes.begin(); it != m_pTextBoxes.end(); it++)
{
@@ -1459,7 +1459,7 @@ bool SwTextBoxNode::IsTextBoxActive(const SdrObject*
pDrawObject) const
{
assert(pDrawObject);
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
{
for (auto it = m_pTextBoxes.begin(); it != m_pTextBoxes.end(); it++)
{
@@ -1476,7 +1476,7 @@ void SwTextBoxNode::SetTextBoxActive(const SdrObject*
pDrawObject)
{
assert(pDrawObject);
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
{
for (auto it = m_pTextBoxes.begin(); it != m_pTextBoxes.end(); it++)
{
@@ -1492,7 +1492,7 @@ void SwTextBoxNode::SetTextBoxInactive(const SdrObject*
pDrawObject)
{
assert(pDrawObject);
-if (m_pTextBoxes.size())
+if (!m_pTextBoxes.empty())
{
for (auto it = m_pTextBoxes.begin(); it != m_pTextBoxes.end(); it++)
{
Re: _ssl.cpython-3.8.so does not exist in the tarball
On 06.10.21 18:25, mcmurchy1917techy wrote: Found my mistake. I should have set the --enable-python flag in autogen to system that's not a mistake, the internal one ought to build, but it's not possible to figure out from the log why it failed: Failed to build these modules: _ssl Could not build the ssl module! Python requires an OpenSSL 1.0.2 or 1.1 compatible libssl with X509_VERIFY_PARAM_set1_host(). LibreSSL 2.6.4 and earlier do not provide the necessary APIs, https://github.com/libressl-portable/portable/issues/381 running build_scripts On my system I ran strings --print-file-name $(locate libssl) | grep X509_VERIFY_PARAM_set1_host which returned /lib/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /lib64/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /usr/lib/libssl.so: X509_VERIFY_PARAM_set1_host /usr/lib/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /usr/lib64/libssl.so: X509_VERIFY_PARAM_set1_host /usr/lib64/libssl.so.1.1: X509_VERIFY_PARAM_set1_host So is it telling me that this python3 build is seeing X509_VERIFY_PARAM_set1_host at the beginning, but not at the end? the error message appears to be generic - it's possible that the problem doesn't have anything to do with "X509_VERIFY_PARAM_set1_host". perhaps there are more details further up in the log, or in a different log file. also, the openssl may be used either internal or from the system, depending on --with-system-openssl/--with-system-libs.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/ui/fldui/fldtdlg.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit fc9383e943bdb07e1770af4eef8ffe8859c379f8
Author: Vasily Melenchuk
AuthorDate: Mon Oct 4 17:40:31 2021 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Oct 7 08:34:10 2021 +0200
tdf#144907: sw ui: allow closing of "Fields" dialog
In some cases (described in task) dialog is not closed.
This is happens due to not delivered request to
SwTextShell::ExecField(). So we could just close dialog
explicitly, if Execute() action did fail.
Change-Id: I1c712295a21037bc8bb28e2a97e750299b41250c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123059
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit da5580369bfd15857fb21a1f610e393d07abb805)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122951
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 70d69203af14..d78bc66b811a 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -108,9 +108,16 @@ void SwFieldDlg::Close()
{
if (m_bClosing)
return;
-m_pBindings->GetDispatcher()->
+const SfxPoolItem* pResult = m_pBindings->GetDispatcher()->
Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD,
SfxCallMode::SYNCHRON|SfxCallMode::RECORD);
+if (!pResult)
+{
+// If Execute action did fail for whatever reason, this means that
request
+// to close did fail or wasn't delivered to SwTextShell::ExecField().
+// Just explicitly close dialog in this case.
+SfxTabDialogController::EndDialog();
+}
}
void SwFieldDlg::Initialize(SfxChildWinInfo const *pInfo)
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndtbl1.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 7e201916169aca254c0824fb71ed83ca69f4adce
Author: Justin Luth
AuthorDate: Tue Oct 5 15:32:06 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 7 09:01:05 2021 +0200
tdf#144317 sw table minimize: fix signed->unsigned table growth
In the case where the table was already rather oversized,
the minimize and optimize functions would attempt to shrink
the table to the maximum recommended size. But that was done
without checking whether that would result in a negative
position for the column boundary. (At least that is what I
think was happening. This code is a bit too cryptic...)
I tried to make a unit test, but the table size didn't
grow or shrink as I expected it to (and as it seems to
when the command is run by hand...)
An F12 with SW_DEBUG=true ./instdir/program/soffice
shows that the cell gains a huge width, but that didn't
show up either in a parseDump, even after a
Scheduler::ProcessEventsToIdle(). So I gave up (again).
Change-Id: Id4b9defae718694aa76a3db01f6b02ead5f98e6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123108
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 8a0455eabcfe..98b7b9401800 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1640,15 +1640,18 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor,
nDiff -= aTabCols[i] - aTabCols[i-1];
tools::Long nTabRight = aTabCols.GetRight() + nDiff;
+const tools::Long nMaxRight = std::max(aTabCols.GetRightMax(),
nOldRight);
-// If the Table would become too wide, we restrict the
-// adjusted amount to the allowed maximum.
-if ( !bBalance && nTabRight > aTabCols.GetRightMax() )
+// If the Table would become (or is already) too wide,
+// restrict the column growth to the allowed maximum.
+if (!bBalance && nTabRight > nMaxRight)
{
-const tools::Long nTmpD = nTabRight -
aTabCols.GetRightMax();
+const tools::Long nTmpD = nTabRight - nMaxRight;
nDiff -= nTmpD;
nTabRight -= nTmpD;
}
+
+// all the remaining columns need to be shifted by the same
amount
for ( size_t i2 = i; i2 < aTabCols.Count(); ++i2 )
aTabCols[i2] += nDiff;
aTabCols.SetRight( nTabRight );
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/basic_coverage/test_split_method.bas | 45 +++-
basic/qa/cppunit/test_vba.cxx |1
basic/qa/vba_tests/split.vb | 57 ++
basic/source/runtime/methods1.cxx |6 ++
4 files changed, 99 insertions(+), 10 deletions(-)
New commits:
commit e090afc29bdff4303f1235080fb169011220be4a
Author: Andreas Heinisch
AuthorDate: Tue Oct 5 21:10:22 2021 +0200
Commit: Andreas Heinisch
CommitDate: Thu Oct 7 08:21:58 2021 +0200
tdf#144924 - Change return type of array elements of the split function
If VBA is not enabled, allow the assignment of variables with different
data types to the individual array elements created by the split
function.
Change-Id: I7bdd432cdebbfded5f7fb3acc0216474eb6b6821
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123122
Tested-by: Andreas Heinisch
Reviewed-by: Andreas Heinisch
diff --git a/basic/qa/basic_coverage/test_split_method.bas
b/basic/qa/basic_coverage/test_split_method.bas
index 2742fcf52301..52ba91fe3a65 100644
--- a/basic/qa/basic_coverage/test_split_method.bas
+++ b/basic/qa/basic_coverage/test_split_method.bas
@@ -7,28 +7,53 @@
Option Explicit
-Function doUnitTest as String
+Function doUnitTest() As String
+TestUtil.TestInit
+verify_testSplit
+doUnitTest = TestUtil.GetResult()
+End Function
-doUnitTest = "FAIL"
+Sub verify_testSplit
+On Error GoTo errorHandler
' SPLIT
-If ( Split( "Hello world" )(1) <> "world" ) Then Exit Function
+TestUtil.AssertEqual(Split( "Hello world" )(1), "world", "Split( ""Hello
world"" )(1)")
' tdf#123025 - split function sets the datatype of the array to empty,
' preventing any subsequent assignments of values to the array and to the
elements itself.
Dim arr(1) As String
arr = Split("a/b", "/")
-If ( arr(0) <> "a" Or arr(1) <> "b" ) Then Exit Function
+TestUtil.AssertEqual(arr(0), "a", "Split(""a/b"", ""/"")(0)")
+TestUtil.AssertEqual(arr(1), "b", "Split(""a/b"", ""/"")(1)")
ReDim Preserve arr(1)
-If ( arr(0) <> "a" Or arr(1) <> "b" ) Then Exit Function
+TestUtil.AssertEqual(arr(0), "a", "ReDim Preserve arr(1)(0)")
+TestUtil.AssertEqual(arr(1), "b", "ReDim Preserve arr(1)(1)")
ReDim arr(1)
-If ( arr(0) <> "" Or arr(1) <> "" ) Then Exit Function
+TestUtil.AssertEqual(arr(0), "", "ReDim arr(1)(0)")
+TestUtil.AssertEqual(arr(1), "", "ReDim arr(1)(1)")
+
arr(0) = "a"
arr(1) = "b"
-If ( arr(0) <> "a" Or arr(1) <> "b" ) Then Exit Function
+TestUtil.AssertEqual(arr(0), "a", "arr(0)")
+TestUtil.AssertEqual(arr(1), "b", "arr(1)")
ReDim Preserve arr(1)
-If ( arr(0) <> "a" Or arr(1) <> "b" ) Then Exit Function
+TestUtil.AssertEqual(arr(0), "a", "ReDim Preserve arr(1)(0) after
assignment")
+TestUtil.AssertEqual(arr(1), "b", "ReDim Preserve arr(1)(1) after
assignment")
-doUnitTest = "OK"
+' tdf#144924 - allow the assignment of different data types to the
individual elements
+Dim splitArr
+splitArr = Split("a/b&/d", "&&")
+Dim i As Integer
+For i = 0 To UBound(splitArr)
+' Without the fix in place, this assignment would have failed
+splitArr(i) = Split(splitArr(i), "/")
+' Without the fix in place, this test would have failed with:
+' - Expected: 8200 (8192 for Array and 8 for String)
+' - Actual : 8(8 for String)
+TestUtil.AssertEqual(VarType(splitArr(i)), 8200,
"VarType(splitArr(i))")
+Next
-End Function
+Exit Sub
+errorHandler:
+TestUtil.ReportErrorHandler("verify_testSplit", Err, Error$, Erl)
+End Sub
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 036d3b52cfe4..9ea572201a30 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -125,6 +125,7 @@ void VBATest::testMiscVBAFunctions()
"sgn.vb",
"sin.vb",
"space.vb",
+"split.vb",
"sqr.vb",
"str.vb",
"strcomp.vb",
diff --git a/basic/qa/vba_tests/split.vb b/basic/qa/vba_tests/split.vb
new file mode 100644
index ..56d4522180b0
--- /dev/null
+++ b/basic/qa/vba_tests/split.vb
@@ -0,0 +1,57 @@
+'
+' 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/.
+'
+
+Option VBASupport 1
+Option Explicit
+
+Function doUnitTest() As String
+TestUtil.TestInit
+verify_testSplit
+doUnitTest = TestUtil.GetResult()
+End Function
+
+Sub verify_testSplit
+On Error GoTo errorHandler
+
+' SPLIT
+TestUtil.AssertEqual(Split( "Hello world" )(1), "world", "Split( ""Hello
world"" )(1)")
+
+' tdf#123025 - split function sets the datatype of the array to empty,
+' preventing any subsequent
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sc/source
sc/qa/unit/rangelst_test.cxx | 14 ++
sc/source/core/tool/rangelst.cxx | 10 +-
sc/source/ui/unoobj/chart2uno.cxx |8
3 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit d138dd209e99300c4fc0412f726b1058fbb0039d
Author: Luboš Luňák
AuthorDate: Wed Oct 6 12:57:15 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 7 09:42:40 2021 +0200
ScRangeList::UpdateReference() join all ranges properly (tdf#140901)
This is basically a revert of 6eb8634a9f62bfe486ecd2f46, which
made this Join() just the last range, probably under the assumption
that the function is always called with just one range to update,
or to avoid the possibility that Join() removes several items
from the list, breaking the next step of the loop. But DeleteArea()
may split several ranges, so we need to make sure to Join()
all of them.
Change-Id: Iea124142335ccdc8fa578344cddce8670c27573d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123135
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit e7ec79fe36a0f22f10167806da80e3c1f30b36e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123154
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index bfd4acd5dae1..4239cc91e8a9 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -520,6 +520,20 @@ void Test::testUpdateReference_DeleteRow()
ScRangeList aList2(ScRange(2,2,0,2,2,0));
aList2.UpdateReference(URM_INSDEL, m_pDoc, ScRange(0,3,0,MAXCOL,MAXROW,0),
0, -1, 0);
CPPUNIT_ASSERT(aList2.empty());
+
+ScRangeList aList3;
+aList3.push_back(ScRange(2,2,0,2,8,0));
+aList3.push_back(ScRange(4,2,0,4,8,0));
+aList3.UpdateReference(URM_INSDEL, m_pDoc, ScRange(2,5,0,MAXCOL,MAXROW,0),
0, -1, 0);
+// Verify all ranges in the list have been updated properly.
+CPPUNIT_ASSERT_EQUAL(size_t(2), aList3.size());
+CPPUNIT_ASSERT_EQUAL(ScRange(2,2,0,2,7,0), aList3[0]);
+CPPUNIT_ASSERT_EQUAL(ScRange(4,2,0,4,7,0), aList3[1]);
+
+ScRangeList aList4(ScRange(0,0,0,MAXCOL,MAXROW,0));
+ScRangeList aList4Copy = aList4;
+aList4.UpdateReference(URM_INSDEL, m_pDoc, ScRange(14,3,0,MAXCOL,7,0), 0,
-2, 0);
+CPPUNIT_ASSERT_EQUAL(aList4Copy, aList4);
}
void Test::testUpdateReference_DeleteLastRow()
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index f87b5027319a..5258783605d8 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -436,7 +436,15 @@ bool ScRangeList::UpdateReference(
if( nDx < 0 || nDy < 0 )
{
size_t n = maRanges.size();
-Join(maRanges[n-1], true);
+for(size_t i = n-1; i > 0;)
+{
+Join(maRanges[i], true);
+// Join() may merge and remove even more than one item,
protect against it.
+if(i >= maRanges.size())
+i = maRanges.size()-1;
+else
+--i;
+}
}
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 3bcdf315db82..945c31442e83 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2716,7 +2716,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
}
}
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes.");
unique_ptr pUndoRanges;
@@ -2729,7 +2729,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
if (bChanged)
{
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes
after the reference update.");
// Bring the change back from the range list to the token list.
@@ -2751,7 +2751,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
if (!m_pRangeIndices || m_pRangeIndices->empty())
{
-OSL_FAIL(" faulty range indices");
+assert(false && " faulty range indices");
break;
}
@@ -2760,7 +2760,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
size_t nCount = rRanges.size();
if (nCount != m_pRangeIndices->size())
{
-OSL_FAIL("range count and range index count differ.");
+assert(false && "range count and range index count differ.");
break;
}
Re: _ssl.cpython-3.8.so does not exist in the tarball
I have another look at it. On 07/10/2021 10:00, Michael Stahl wrote: On 06.10.21 18:25, mcmurchy1917techy wrote: Found my mistake. I should have set the --enable-python flag in autogen to system that's not a mistake, the internal one ought to build, but it's not possible to figure out from the log why it failed: Failed to build these modules: _ssl Could not build the ssl module! Python requires an OpenSSL 1.0.2 or 1.1 compatible libssl with X509_VERIFY_PARAM_set1_host(). LibreSSL 2.6.4 and earlier do not provide the necessary APIs, https://github.com/libressl-portable/portable/issues/381 running build_scripts On my system I ran strings --print-file-name $(locate libssl) | grep X509_VERIFY_PARAM_set1_host which returned /lib/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /lib64/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /usr/lib/libssl.so: X509_VERIFY_PARAM_set1_host /usr/lib/libssl.so.1.1: X509_VERIFY_PARAM_set1_host /usr/lib64/libssl.so: X509_VERIFY_PARAM_set1_host /usr/lib64/libssl.so.1.1: X509_VERIFY_PARAM_set1_host So is it telling me that this python3 build is seeing X509_VERIFY_PARAM_set1_host at the beginning, but not at the end? the error message appears to be generic - it's possible that the problem doesn't have anything to do with "X509_VERIFY_PARAM_set1_host". perhaps there are more details further up in the log, or in a different log file. also, the openssl may be used either internal or from the system, depending on --with-system-openssl/--with-system-libs.
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 127 ++-
1 file changed, 71 insertions(+), 56 deletions(-)
New commits:
commit 02f8dba5df5296c3b8c5d6aab46bea53235314fb
Author: Caolán McNamara
AuthorDate: Thu Oct 7 11:56:29 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 7 15:24:28 2021 +0200
fix "gtk_bin_remove: assertion 'priv->child == child' failed" warning
on closing a document from tdf#141633 with a combobox in the tableform.
So remove the mouse event widget before we remove the combobox
replacement
Change-Id: I95395ba60bb5fe7cf0b6e25176d0556c6bcc6611
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123210
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 762870b912ac..3cd60a2777a6 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2714,6 +2714,74 @@ protected:
}
}
+void DisconnectMouseEvents()
+{
+if (m_nButtonPressSignalId)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+g_signal_handler_disconnect(get_click_controller(),
m_nButtonPressSignalId);
+#else
+g_signal_handler_disconnect(m_pMouseEventBox,
m_nButtonPressSignalId);
+#endif
+m_nButtonPressSignalId = 0;
+}
+if (m_nMotionSignalId)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+g_signal_handler_disconnect(get_motion_controller(),
m_nMotionSignalId);
+#else
+g_signal_handler_disconnect(m_pMouseEventBox, m_nMotionSignalId);
+#endif
+m_nMotionSignalId = 0;
+}
+if (m_nLeaveSignalId)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+g_signal_handler_disconnect(get_motion_controller(),
m_nLeaveSignalId);
+#else
+g_signal_handler_disconnect(m_pMouseEventBox, m_nLeaveSignalId);
+#endif
+m_nLeaveSignalId = 0;
+}
+if (m_nEnterSignalId)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+g_signal_handler_disconnect(get_motion_controller(),
m_nEnterSignalId);
+#else
+g_signal_handler_disconnect(m_pMouseEventBox, m_nEnterSignalId);
+#endif
+m_nEnterSignalId = 0;
+}
+if (m_nButtonReleaseSignalId)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+g_signal_handler_disconnect(get_click_controller(),
m_nButtonReleaseSignalId);
+#else
+g_signal_handler_disconnect(m_pMouseEventBox,
m_nButtonReleaseSignalId);
+#endif
+m_nButtonReleaseSignalId = 0;
+}
+
+#if !GTK_CHECK_VERSION(4, 0, 0)
+if (m_pMouseEventBox && m_pMouseEventBox != m_pWidget)
+{
+// put things back they way we found them
+GtkWidget* pParent = gtk_widget_get_parent(m_pMouseEventBox);
+
+g_object_ref(m_pWidget);
+gtk_container_remove(GTK_CONTAINER(m_pMouseEventBox), m_pWidget);
+
+gtk_widget_destroy(m_pMouseEventBox);
+
+gtk_container_add(GTK_CONTAINER(pParent), m_pWidget);
+// coverity[freed_arg : FALSE] - this does not free m_pWidget, it
is reffed by pParent
+g_object_unref(m_pWidget);
+
+m_pMouseEventBox = m_pWidget;
+}
+#endif
+}
+
private:
bool m_bTakeOwnership;
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -4164,46 +4232,6 @@ public:
g_signal_handler_disconnect(m_pWidget, m_nKeyReleaseSignalId);
#endif
}
-if (m_nButtonPressSignalId)
-{
-#if GTK_CHECK_VERSION(4, 0, 0)
-g_signal_handler_disconnect(get_click_controller(),
m_nButtonPressSignalId);
-#else
-g_signal_handler_disconnect(m_pMouseEventBox,
m_nButtonPressSignalId);
-#endif
-}
-if (m_nMotionSignalId)
-{
-#if GTK_CHECK_VERSION(4, 0, 0)
-g_signal_handler_disconnect(get_motion_controller(),
m_nMotionSignalId);
-#else
-g_signal_handler_disconnect(m_pMouseEventBox, m_nMotionSignalId);
-#endif
-}
-if (m_nLeaveSignalId)
-{
-#if GTK_CHECK_VERSION(4, 0, 0)
-g_signal_handler_disconnect(get_motion_controller(),
m_nLeaveSignalId);
-#else
-g_signal_handler_disconnect(m_pMouseEventBox, m_nLeaveSignalId);
-#endif
-}
-if (m_nEnterSignalId)
-{
-#if GTK_CHECK_VERSION(4, 0, 0)
-g_signal_handler_disconnect(get_motion_controller(),
m_nEnterSignalId);
-#else
-g_signal_handler_disconnect(m_pMouseEventBox, m_nEnterSignalId);
-#endif
-}
-if (m_nButtonReleaseSignalId)
-{
-#if GTK_CHECK_VERSION(4, 0, 0)
-g_signal_handler_disconnect(get_click_controller(),
m_nButtonReleaseSignalId);
-#else
-g_signal_handler_disconnect(m_pMouseEventBox,
m_nButtonReleaseSignalId);
-#endif
-}
if (m_nFocusInSignalId)
{
@@ -4228,22 +4256,7 @@ public:
do_set_background(COL_AUTO);
-#if !GTK_CHECK_VERSION(4, 0, 0)
-
[Libreoffice-commits] help.git: source/text
source/text/simpress/00/0403.xhp |4 ++-- source/text/simpress/01/0307.xhp |2 +- source/text/simpress/01/0313.xhp |4 ++-- source/text/simpress/main0114.xhp|2 +- source/text/simpress/main0211.xhp|2 +- source/text/simpress/main0212.xhp|2 +- 6 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 163eaf2bf056073232a1336632e11e535c8a3000 Author: Johnny_M AuthorDate: Sat Oct 2 12:30:37 2021 +0200 Commit: Olivier Hallot CommitDate: Thu Oct 7 15:42:25 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I21c6c82f5b7c5f6543ff6975243b25cea6c13234 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122988 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/simpress/00/0403.xhp b/source/text/simpress/00/0403.xhp index 093b4fa30..436e08979 100644 --- a/source/text/simpress/00/0403.xhp +++ b/source/text/simpress/00/0403.xhp @@ -57,12 +57,12 @@ Choose View - Master Handout - + Choose Slide Show - Slide Show F5 On the Standard toolbar, click - + diff --git a/source/text/simpress/01/0307.xhp b/source/text/simpress/01/0307.xhp index 9d7c7228c..0bc935260 100644 --- a/source/text/simpress/01/0307.xhp +++ b/source/text/simpress/01/0307.xhp @@ -43,6 +43,6 @@ - + diff --git a/source/text/simpress/01/0313.xhp b/source/text/simpress/01/0313.xhp index 5d3e60294..f5e1a15b2 100644 --- a/source/text/simpress/01/0313.xhp +++ b/source/text/simpress/01/0313.xhp @@ -30,13 +30,13 @@ -MW transferred three index entries to the guide show.xhp +MW transferred three index entries to the guide show.xhp Slide Show Starts your slide show. - + You can specify settings for running a slide show in Slide Show - Slide Show Settings. Specify whether a slide show starts with the current slide or with the first slide on %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Impress - General. diff --git a/source/text/simpress/main0114.xhp b/source/text/simpress/main0114.xhp index 2f825c880..325e20308 100644 --- a/source/text/simpress/main0114.xhp +++ b/source/text/simpress/main0114.xhp @@ -34,7 +34,7 @@ Slide Show Contains commands and options for running a presentation. - + Slide Show Settings diff --git a/source/text/simpress/main0211.xhp b/source/text/simpress/main0211.xhp index aadc5d030..7b905e664 100644 --- a/source/text/simpress/main0211.xhp +++ b/source/text/simpress/main0211.xhp @@ -50,6 +50,6 @@ Slide Show - + diff --git a/source/text/simpress/main0212.xhp b/source/text/simpress/main0212.xhp index 3821c7b09..feadc64a9 100644 --- a/source/text/simpress/main0212.xhp +++ b/source/text/simpress/main0212.xhp @@ -38,6 +38,6 @@ Slide Show - +
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 21c78b4e94c6cfb9ec38fd4c94091559f8850344
Author: Caolán McNamara
AuthorDate: Thu Oct 7 09:21:28 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 7 14:54:12 2021 +0200
ofz: Timeout, detect infinite loop
Change-Id: I3234443e2dde9d68b7704fdd3ccf6bdeebef5ee0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123205
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 1bbeb17334a3..5328487e1313 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1789,11 +1789,22 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29,
SwWW8ImplReader* pIo)
ww::WordVersion eVer = pIo->GetFib().GetFIBVersion();
WW8FlyPara *pNowStyleApo=nullptr;
sal_uInt16 nColl = pPap->GetIstd();
-ww::sti eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc(
static_cast< sal_uInt8 >(nColl) ) : static_cast(nColl);
-while (eSti != ww::stiNil && sal::static_int_cast(nColl) <
pIo->m_vColl.size() && nullptr == (pNowStyleApo =
pIo->m_vColl[nColl].m_xWWFly.get()))
+
+o3tl::sorted_vector aSeenStyles;
+ww::sti eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc(nColl)
: static_cast(nColl);
+while (eSti != ww::stiNil && static_cast(nColl) <
pIo->m_vColl.size() && nullptr == (pNowStyleApo =
pIo->m_vColl[nColl].m_xWWFly.get()))
{
+aSeenStyles.insert(nColl);
+
nColl = pIo->m_vColl[nColl].m_nBase;
-eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc(
static_cast< sal_uInt8 >(nColl) ) : static_cast(nColl);
+
+if (aSeenStyles.find(nColl) != aSeenStyles.end())
+{
+SAL_WARN("sw.ww8", "loop in style chain");
+break;
+}
+
+eSti = eVer < ww::eWW6 ? ww::GetCanonicalStiFromStc(nColl) :
static_cast(nColl);
}
WW8FlyPara aF(bVer67, pNowStyleApo);
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AllLangMoTarget.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit efcbb6d89f49079e9ca7a2b3689699ccfcb6bf2a Author: Caolán McNamara AuthorDate: Wed Oct 6 17:12:11 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Oct 7 14:56:38 2021 +0200 remove python make dependency from MoTarget not needed since... commit 7fdf1663ed8e689e7fb154ab22a9dcb7fc7bf43c Author: Caolán McNamara Date: Thu Sep 14 15:57:38 2017 +0100 remove interim update module for gettext support Change-Id: I05df619848cde842a5cda79d20e013914ce882d4 Change-Id: I094c033db356f32b93c77f7bdbd4ce5be8b0b0ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123151 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk index 681c399d5860..ec05985d5ecc 100644 --- a/solenv/gbuild/AllLangMoTarget.mk +++ b/solenv/gbuild/AllLangMoTarget.mk @@ -32,9 +32,7 @@ $(call gb_MoTarget_get_clean_target,%) : $(call gb_MoTarget_get_target,$*) \ $(call gb_MoTarget_get_install_target,$*)) -$(call gb_MoTarget_get_target,%) : \ - $(gb_Helper_MISCDUMMY) \ - $(call gb_ExternalExecutable_get_dependencies,python) +$(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY) $(call gb_Output_announce,$*,$(true),MO ,2) $(call gb_Trace_StartRange,$*,MO ) $(call gb_Helper_abbreviate_dirs,\
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/sharedvisitor/analyzer.cxx | 86 ++
compilerplugins/clang/sharedvisitor/generator.cxx | 78 +--
2 files changed, 80 insertions(+), 84 deletions(-)
New commits:
commit f79bdaf1fae14d7028bb1670ec8a674ff2026491
Author: Julien Nabet
AuthorDate: Wed Oct 6 21:45:40 2021 +0200
Commit: Julien Nabet
CommitDate: Thu Oct 7 15:22:56 2021 +0200
drop 'using namespace std' in compilerplugins
Change-Id: I12b4e32b9561657bdbe062b5fb7c18e2ef6ce601
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123196
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/compilerplugins/clang/sharedvisitor/analyzer.cxx
b/compilerplugins/clang/sharedvisitor/analyzer.cxx
index ea519abb0d95..381bd03759ed 100644
--- a/compilerplugins/clang/sharedvisitor/analyzer.cxx
+++ b/compilerplugins/clang/sharedvisitor/analyzer.cxx
@@ -26,8 +26,6 @@
#include "../check.hxx"
#include "../check.cxx"
-using namespace std;
-
using namespace clang;
using namespace llvm;
@@ -36,8 +34,8 @@ using namespace loplugin;
// Info about a Traverse* function in a plugin.
struct TraverseFunctionInfo
{
-string name;
-string argument;
+std::string name;
+std::string argument;
bool hasPre = false;
bool hasPost = false;
};
@@ -50,7 +48,7 @@ struct TraverseFunctionInfoLess
}
};
-static set< TraverseFunctionInfo, TraverseFunctionInfoLess > traverseFunctions;
+static std::set< TraverseFunctionInfo, TraverseFunctionInfoLess >
traverseFunctions;
class CheckFileVisitor
: public RecursiveASTVisitor< CheckFileVisitor >
@@ -100,7 +98,7 @@ static TraverseFunctionInfo
findOrCreateTraverseFunctionInfo( StringRef name )
auto foundInfo = traverseFunctions.find( info );
if( foundInfo != traverseFunctions.end())
{
-info = move( *foundInfo );
+info = std::move( *foundInfo );
traverseFunctions.erase( foundInfo );
}
return info;
@@ -116,10 +114,10 @@ bool CheckFileVisitor::VisitCXXRecordDecl( CXXRecordDecl*
decl )
if( decl->getName() == "FilteringPlugin" || decl->getName() ==
"FilteringRewritePlugin" )
return true;
-cout << "# This file is autogenerated. Do not modify." << endl;
-cout << "# Generated by compilerplugins/clang/sharedvisitor/analyzer.cxx
." << endl;
-cout << "InfoVersion:1" << endl;
-cout << "ClassName:" << decl->getName().str() << endl;
+std::cout << "# This file is autogenerated. Do not modify." << std::endl;
+std::cout << "# Generated by
compilerplugins/clang/sharedvisitor/analyzer.cxx ." << std::endl;
+std::cout << "InfoVersion:1" << std::endl;
+std::cout << "ClassName:" << decl->getName().str() << std::endl;
traverseFunctions.clear();
for( const CXXMethodDecl* method : decl->methods())
{
@@ -131,18 +129,18 @@ bool CheckFileVisitor::VisitCXXRecordDecl( CXXRecordDecl*
decl )
{
if( method->getNumParams() == 1 )
{
-cout << "VisitFunctionStart" << endl;
-cout << "VisitFunctionName:" << method->getName().str() <<
endl;
-cout << "VisitFunctionArgument:"
+std::cout << "VisitFunctionStart" << std::endl;
+std::cout << "VisitFunctionName:" << method->getName().str()
<< std::endl;
+std::cout << "VisitFunctionArgument:"
<< unqualifyPointeeType(
method->getParamDecl( 0
)->getTypeSourceInfo()->getType()).getAsString()
-<< endl;
-cout << "VisitFunctionEnd" << endl;
+<< std::endl;
+std::cout << "VisitFunctionEnd" << std::endl;
}
else
{
-cerr << "Unhandled Visit* function: " << decl->getName().str()
- << "::" << method->getName().str() << endl;
+std::cerr << "Unhandled Visit* function: " <<
decl->getName().str()
+ << "::" << method->getName().str() << std::endl;
abort();
}
}
@@ -152,12 +150,12 @@ bool CheckFileVisitor::VisitCXXRecordDecl( CXXRecordDecl*
decl )
{
TraverseFunctionInfo traverseInfo =
findOrCreateTraverseFunctionInfo( method->getName());
traverseInfo.argument = method->getParamDecl( 0
)->getTypeSourceInfo()->getType().getAsString();
-traverseFunctions.insert( move( traverseInfo ));
+traverseFunctions.insert( std::move( traverseInfo ));
}
else
{
-cerr << "Unhandled Traverse* function: " <<
decl->getName().str()
- << "::" << method->getName().str() << endl;
+std::cerr << "Unhandled Traverse* function: " <<
decl->getName().str()
+ << "::" << method->getName().str() << std::endl;
abort();
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d6a72f556b532c3a289276492bf7f1e2bdd5d1b Author: Johnny_M AuthorDate: Thu Oct 7 15:42:26 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Oct 7 15:42:26 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 163eaf2bf056073232a1336632e11e535c8a3000 - tdf#132643 Translate German section IDs Change-Id: I21c6c82f5b7c5f6543ff6975243b25cea6c13234 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122988 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e11fca7e6ef3..163eaf2bf056 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e11fca7e6ef36de4e49473b3ff3126678fd41225 +Subproject commit 163eaf2bf056073232a1336632e11e535c8a3000
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx | 61 +++--
1 file changed, 32 insertions(+), 29 deletions(-)
New commits:
commit 69c9237f0345c5b92792f6350771618f5c9cb8c2
Author: Jim Raykowski
AuthorDate: Wed Oct 6 19:19:40 2021 -0800
Commit: Jim Raykowski
CommitDate: Thu Oct 7 16:08:12 2021 +0200
SwNavigator: Fix crash on image select
Fixes crash that occurs in update tracking test for bookmark when image
is selected by testing that selection type is text before testing for
bookmark.
Change-Id: I53c64a71d3aff0f159bff31b98e2f453d7c2225a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123202
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index fb7aab99847d..5e89303edf3b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3568,39 +3568,42 @@ void SwContentTree::UpdateTracking()
return;
}
// bookmarks - track first bookmark at cursor
-SwDoc* pDoc = m_pActiveShell->GetDoc();
-uno::Reference
xBookmarksSupplier(pDoc->GetDocShell()->GetBaseModel(),
-
uno::UNO_QUERY);
-uno::Reference
xBookmarks(xBookmarksSupplier->getBookmarks(),
- uno::UNO_QUERY);
-sal_Int32 nBookmarkCount = xBookmarks->getCount();
-if (nBookmarkCount && !(m_bIsRoot && m_nRootType !=
ContentTypeId::BOOKMARK))
+if (m_pActiveShell->GetSelectionType() & SelectionType::Text)
{
-SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
-uno::Reference xRange(
-SwXTextRange::CreateXTextRange(*pDoc, *pCursor->GetPoint(),
nullptr));
-for (sal_Int32 i = 0; i < nBookmarkCount; ++i)
+SwDoc* pDoc = m_pActiveShell->GetDoc();
+uno::Reference
xBookmarksSupplier(pDoc->GetDocShell()->GetBaseModel(),
+
uno::UNO_QUERY);
+uno::Reference
xBookmarks(xBookmarksSupplier->getBookmarks(),
+ uno::UNO_QUERY);
+sal_Int32 nBookmarkCount = xBookmarks->getCount();
+if (nBookmarkCount && !(m_bIsRoot && m_nRootType !=
ContentTypeId::BOOKMARK))
{
-uno::Reference bookmark;
-xBookmarks->getByIndex(i) >>= bookmark;
-try
-{
-uno::Reference bookmarkRange =
bookmark->getAnchor();
-uno::Reference
xTextRangeCompare(xRange->getText(),
-
uno::UNO_QUERY);
-if (xTextRangeCompare.is()
-&&
xTextRangeCompare->compareRegionStarts(bookmarkRange, xRange) != -1
-&& xTextRangeCompare->compareRegionEnds(xRange,
bookmarkRange) != -1)
+SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
+uno::Reference xRange(
+SwXTextRange::CreateXTextRange(*pDoc,
*pCursor->GetPoint(), nullptr));
+for (sal_Int32 i = 0; i < nBookmarkCount; ++i)
+{
+uno::Reference bookmark;
+xBookmarks->getByIndex(i) >>= bookmark;
+try
+{
+uno::Reference bookmarkRange =
bookmark->getAnchor();
+uno::Reference
xTextRangeCompare(xRange->getText(),
+
uno::UNO_QUERY);
+if (xTextRangeCompare.is()
+&&
xTextRangeCompare->compareRegionStarts(bookmarkRange, xRange) != -1
+&& xTextRangeCompare->compareRegionEnds(xRange,
bookmarkRange) != -1)
+{
+uno::Reference xBookmark(bookmark,
uno::UNO_QUERY);
+lcl_SelectByContentTypeAndName(this, *m_xTreeView,
+
SwResId(STR_CONTENT_TYPE_BOOKMARK),
+ xBookmark->getName());
+return;
+}
+}
+catch (const lang::IllegalArgumentException&)
{
-uno::Reference xBookmark(bookmark,
uno::UNO_QUERY);
-lcl_SelectByContentTypeAndName(this, *m_xTreeView,
-
SwResId(STR_CONTENT_TYPE_BOOKMARK),
- xBookmark->getName());
-return;
}
-}
-catch (const lang::IllegalArgumentException&)
-{
}
}
}
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/pastespecial.ui | 25 + 1 file changed, 25 insertions(+) New commits: commit 66b5d2117004f32d89ea10cdd7e086f9f1ff35b0 Author: Rafael Lima AuthorDate: Tue Aug 31 23:01:48 2021 +0200 Commit: Rafael Lima CommitDate: Thu Oct 7 16:20:50 2021 +0200 Add extended tooltips to new Paste Special dialog The new Paste Special dialog in Calc has 4 new presets and a new checkbox. This patch adds extended tooltips for them. Change-Id: I7d4c5fdb140a49c50b733e50b23d2618127f2c63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121413 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui index 2151d1042f1f..eb59363b76e7 100644 --- a/sc/uiconfig/scalc/ui/pastespecial.ui +++ b/sc/uiconfig/scalc/ui/pastespecial.ui @@ -136,6 +136,11 @@ True top True + + +Pastes numbers, text, dates and the results of formulas. + + False @@ -154,6 +159,11 @@ True top True + + +Pastes cell values, formula results and formats applied to cells. + + False @@ -172,6 +182,11 @@ True top True + + +Pastes only the formats from the source range without changing the values in the destination range. + + False @@ -190,6 +205,11 @@ True top True + + +Pastes cell contents transposed, hence columns are converted to rows. + + False @@ -213,6 +233,11 @@ True True True + + +Check this option to run the preset immediately. Uncheck it to manipulate the options before clicking OK. + + True
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/tools/emfpstringformat.cxx | 64 +
1 file changed, 14 insertions(+), 50 deletions(-)
New commits:
commit a2b1c2835733fb028bc5433eb6805820c329daf3
Author: Hossein
AuthorDate: Thu Oct 7 00:12:24 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu Oct 7 15:06:23 2021 +0200
Clean StringFormatFlags() in emfpstringformat.cxx
* Fix: StringFormatDirectionVertical was missing, and another enum
was used instead by mistake
* Cleaned up StringFormatFlags() method
+ There was no need to check for each flag and add ", "
+ The method is only used for SAL_INFO
+ Just adding space in the end of each flag every time
+ Goal: Making code faster and also more readable
Change-Id: I4be2d291611f2b5d3c8a4490a8b273d5a4511dfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123200
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/drawinglayer/source/tools/emfpstringformat.cxx
b/drawinglayer/source/tools/emfpstringformat.cxx
index 071493c13062..0a053201b4ec 100644
--- a/drawinglayer/source/tools/emfpstringformat.cxx
+++ b/drawinglayer/source/tools/emfpstringformat.cxx
@@ -46,75 +46,39 @@ namespace emfplushelper
{
OUStringBuffer sFlags;
+// These are extracted from enum in emfpstringformat.hxx
if (flag & StringFormatDirectionRightToLeft)
-sFlags.append("StringFormatDirectionRightToLeft");
+sFlags.append("StringFormatDirectionRightToLeft ");
-if (flag & StringFormatDirectionRightToLeft)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
-
-sFlags.append("StringFormatDirectionRightToLeft");
-}
+if (flag & StringFormatDirectionVertical)
+sFlags.append("StringFormatDirectionVertical ");
if (flag & StringFormatNoFitBlackBox)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
-
-sFlags.append("StringFormatNoFitBlackBox");
-}
+sFlags.append("StringFormatNoFitBlackBox ");
if (flag & StringFormatDisplayFormatControl)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatDisplayFormatControl ");
-sFlags.append("StringFormatDisplayFormatControl");
-}
if (flag & StringFormatNoFontFallback)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatNoFontFallback ");
-sFlags.append("StringFormatNoFontFallback");
-}
if (flag & StringFormatMeasureTrailingSpaces)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatMeasureTrailingSpaces ");
-sFlags.append("StringFormatMeasureTrailingSpaces");
-}
if (flag & StringFormatNoWrap)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatNoWrap ");
-sFlags.append("StringFormatNoWrap");
-}
if (flag & StringFormatLineLimit)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatLineLimit ");
-sFlags.append("StringFormatLineLimit");
-}
if (flag & StringFormatNoClip)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
+sFlags.append("StringFormatNoClip ");
-sFlags.append("StringFormatNoClip");
-}
if (flag & StringFormatBypassGDI)
-{
-if (!sFlags.isEmpty())
-sFlags.append(", ");
-
-sFlags.append("StringFormatBypassGDI");
-}
+sFlags.append("StringFormatBypassGDI ");
+// There will be 1 extra space in the end. It could be truncated, but
+// as it is for SAL_INFO() only, it would not be important
return sFlags.makeStringAndClear();
}
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - 3 commits - sw/qa sw/source
sw/qa/extras/layout/data/tdf134298.ott |binary
sw/qa/extras/layout/data/tdf138039.odt |binary
sw/qa/extras/layout/layout.cxx | 45 +
sw/source/core/inc/pagefrm.hxx |3
sw/source/core/layout/layact.cxx | 20 +++---
sw/source/core/layout/pagechg.cxx | 108 -
sw/source/core/layout/tabfrm.cxx | 36 ++-
sw/source/core/layout/wsfrm.cxx| 16
8 files changed, 177 insertions(+), 51 deletions(-)
New commits:
commit df406aee8f084d0a756797768ba40e27a322c1b0
Author: Michael Stahl
AuthorDate: Fri Nov 13 20:52:28 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Oct 7 15:59:04 2021 +0200
tdf#134298 sw: layout: remove left-over page frame without content
Once tdf#138039 is fixed, this bugdoc has an additional empty page 3.
This is because it first goes to 3 pages, and then the SwTextFrame
on page does a MoveBwd, leaving behind a page frame with just a body
frame and nothing else.
It turns out that SwRootFrame::RemoveSuperfluous() only removes
empty frames at the end of the document, but here there's a non-empty
frame following it. Also, this function doesn't handle cases like
right/left page styles so it can't delete pages in the middle.
SwFrame::CheckPageDescs() doesn't remove page frames that don't have
content, it only removes those that have the intentionally-empty flag set.
Extend CheckPageDescs() to also remove page frames that don't have
content, and make sure it is called when SwContentFrame::Cut()
removes the last content from a page frame (it will be called after
all pages are valid in SwLayAction::InternalAction()).
(Alternatively it might be possible to prevent the problem from
occurring in SwTextFly::ForEach() by ignoring the fly so that the first
paragraph never leaves page 1, but we didn't explore that.)
(cherry picked from commit b9ef71476fd70bc13f50ebe80390e0730d1b7afb)
Conflicts:
sw/qa/extras/layout/layout2.cxx
sw/source/core/layout/pagechg.cxx
Change-Id: I3a3f1efe6d7ed28e05dc159a86abc3d702cc272b
diff --git a/sw/qa/extras/layout/data/tdf134298.ott
b/sw/qa/extras/layout/data/tdf134298.ott
new file mode 100644
index ..effb595eb328
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134298.ott differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index b8dd065967c4..cb873bbf59b6 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -4259,6 +4259,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf138039)
assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored", 0);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134298)
+{
+createDoc("tdf134298.ott");
+
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// there are 2 pages
+assertXPath(pXmlDoc, "/root/page", 2);
+// table and first para on first page
+assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/anchored", 0);
+// paragraph with large fly on second page
+assertXPath(pXmlDoc, "/root/page[2]/body/tab", 0);
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
+assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
+assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top", "17897");
+assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "height",
+"15819");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 3c7f29f52ad0..c8101ef3157b 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -438,6 +438,9 @@ SwTextGridItem const* GetGridItem(SwPageFrame const*const);
sal_uInt16 GetGridWidth(SwTextGridItem const&, SwDoc const&);
+namespace sw { bool IsPageFrameEmpty(SwPageFrame const& rPage); }
+
+
#endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index a3188eb2a5ca..e119ee4dca08 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -991,11 +991,67 @@ void SwPageFrame::PrepareRegisterChg()
}
}
+namespace sw {
+
+/// check if there's content on the page that requires it to exist
+bool IsPageFrameEmpty(SwPageFrame const& rPage)
+{
+bool bExistEssentialObjs = ( nullptr != rPage.GetSortedObjs() );
+if ( bExistEssentialObjs )
+{
+// Only because the page has Flys does not mean that it is needed. If
all Flys are
+// attached to generic content it is also superfluous (checking
DocBody should be enough)
+
[Libreoffice-commits] core.git: editeng/source include/editeng
editeng/source/editeng/impedit4.cxx |2 +-
editeng/source/editeng/misspellrange.cxx |4 ++--
editeng/source/outliner/outliner.cxx |2 +-
editeng/source/outliner/outlobj.cxx |8
include/editeng/misspellrange.hxx|2 +-
include/editeng/outlobj.hxx |4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit a5a6071264d27b9dcfa47fe2f399951edd7301c2
Author: Noel Grandin
AuthorDate: Wed Oct 6 21:01:06 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 7 16:22:48 2021 +0200
loplugin:moveparam in editeng
Change-Id: Id8118e5f5b7acbff4f04935560c663b36093a5fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123189
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 879274a2a667..d6071f2a355a 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1359,7 +1359,7 @@ void ImpEditEngine::GetAllMisspellRanges(
std::vector&
if (!pWrongList)
continue;
-aRanges.emplace_back(i, pWrongList->GetRanges());
+aRanges.emplace_back(i, std::vector(pWrongList->GetRanges()));
}
aRanges.swap(rRanges);
diff --git a/editeng/source/editeng/misspellrange.cxx
b/editeng/source/editeng/misspellrange.cxx
index 40fe5dd1b76e..562a9905c27d 100644
--- a/editeng/source/editeng/misspellrange.cxx
+++ b/editeng/source/editeng/misspellrange.cxx
@@ -13,8 +13,8 @@ namespace editeng {
MisspellRange::MisspellRange(size_t nStart, size_t nEnd) : mnStart(nStart),
mnEnd(nEnd) {}
-MisspellRanges::MisspellRanges(sal_Int32 nParagraph, const
std::vector& rRanges) :
-mnParagraph(nParagraph), maRanges(rRanges) {}
+MisspellRanges::MisspellRanges(sal_Int32 nParagraph,
std::vector&& rRanges) :
+mnParagraph(nParagraph), maRanges(std::move(rRanges)) {}
}
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 4eacd5d76d82..c827b13a5937 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -381,7 +381,7 @@ std::optional
Outliner::CreateParaObject( sal_Int32 nStartPa
aParagraphDataVector[nPara-nStartPara] = *GetParagraph(nPara);
}
-OutlinerParaObject aPObj(std::move(xText), aParagraphDataVector,
bIsEditDoc);
+OutlinerParaObject aPObj(std::move(xText),
std::move(aParagraphDataVector), bIsEditDoc);
aPObj.SetOutlinerMode(GetOutlinerMode());
return aPObj;
diff --git a/editeng/source/outliner/outlobj.cxx
b/editeng/source/outliner/outlobj.cxx
index 0c0050ebaded..e6dc6e691c6c 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -29,9 +29,9 @@
#include
#include
-OutlinerParaObjData::OutlinerParaObjData( std::unique_ptr
pEditTextObject, const ParagraphDataVector& rParagraphDataVector, bool
bIsEditDoc ) :
+OutlinerParaObjData::OutlinerParaObjData( std::unique_ptr
pEditTextObject, ParagraphDataVector&& rParagraphDataVector, bool bIsEditDoc ) :
mpEditTextObject(std::move(pEditTextObject)),
-maParagraphDataVector(rParagraphDataVector),
+maParagraphDataVector(std::move(rParagraphDataVector)),
mbIsEditDoc(bIsEditDoc)
{
if( maParagraphDataVector.empty() &&
(mpEditTextObject->GetParagraphCount() != 0) )
@@ -62,8 +62,8 @@ bool OutlinerParaObjData::isWrongListEqual(const
OutlinerParaObjData& rCompare)
}
OutlinerParaObject::OutlinerParaObject(
-std::unique_ptr xTextObj, const ParagraphDataVector&
rParagraphDataVector, bool bIsEditDoc ) :
-mpImpl(OutlinerParaObjData(std::move(xTextObj), rParagraphDataVector,
bIsEditDoc))
+std::unique_ptr xTextObj, ParagraphDataVector&&
rParagraphDataVector, bool bIsEditDoc ) :
+mpImpl(OutlinerParaObjData(std::move(xTextObj),
std::move(rParagraphDataVector), bIsEditDoc))
{
}
diff --git a/include/editeng/misspellrange.hxx
b/include/editeng/misspellrange.hxx
index d67fc82f592c..f46c25e2261c 100644
--- a/include/editeng/misspellrange.hxx
+++ b/include/editeng/misspellrange.hxx
@@ -29,7 +29,7 @@ struct MisspellRanges
sal_Int32 mnParagraph;
std::vector maRanges;
-MisspellRanges(sal_Int32 nParagraph, const std::vector&
rRanges);
+MisspellRanges(sal_Int32 nParagraph, std::vector&& rRanges);
};
}
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 8ba1dedb3f16..1703cf09cf34 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -44,7 +44,7 @@ struct EDITENG_DLLPUBLIC OutlinerParaObjData
bool mbIsEditDoc;
// constructor
-OutlinerParaObjData( std::unique_ptr pEditTextObject,
const ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc );
+OutlinerParaObjData( std::unique_ptr pEditTextObject,
ParagraphDataVector&& rParagraphDataVector, bool bIsEditDoc );
OutlinerParaObjData( const
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - include/vcl vcl/inc vcl/source
include/vcl/svapp.hxx |3 +
vcl/inc/window.h | 10 +++
vcl/source/app/svapp.cxx | 68 ++
vcl/source/window/winproc.cxx | 126 +-
4 files changed, 205 insertions(+), 2 deletions(-)
New commits:
commit 8a0ada00e20f1450d29a4f8ab416d3e6c96d9600
Author: Henry Castro
AuthorDate: Wed Jun 23 08:37:34 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:40:39 2021 +0200
lok: introduce Application::LOKHandleMouseEvent
Entry point to call the ImplLOKHandleMouseEvent function
mainly to process mouse events.
Change-Id: I17513643733bf5990d41ab8cf47cdc322ed526ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118846
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index d6a6bfbc5065..3746b09dcc6a 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -741,6 +741,9 @@ public:
*/
static ImplSVEvent *PostKeyEvent( VclEventId nEvent, vcl::Window
*pWin, KeyEvent const * pKeyEvent );
+
+static bool LOKHandleMouseEvent( VclEventId nEvent,
vcl::Window *pWin, const MouseEvent* pEvent );
+
/** Send mouse event
@param nEvent Event ID for mouse event
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 928481aa23a5..aebd513426f9 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
@@ -96,6 +97,10 @@ bool isEnabledInLayout(const vcl::Window *pWindow);
bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void*
pEvent );
+MouseEventModifiers ImplGetMouseMoveMode( SalMouseEvent const * pEvent );
+
+MouseEventModifiers ImplGetMouseButtonMode( SalMouseEvent const * pEvent );
+
struct ImplWinData
{
std::optional
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 10ca0e206325..efffc46d3b56 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -898,6 +898,74 @@ ImplSVEvent* Application::PostGestureEvent(VclEventId
nEvent, vcl::Window* pWin,
return nEventId;
}
+bool Application::LOKHandleMouseEvent(VclEventId nEvent, vcl::Window* pWindow,
const MouseEvent* pEvent)
+{
+bool bSuccess = false;
+SalMouseEvent aMouseEvent;
+
+if (!pWindow)
+return false;
+
+if (!pEvent)
+return false;
+
+aMouseEvent.mnTime = tools::Time::GetSystemTicks();
+aMouseEvent.mnX = pEvent->GetPosPixel().X();
+aMouseEvent.mnY = pEvent->GetPosPixel().Y();
+aMouseEvent.mnCode = pEvent->GetButtons() | pEvent->GetModifier();
+
+switch (nEvent)
+{
+case VclEventId::WindowMouseMove:
+aMouseEvent.mnButton = 0;
+bSuccess = ImplLOKHandleMouseEvent(pWindow,
MouseNotifyEvent::MOUSEMOVE, false,
+ aMouseEvent.mnX,
aMouseEvent.mnY,
+ aMouseEvent.mnTime,
aMouseEvent.mnCode,
+
ImplGetMouseMoveMode(),
+ pEvent->GetClicks());
+break;
+
+case VclEventId::WindowMouseButtonDown:
+aMouseEvent.mnButton = pEvent->GetButtons();
+bSuccess = ImplLOKHandleMouseEvent(pWindow,
MouseNotifyEvent::MOUSEBUTTONDOWN, false,
+ aMouseEvent.mnX,
aMouseEvent.mnY,
+ aMouseEvent.mnTime,
+#ifdef MACOSX
+ aMouseEvent.mnButton |
+ (aMouseEvent.mnCode &
(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)),
+#else
+ aMouseEvent.mnButton |
+ (aMouseEvent.mnCode &
(KEY_SHIFT | KEY_MOD1 | KEY_MOD2)),
+#endif
+
ImplGetMouseButtonMode(),
+ pEvent->GetClicks());
+break;
+
+case VclEventId::WindowMouseButtonUp:
+aMouseEvent.mnButton = pEvent->GetButtons();
+bSuccess = ImplLOKHandleMouseEvent(pWindow,
MouseNotifyEvent::MOUSEBUTTONUP, false,
+ aMouseEvent.mnX,
aMouseEvent.mnY,
+ aMouseEvent.mnTime,
+#ifdef MACOSX
+ aMouseEvent.mnButton |
+ (aMouseEvent.mnCode &
(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)),
+#else
+ aMouseEvent.mnButton |
+ (aMouseEvent.mnCode &
(KEY_SHIFT | KEY_MOD1 | KEY_MOD2)),
+#endif
+
ImplGetMouseButtonMode(),
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 131 ++-
1 file changed, 73 insertions(+), 58 deletions(-)
New commits:
commit bb70cd3d4badb615528ff18b46ff233d8be6e2ff
Author: Caolán McNamara
AuthorDate: Wed Oct 6 12:49:05 2021 +0100
Commit: Michael Stahl
CommitDate: Thu Oct 7 13:24:18 2021 +0200
tdf#141633 use css instead of pango attribs for font size
in GtkEntry. Rendering was using the font set via pango attribs, but
when measuring the mininum size gtk will use the min size of the widget
font so that has to change to allow the GtkEntry to fit the size of the
desired font
bundle together the setting-font-via-css as "WidgetFont"
Change-Id: Ic00d8b84decf528016fe47fc3b142daf3439340d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit a693009c28059435ea5bae6d89a76e2243fe7793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123146
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f535c06871fc..b033be801ff3 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -8813,6 +8813,55 @@ public:
}
};
+class WidgetFont
+{
+private:
+GtkWidget* m_pWidget;
+GtkCssProvider* m_pFontCssProvider;
+std::unique_ptr m_xFont;
+public:
+WidgetFont(GtkWidget* pWidget)
+: m_pWidget(pWidget)
+, m_pFontCssProvider(nullptr)
+{
+}
+
+void use_custom_font(const vcl::Font* pFont, std::u16string_view
rCSSSelector)
+{
+GtkStyleContext *pWidgetContext =
gtk_widget_get_style_context(m_pWidget);
+if (m_pFontCssProvider)
+{
+gtk_style_context_remove_provider(pWidgetContext,
GTK_STYLE_PROVIDER(m_pFontCssProvider));
+m_pFontCssProvider = nullptr;
+}
+
+m_xFont.reset();
+
+if (!pFont)
+return;
+
+m_xFont.reset(new vcl::Font(*pFont));
+m_pFontCssProvider = gtk_css_provider_new();
+OUString aBuffer = rCSSSelector + OUString::Concat(" { ") +
vcl_font_to_css(*pFont) + OUString::Concat(" }");
+OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8);
+css_provider_load_from_data(m_pFontCssProvider, aResult.getStr(),
aResult.getLength());
+gtk_style_context_add_provider(pWidgetContext,
GTK_STYLE_PROVIDER(m_pFontCssProvider),
+
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+const vcl::Font* get_custom_font() const
+{
+return m_xFont.get();
+}
+
+~WidgetFont()
+{
+if (m_pFontCssProvider)
+use_custom_font(nullptr, u"");
+assert(!m_pFontCssProvider);
+}
+};
+
class GtkInstanceButton : public GtkInstanceWidget, public virtual weld::Button
{
private:
@@ -11829,7 +11878,7 @@ protected:
GtkEditable* m_pEditable;
GtkWidget* m_pDelegate;
private:
-std::unique_ptr m_xFont;
+WidgetFont m_aCustomFont;
gulong m_nChangedSignalId;
gulong m_nInsertTextSignalId;
gulong m_nCursorPosSignalId;
@@ -11925,6 +11974,7 @@ public:
#else
, m_pDelegate(pWidget)
#endif
+, m_aCustomFont(m_pWidget)
, m_nChangedSignalId(g_signal_connect(m_pEditable, "changed",
G_CALLBACK(signalChanged), this))
, m_nInsertTextSignalId(g_signal_connect(m_pEditable, "insert-text",
G_CALLBACK(signalInsertText), this))
, m_nCursorPosSignalId(g_signal_connect(m_pEditable,
"notify::cursor-position", G_CALLBACK(signalCursorPosition), this))
@@ -12085,18 +12135,13 @@ public:
virtual void set_font(const vcl::Font& rFont) override
{
-m_xFont.reset(new vcl::Font(rFont));
-PangoAttrList* pOrigList = get_attributes();
-PangoAttrList* pAttrList = pOrigList ? pango_attr_list_copy(pOrigList)
: pango_attr_list_new();
-update_attr_list(pAttrList, rFont);
-set_attributes(pAttrList);
-pango_attr_list_unref(pAttrList);
+m_aCustomFont.use_custom_font(, u"entry");
}
virtual vcl::Font get_font() override
{
-if (m_xFont)
-return *m_xFont;
+if (const vcl::Font* pFont = m_aCustomFont.get_custom_font())
+return *pFont;
return GtkInstanceWidget::get_font();
}
@@ -16140,8 +16185,7 @@ private:
GtkTextBuffer* m_pTextBuffer;
GtkAdjustment* m_pVAdjustment;
GtkCssProvider* m_pFgCssProvider;
-GtkCssProvider* m_pFontCssProvider;
-std::optional m_xFont;
+WidgetFont m_aCustomFont;
int m_nMaxTextLength;
gulong m_nChangedSignalId; // we don't disable/enable this one, it's to
implement max-length
gulong m_nInsertTextSignalId;
@@ -16233,7 +16277,7 @@ public:
, m_pTextBuffer(gtk_text_view_get_buffer(pTextView))
,
m_pVAdjustment(gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(pTextView)))
,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx
vcl/unx/gtk3/gtkdata.cxx | 49 ---
vcl/unx/gtk3/gtkinst.cxx | 14 +++--
2 files changed, 38 insertions(+), 25 deletions(-)
New commits:
commit 4c8916fce009a1aee0e644fa62150a9279202a53
Author: Caolán McNamara
AuthorDate: Wed Jun 16 15:20:58 2021 +0100
Commit: Michael Stahl
CommitDate: Thu Oct 7 13:23:37 2021 +0200
Related: tdf#141633 allow "small-button" elements to shrink further
so they can go smaller to fit small zoom sizes for the table control
Change-Id: I6df47ed57a511e3b00d10075dedfdd9f1edcc477
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 10ec02f6fe4cd2c29021b967c255ace3f71424b5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123145
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index 63ed47d6c8c3..86ea3a430875 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -417,30 +417,41 @@ bool GtkSalData::Yield( bool bWait, bool
bHandleAllCurrentEvents )
return bWasEvent;
}
-static GtkStyleProvider* CreateSmallButtonProvider()
+static GtkStyleProvider* CreateStyleProvider()
{
/*
- set a provider to allow certain widgets to have no padding
+ set a provider to:
- a) little close button in menubar to close back to start-center
- b) and small buttons in view->data sources (button.small-button)
- c) small toolbar button in infobars (toolbar.small-button button)
- d) comboboxes in the data browser for tdf#137695 (box#combobox
button.small-button,
+ 1) allow certain widgets to have no padding
+
+ 1.a) little close button in menubar to close back to start-center
+ 1.b) and small buttons in view->data sources (button.small-button)
+ 1.c.1) gtk3 small toolbar button in infobars (toolbar.small-button
button)
+ 1.c.2) gtk4 small toolbar button in infobars (box.small-button button)
+ 1.d) comboboxes in the data browser for tdf#137695 (box#combobox
button.small-button,
which would instead be combobox button.small-button if we didn't
replace GtkComboBox,
see GtkInstanceComboBox for an explanation for why we do that)
- e) entry in the data browser for tdf#137695 (entry.small-button)
+ 1.e) entry in the data browser for tdf#137695 (entry.small-button)
+
+ 2) hide the unwanted active tab in an 'overflow' notebook of
double-decker notebooks.
+ (tdf#122623) it's nigh impossible to have a GtkNotebook without an
active (checked) tab,
+ so theme the unwanted tab into invisibility
*/
-GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new();
+GtkCssProvider* pStyleProvider = gtk_css_provider_new();
static const gchar data[] =
- "button.small-button, toolbar.small-button button, combobox.small-button
*.combo, box#combobox.small-button *.combo, entry.small-button { "
- "padding: 0;"
- "margin-left: 0px;"
- "margin-right: 0px;"
- "min-height: 18px;"
- "min-width: 18px;"
- "}";
-css_provider_load_from_data(pSmallButtonProvider, data, -1);
-return GTK_STYLE_PROVIDER(pSmallButtonProvider);
+ "button.small-button, toolbar.small-button button, box.small-button
button, "
+ "combobox.small-button *.combo, box#combobox.small-button *.combo,
entry.small-button { "
+ "padding: 0; margin-left: 0; margin-right: 0; margin-top: 0;
margin-bottom: 0;"
+ "border-width: 0; min-height: 0; min-width: 0; }"
+ "notebook.overflow > header.top > tabs > tab:checked { "
+ "box-shadow: none; padding: 0 0 0 0; margin: 0 0 0 0;"
+ "border-image: none; border-image-width: 0 0 0 0;"
+ "background-image: none; background-color: transparent;"
+ "border-radius: 0 0 0 0; border-width: 0 0 0 0;"
+ "border-style: none; border-color: transparent;"
+ "opacity: 0; min-height: 0; min-width: 0; }";
+css_provider_load_from_data(pStyleProvider, data, -1);
+return GTK_STYLE_PROVIDER(pStyleProvider);
}
void GtkSalData::Init()
@@ -543,7 +554,7 @@ void GtkSalData::Init()
GListModel *pMonitors = gdk_display_get_monitors(pGdkDisp);
g_signal_connect(pMonitors, "items-changed",
G_CALLBACK(signalMonitorsChanged), pDisplay);
-gtk_style_context_add_provider_for_display(pGdkDisp,
CreateSmallButtonProvider(),
+gtk_style_context_add_provider_for_display(pGdkDisp, CreateStyleProvider(),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
#else
int nScreens = gdk_display_get_n_screens( pGdkDisp );
@@ -561,7 +572,7 @@ void GtkSalData::Init()
g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
G_CALLBACK(signalMonitorsChanged), pDisplay );
-gtk_style_context_add_provider_for_screen(pScreen,
CreateSmallButtonProvider(),
+
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data/tdf144317.odt |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 30 ++
2 files changed, 30 insertions(+)
New commits:
commit 2129cc20ce67606cff22e32d4ce2e658240f5cd8
Author: Xisco Fauli
AuthorDate: Thu Oct 7 10:19:03 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 7 13:33:10 2021 +0200
tdf#144317: sw_uiwriter2: Add unittest
Change-Id: Ie2fa7b754f117aed35238cdb67698c05af24dadb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123204
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/data/tdf144317.odt
b/sw/qa/extras/uiwriter/data/tdf144317.odt
new file mode 100644
index ..9ec7cee61ea9
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf144317.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 9765e83cecf4..409efcf22108 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1387,6 +1387,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf126784_distributeSelectedColumns)
CPPUNIT_ASSERT_EQUAL_MESSAGE("Last column shouldn't change", nOrigCol3Pos,
aSeq[1].Position);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf144317)
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf144317.odt");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xTableRows = xTextTable->getRows();
+
+auto aSeq =
getProperty>(xTableRows->getByIndex(0),
+
"TableColumnSeparators");
+sal_Int16 nOrigCol1Pos = aSeq[0].Position;
+
+// Move the cursor inside the table
+pWrtShell->Down(/*bSelect=*/false);
+
+//Select some cells in the first column
+pWrtShell->Down(/*bSelect=*/true);
+pWrtShell->Down(/*bSelect=*/true);
+pWrtShell->Down(/*bSelect=*/true);
+
+dispatchCommand(mxComponent, ".uno:SetMinimalColumnWidth", {});
+
+aSeq =
getProperty>(xTableRows->getByIndex(0),
+
"TableColumnSeparators");
+CPPUNIT_ASSERT_MESSAGE("First column should shrink", aSeq[0].Position <
nOrigCol1Pos);
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf108687_tabstop)
{
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf108687_tabstop.odt");
[Libreoffice-commits] core.git: cli_ure/source
cli_ure/source/uno_bridge/cli_data.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 961ebbe9ebd9becdefdeaa5fdea63cb0e7d27443
Author: Julien Nabet
AuthorDate: Wed Oct 6 21:28:16 2021 +0200
Commit: Julien Nabet
CommitDate: Thu Oct 7 13:38:06 2021 +0200
drop 'using namespace std' in cli_ure
Change-Id: Ib439d74284d52e32162164d14ab06e4f40df884a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123193
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx
b/cli_ure/source/uno_bridge/cli_data.cxx
index f321549da31e..72b39df4884f 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -42,7 +42,6 @@ namespace sr = System::Reflection;
namespace st = System::Text;
namespace ucss = unoidl::com::sun::star;
-using namespace std;
namespace cli_uno
{
@@ -51,9 +50,9 @@ OUString mapCliTypeName(System::String^ typeName);
System::String^ mapCliPolymorphicName(System::String^ unoName);
System::String^ mapPolymorphicName(System::String^ unoName, bool bCliToUno);
-inline unique_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32
nSize )
+inline std::unique_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32
nSize )
{
-unique_ptr< rtl_mem > seq(
+std::unique_ptr< rtl_mem > seq(
rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) );
uno_Sequence * p = (uno_Sequence *)seq.get();
p->nRefCount = 1;
@@ -899,7 +898,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
}
else
{
-unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof
(sal_Int64) ) );
+std::unique_ptr< rtl_mem > mem( rtl_mem::allocate(
sizeof (sal_Int64) ) );
*(sal_Int64 *) mem.get()=
*safe_cast(aAny.Value);
pAny->pData = mem.release();
}
@@ -912,7 +911,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
}
else
{
-unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof
(sal_uInt64) ) );
+std::unique_ptr< rtl_mem > mem( rtl_mem::allocate(
sizeof (sal_uInt64) ) );
*(sal_uInt64 *) mem.get()=
*safe_cast(aAny.Value);
pAny->pData = mem.release();
}
@@ -925,7 +924,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
}
else
{
-unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof
(float) ) );
+std::unique_ptr< rtl_mem > mem( rtl_mem::allocate(
sizeof (float) ) );
*(float*) mem.get() =
*safe_cast(aAny.Value);
pAny->pData = mem.release();
}
@@ -938,7 +937,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
}
else
{
-unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof
(double) ) );
+std::unique_ptr< rtl_mem > mem( rtl_mem::allocate(
sizeof (double) ) );
*(double*) mem.get()=
*safe_cast(aAny.Value);
pAny->pData= mem.release();
}
@@ -967,7 +966,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
css::uno::Type anyType(value_td);
typelib_TypeDescription* td= NULL;
anyType.getDescription();
-unique_ptr< rtl_mem > mem(rtl_mem::allocate(td->nSize));
+std::unique_ptr< rtl_mem >
mem(rtl_mem::allocate(td->nSize));
typelib_typedescription_release(td);
map_to_uno(
mem.get(), aAny.Value, value_td.getTypeLibType(),
@@ -1219,7 +1218,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^
cli_data,
typelib_TypeDescriptionReference * element_type =
((typelib_IndirectTypeDescription *)td.get())->pType;
-unique_ptr< rtl_mem > seq;
+std::unique_ptr< rtl_mem > seq;
System::Array^ ar = nullptr;
if (cli_data != nullptr)
[Libreoffice-commits] core.git: vcl/source
vcl/source/cnttype/mcnttype.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 946b0840a0db5aabfb0d60916abf161d755170f4
Author: Chris Sherlock
AuthorDate: Wed Sep 29 21:52:40 2021 +1000
Commit: Julien Nabet
CommitDate: Thu Oct 7 14:27:31 2021 +0200
vcl: remove unnecessary using com::sun::star::\* and std namespaces
Change-Id: Ia6e9987262e10a107a14c9fd1b9c274c34cc7d27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122815
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/source/cnttype/mcnttype.cxx b/vcl/source/cnttype/mcnttype.cxx
index 3c75c62b943d..f41f5d25ea3a 100644
--- a/vcl/source/cnttype/mcnttype.cxx
+++ b/vcl/source/cnttype/mcnttype.cxx
@@ -26,9 +26,6 @@
#include "mcnttype.hxx"
-using namespace com::sun::star::uno;
-using namespace com::sun::star::container;
-
CMimeContentType::CMimeContentType( const OUString& aCntType )
{
init( aCntType );
@@ -49,7 +46,7 @@ OUString SAL_CALL CMimeContentType::getFullMediaType( )
return m_MediaType + "/" + m_MediaSubtype;
}
-Sequence< OUString > SAL_CALL CMimeContentType::getParameters( )
+css::uno::Sequence< OUString > SAL_CALL CMimeContentType::getParameters( )
{
return comphelper::mapKeysToSequence(m_ParameterMap);
}
@@ -64,7 +61,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const
OUString& aName )
auto const lower = aName.toAsciiLowerCase();
if ( !hasParameter( lower ) )
-throw NoSuchElementException( );
+throw css::container::NoSuchElementException( );
return m_ParameterMap.find( lower )->second;
}
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/docpool.cxx|4 ++--
sc/source/core/data/documen8.cxx |6 +++---
sc/source/core/data/patattr.cxx|2 +-
sc/source/core/data/stlsheet.cxx |8 +++-
sc/source/core/data/table2.cxx |2 +-
sc/source/filter/excel/xehelper.cxx|4 ++--
sc/source/filter/excel/xlroot.cxx |2 +-
sc/source/ui/app/scmod.cxx |2 +-
sc/source/ui/docshell/docsh3.cxx |3 +--
sc/source/ui/drawfunc/drawsh.cxx |4 ++--
sc/source/ui/drawfunc/drawsh5.cxx |2 +-
sc/source/ui/drawfunc/drtxtob.cxx |8
sc/source/ui/drawfunc/drtxtob1.cxx |6 ++
sc/source/ui/drawfunc/drtxtob2.cxx |9 -
sc/source/ui/drawfunc/fuconcustomshape.cxx |7 +++
sc/source/ui/drawfunc/futext.cxx |5 ++---
sc/source/ui/unoobj/confuno.cxx|6 +++---
sc/source/ui/view/cellsh1.cxx |2 +-
sc/source/ui/view/cellsh2.cxx |2 +-
sc/source/ui/view/cellsh3.cxx |8 ++--
sc/source/ui/view/drawview.cxx |2 +-
sc/source/ui/view/formatsh.cxx | 10 +++---
sc/source/ui/view/gridwin2.cxx |3 +--
sc/source/ui/view/gridwin3.cxx |2 +-
sc/source/ui/view/pivotsh.cxx |3 +--
sc/source/ui/view/prevwsh.cxx |2 +-
sc/source/ui/view/tabvwsh3.cxx |2 +-
sc/source/ui/view/tabvwshc.cxx | 14 +-
sc/source/ui/view/viewfun2.cxx |8 ++--
sc/source/ui/view/viewfunc.cxx |4 ++--
30 files changed, 58 insertions(+), 84 deletions(-)
New commits:
commit 1d4827a26a749ca704430d6aae972ee39e35ba10
Author: Noel Grandin
AuthorDate: Wed Oct 6 19:39:14 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 7 16:43:52 2021 +0200
use SfxItemSetFixed in sc
Change-Id: I5b1d66adb1b9e5dd0e470403ba7095183334cc66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123182
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index ee4f81c337e4..38dfcb1187df 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -282,11 +282,11 @@ ScDocumentPool::ScDocumentPool()
if ( ScGlobal::GetEmptyBrushItem() )
mvPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] =
-new ScPatternAttr( SfxItemSet( *this,
svl::Items ),
+new ScPatternAttr( SfxItemSetFixed( *this ),
ScResId(STR_STYLENAME_STANDARD) );
else
mvPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] =
-new ScPatternAttr( SfxItemSet( *this,
svl::Items ),
+new ScPatternAttr( SfxItemSetFixed( *this ),
STRING_STANDARD ); // FIXME: without name?
mvPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new
SvxLRSpaceItem( ATTR_LRSPACE );
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 1553c26c0f3e..3354ead298f0 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -117,11 +117,11 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist)
if ( !mpPrinter && bCreateIfNotExist )
{
auto pSet =
-std::make_unique( *mxPoolHelper->GetDocPool(),
-svl::Items );
+SID_SCPRINTOPTIONS,
SID_SCPRINTOPTIONS>>(*mxPoolHelper->GetDocPool());
SfxPrinterChangeFlags nFlags = SfxPrinterChangeFlags::NONE;
if (officecfg::Office::Common::Print::Warning::PaperOrientation::get())
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index b9b2859104b2..f474cb052232 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -83,7 +83,7 @@ ScPatternAttr::ScPatternAttr( SfxItemSet&& pItemSet )
}
ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool )
-: SfxSetItem ( ATTR_PATTERN, SfxItemSet( *pItemPool,
svl::Items ) ),
+: SfxSetItem ( ATTR_PATTERN, SfxItemSetFixed( *pItemPool ) ),
pStyle ( nullptr ),
mnKey(0)
{
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 2880cd5be67f..5712bf883c78 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -138,14 +138,12 @@ SfxItemSet& ScStyleSheet::GetItemSet()
// (== Standard page template)
SfxItemPool& rItemPool = GetPool()->GetPool();
-pSet = new SfxItemSet(
-rItemPool,
-svl::Items<
+pSet = new SfxItemSetFixed<
ATTR_USERDEF, ATTR_USERDEF,
ATTR_WRITINGDIR,
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh4.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14f81ca6ad289bf86781f642aa129b33151247cf
Author: Eike Rathke
AuthorDate: Wed Oct 6 21:25:18 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Oct 7 12:52:49 2021 +0200
Related: tdf#144970 == ScRefFlags::ZERO is not a replacement for != 0 ...
It still worked by chance because if (!bValid) the string is
parsed with ScRangeList, which does deliver a result.
That will have to be adapted to the then expected UI
representation though in which case it wouldn't work.
Fallout from
commit 51d0b4037b36a4a74c9181b95edb18017542ab79
CommitDate: Sat Mar 12 00:21:29 2016 +
tdf#84938 Change defines to typed_flags
Change-Id: I9612b34829c12e59d4b390c6aa035aca84e87c73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123194
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6ccf37a924b4..951f0fe96823 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -380,7 +380,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
ScAddress::Details aDetails(rDoc.GetAddressConvention(), 0, 0);
-bool bValid = (aSingleRange.ParseAny(aRangeName, rDoc,
aDetails) & ScRefFlags::VALID) == ScRefFlags::ZERO;
+bool bValid = (aSingleRange.ParseAny(aRangeName, rDoc,
aDetails) & ScRefFlags::VALID) != ScRefFlags::ZERO;
if (!bValid)
{
aRangeListRef = new ScRangeList;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/core/docnode/ndtbl1.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 8e5fb64aa9f80941ae1336955f1fe63281d41acc
Author: Justin Luth
AuthorDate: Tue Oct 5 15:32:06 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 7 13:01:16 2021 +0200
tdf#144317 sw table minimize: fix signed->unsigned table growth
In the case where the table was already rather oversized,
the minimize and optimize functions would attempt to shrink
the table to the maximum recommended size. But that was done
without checking whether that would result in a negative
position for the column boundary. (At least that is what I
think was happening. This code is a bit too cryptic...)
I tried to make a unit test, but the table size didn't
grow or shrink as I expected it to (and as it seems to
when the command is run by hand...)
An F12 with SW_DEBUG=true ./instdir/program/soffice
shows that the cell gains a huge width, but that didn't
show up either in a parseDump, even after a
Scheduler::ProcessEventsToIdle(). So I gave up (again).
Change-Id: Id4b9defae718694aa76a3db01f6b02ead5f98e6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123108
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit 7e201916169aca254c0824fb71ed83ca69f4adce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123156
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 06dc701883ad..b0fb85487a1e 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1612,15 +1612,18 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor,
nDiff -= aTabCols[i] - aTabCols[i-1];
tools::Long nTabRight = aTabCols.GetRight() + nDiff;
+const tools::Long nMaxRight = std::max(aTabCols.GetRightMax(),
nOldRight);
-// If the Table would become too wide, we restrict the
-// adjusted amount to the allowed maximum.
-if ( !bBalance && nTabRight > aTabCols.GetRightMax() )
+// If the Table would become (or is already) too wide,
+// restrict the column growth to the allowed maximum.
+if (!bBalance && nTabRight > nMaxRight)
{
-const tools::Long nTmpD = nTabRight -
aTabCols.GetRightMax();
+const tools::Long nTmpD = nTabRight - nMaxRight;
nDiff -= nTmpD;
nTabRight -= nTmpD;
}
+
+// all the remaining columns need to be shifted by the same
amount
for ( size_t i2 = i; i2 < aTabCols.Count(); ++i2 )
aTabCols[i2] += nDiff;
aTabCols.SetRight( nTabRight );
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/tipofthedaydlg.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 1b6b2eff9ac386fd994e3ae120882f646268a80b Author: Heiko Tietze AuthorDate: Thu Oct 7 11:13:49 2021 +0200 Commit: Heiko Tietze CommitDate: Thu Oct 7 13:46:19 2021 +0200 Resolves tdf#144693 - TipOfTheDay does not progress Follow-up to I94cd34aa031e133d8c229a0de78582fda1dbdf4a Change-Id: I29a91a188fb9783074491271c37b49a1f2cf13ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123206 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx index ed528d3042de..34193bff90de 100644 --- a/cui/source/dialogs/tipofthedaydlg.cxx +++ b/cui/source/dialogs/tipofthedaydlg.cxx @@ -74,6 +74,9 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent) const auto t0 = std::chrono::system_clock::now().time_since_epoch(); sal_Int32 nDay = std::chrono::duration_cast(t0).count() / 24; +//show next tip after one day +if (nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get()) +m_nCurrentTip++; // save this time to the config now instead of in the dtor otherwise we // end up with multiple copies of this dialog every time we open a new @@ -83,9 +86,6 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent) officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(nDay, xChanges); xChanges->commit(); -if (nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get()) -m_nCurrentTip++; - UpdateTip(); }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/inc vcl/source
vcl/inc/dndlistenercontainer.hxx | 23 ++
vcl/source/window/dndlistenercontainer.cxx | 36 +
2 files changed, 59 insertions(+)
New commits:
commit 840e2830cb76dabbdd3f75518b9e3de4357a7429
Author: Henry Castro
AuthorDate: Fri Jun 25 09:18:37 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:42:33 2021 +0200
lok: add generic class DragContext, DropContext
In tiled rendering case, there is no exists a generic
dummy to fire drag over and drag drop events.
Change-Id: I1d334df8316a09950c11bc365f12f28f0352dfc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118860
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/dndlistenercontainer.hxx b/vcl/inc/dndlistenercontainer.hxx
index 28339e7abeb8..6962682ff2eb 100644
--- a/vcl/inc/dndlistenercontainer.hxx
+++ b/vcl/inc/dndlistenercontainer.hxx
@@ -29,6 +29,29 @@
#include
+class GenericDropTargetDropContext :
+public
::cppu::WeakImplHelper
+{
+public:
+GenericDropTargetDropContext();
+
+// XDropTargetDropContext
+virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) override;
+virtual void SAL_CALL rejectDrop() override;
+virtual void SAL_CALL dropComplete( sal_Bool success ) override;
+};
+
+class GenericDropTargetDragContext :
+public
::cppu::WeakImplHelper
+{
+public:
+GenericDropTargetDragContext();
+
+// XDropTargetDragContext
+virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override;
+virtual void SAL_CALL rejectDrag() override;
+};
+
class DNDListenerContainer final : public vcl::unohelper::MutexHelper,
public ::cppu::WeakComponentImplHelper<
css::datatransfer::dnd::XDragGestureRecognizer,
diff --git a/vcl/source/window/dndlistenercontainer.cxx
b/vcl/source/window/dndlistenercontainer.cxx
index 5d430629c254..e80d94d6a287 100644
--- a/vcl/source/window/dndlistenercontainer.cxx
+++ b/vcl/source/window/dndlistenercontainer.cxx
@@ -448,4 +448,40 @@ void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool
success )
}
}
+/*
+ * GenericDropTargetDropContext
+ */
+
+GenericDropTargetDropContext::GenericDropTargetDropContext()
+{
+}
+
+void GenericDropTargetDropContext::acceptDrop( sal_Int8 /*dragOperation*/ )
+{
+}
+
+void GenericDropTargetDropContext::rejectDrop()
+{
+}
+
+void GenericDropTargetDropContext::dropComplete( sal_Bool /*success*/ )
+{
+}
+
+/*
+ * GenericDropTargetDragContext
+ */
+
+GenericDropTargetDragContext::GenericDropTargetDragContext()
+{
+}
+
+void GenericDropTargetDragContext::acceptDrag( sal_Int8 /*dragOperation*/ )
+{
+}
+
+void GenericDropTargetDragContext::rejectDrag()
+{
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/winproc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cd079ade65e9194aa9f136b4f3bbb723ee7c2b00
Author: Szymon Kłos
AuthorDate: Wed Oct 6 18:21:59 2021 +0200
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:57:10 2021 +0200
Fix build error in ImplLOKHandleMouseEvent
Change-Id: I15ec283593c7e5ab05ac5423eed4e4d08f576800
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123207
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 48e016c47cde..a73a94f0b44c 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -820,7 +820,7 @@ bool ImplLOKHandleMouseEvent(const VclPtr&
xWindow, MouseNotifyEven
vcl::Window* pDragWin = pFrameData->mpMouseDownWin;
if (pDragWin &&
-nSVEvent == MouseNotifyEvent::MOUSEMOVE &&
+nEvent == MouseNotifyEvent::MOUSEMOVE &&
pFrameData->mbDragging)
{
css::uno::Reference
xDropTargetDragContext =
@@ -856,7 +856,7 @@ bool ImplLOKHandleMouseEvent(const VclPtr&
xWindow, MouseNotifyEven
}
if (pDragWin &&
-nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP &&
+nEvent == MouseNotifyEvent::MOUSEBUTTONUP &&
pFrameData->mbDragging)
{
css::uno::Reference
xDropTargetDropContext =
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source
sc/source/ui/view/select.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 00bb3dbed8331adc3557f30fd9242e1f5cedc7b4 Author: Szymon Kłos AuthorDate: Wed Oct 6 18:22:11 2021 +0200 Commit: Szymon Kłos CommitDate: Thu Oct 7 12:00:08 2021 +0200 Fix build in BeginDrag Change-Id: I47b77fa87649cde9fa57e80da97642fb1647004f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123208 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 28d3133a0e49..3dcf178bd30f 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #if defined(_WIN32) #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 354706e3f5c05294af6ed5b9f814cfe01741
Author: Jan-Marek Glogowski
AuthorDate: Wed Oct 6 23:17:43 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Oct 7 13:27:06 2021 +0200
tdf#144952 VCL fix the Printer graphics release
Regression from commit 1b7c53db87bb67eeb2591fbb186f7ac20eb00c68
("WIN lazy init WinSalInfoPrinter graphics"), which removed the
// HACK to fix an urgent P1 printing issue fast
SalPrinter::StartPage returns a SalGraphics to the VCL Printer
object. On Windows SalPrinter::EndPage deletes the SalPrinter's
SalGraphics. MacOS keeps a single SalGraphics for the whole
SalPrinter lifetime. PspSalPrinter stores it in a unique_ptr
and always resets it in StartPage.
But in any case the VCL Printer's SalGraphics reference must be
freed before calling a function, which might delete it.
Change-Id: Ice528b2bbc89eaadff576420bf210ea4ec1e58d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123199
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 981dd6ec76b6..f9f25c110917 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1564,8 +1564,8 @@ void Printer::ImplEndPage()
if ( mpPrinter )
{
-mpPrinter->EndPage();
ReleaseGraphics();
+mpPrinter->EndPage();
mbDevOutput = false;
mpJobGraphics = nullptr;
[Libreoffice-commits] core.git: 2 commits - extensions/source filter/qa
extensions/source/ole/oleobjw.cxx |9 -
extensions/source/ole/olethread.cxx |2 --
extensions/source/ole/unoobjw.cxx |3 +--
filter/qa/cppunit/priority-test.cxx |1 -
filter/qa/cppunit/xslt-test.cxx |1 -
5 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 5f91b3b6c6bf4935a5532330b0d834f6f50df32e
Author: Julien Nabet
AuthorDate: Wed Oct 6 21:26:07 2021 +0200
Commit: Julien Nabet
CommitDate: Thu Oct 7 14:27:00 2021 +0200
drop 'using namespace std' in extensions(ole)
Change-Id: Id2bb87f792d389dd9e6eeddd17046a46cddfdb6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123192
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 0cc08f94d535..ba33772c171a 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -47,7 +47,6 @@
#include "oleobjw.hxx"
#include "unoobjw.hxx"
#include
-using namespace std;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::script;
@@ -2193,9 +2192,9 @@ void IUnknownWrapper::getFuncDesc(const OUString &
sFuncName, FUNCDESC ** pFuncD
// maybe this is a property, if so we need
// to store either both id's ( put/get ) or
// just the get. Storing both is more consistent
-pair pItems = m_mapComFunc.equal_range( sRealName );
+std::pair pItems = m_mapComFunc.equal_range(
sRealName );
for ( ;pItems.first != pItems.second; ++pItems.first )
-m_mapComFunc.insert( TLBFuncIndexMap::value_type (
make_pair(sFuncName, pItems.first->second ) ));
+m_mapComFunc.insert( TLBFuncIndexMap::value_type (
std::make_pair(sFuncName, pItems.first->second ) ));
itIndex =
m_mapComFunc.find( sFuncName );
}
@@ -2205,7 +2204,7 @@ void IUnknownWrapper::getFuncDesc(const OUString &
sFuncName, FUNCDESC ** pFuncD
#if OSL_DEBUG_LEVEL >= 1
// There must only be one entry if sFuncName represents a function or two
// if it is a property
-pair p = m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase());
+std::pair p =
m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase());
int numEntries = 0;
for ( ;p.first != p.second; p.first ++, numEntries ++);
OSL_ASSERT( ! (numEntries > 3) );
@@ -2237,7 +2236,7 @@ void IUnknownWrapper::getPropDesc(const OUString &
sFuncName, FUNCDESC ** pFuncD
OSL_ASSERT( * pFuncDescGet == nullptr && * pFuncDescPut == nullptr);
buildComTlbIndex();
typedef TLBFuncIndexMap::const_iterator cit;
-pair p = m_mapComFunc.equal_range(sFuncName);
+std::pair p = m_mapComFunc.equal_range(sFuncName);
if (p.first == m_mapComFunc.end())
{
//try case insensitive with IDispatch::GetIDsOfNames
diff --git a/extensions/source/ole/olethread.cxx
b/extensions/source/ole/olethread.cxx
index 74d7346516c5..1580c0b7d44a 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -23,8 +23,6 @@
#include
#include
-using namespace std;
-
void o2u_attachCurrentThread()
{
static osl::ThreadData oleThreadData;
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index 21debd9f54cc..81fbae1a0aca 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -96,7 +96,6 @@
#include "unoobjw.hxx"
#include "servprov.hxx"
-using namespace std;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -3095,7 +3094,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
UnoObjectWrapperRemoteOpt::GetIDsOfNames ( RE
{
// name has not been bad before( member exists
typedef NameToIdMap::iterator ITnames;
-pair< ITnames, bool > pair_id= m_nameToDispIdMap.emplace(name,
m_currentId++);
+std::pair< ITnames, bool > pair_id=
m_nameToDispIdMap.emplace(name, m_currentId++);
// new ID inserted ?
if( pair_id.second )
{// yes, now create MemberInfo and ad to IdToMemberInfoMap
commit e4a46880debff1c594a0495d8312fa5a93c77d0f
Author: Julien Nabet
AuthorDate: Wed Oct 6 21:24:14 2021 +0200
Commit: Julien Nabet
CommitDate: Thu Oct 7 14:26:46 2021 +0200
drop 'using namespace std' in filter/qa
Change-Id: I7b5a1a773c26e8ef0fe3dcd0a1cdf5ebba75d52f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123191
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/filter/qa/cppunit/priority-test.cxx
b/filter/qa/cppunit/priority-test.cxx
index 018d882a7215..18e63c3188ee 100644
--- a/filter/qa/cppunit/priority-test.cxx
+++ b/filter/qa/cppunit/priority-test.cxx
@@ -21,7 +21,6 @@
#include
-using namespace std;
using namespace css;
namespace {
diff --git a/filter/qa/cppunit/xslt-test.cxx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/components/dtranscomp.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit d08e86e65976d9a10a3c73ba5b01fa66393cc0b2
Author: Henry Castro
AuthorDate: Fri Jun 25 09:30:35 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:43:05 2021 +0200
lok: add private member transfer data to GenericDragSource
In tiled rendering case, the class GenericDragSource is
created by default, but it does not hold the transfer data
and it cancels the drag & drop.
Change-Id: Ib96f426a42e1fdae823e2412dc5280d70b59c44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118866
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index bd89a1404e01..3819253e58dc 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -210,6 +210,7 @@ class GenericDragSource : public
cppu::WeakComponentImplHelper<
>
{
osl::Mutex m_aMutex;
+css::uno::Reference m_xTrans;
public:
GenericDragSource() : WeakComponentImplHelper( m_aMutex ) {}
@@ -255,10 +256,15 @@ sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 )
void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&,
sal_Int8 /*sourceActions*/, sal_Int32
/*cursor*/, sal_Int32 /*image*/,
- const Reference<
datatransfer::XTransferable >&,
+ const Reference<
datatransfer::XTransferable >& rTrans,
const Reference<
datatransfer::dnd::XDragSourceListener >& listener
)
{
+if (comphelper::LibreOfficeKit::isActive()) {
+m_xTrans = rTrans;
+return;
+}
+
datatransfer::dnd::DragSourceDropEvent aEv;
aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY;
aEv.DropSuccess = false;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/winproc.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 428f5755442c9e36f2e0cc53c5780dcad8749910 Author: Henry Castro AuthorDate: Wed Sep 15 14:56:19 2021 -0400 Commit: Szymon Kłos CommitDate: Thu Oct 7 11:43:53 2021 +0200 lok: fix the "mbStartDragCalled" status The drag starts it is only called when mouse down + mouse move. Change-Id: Ifadfd904c2be28bd123c17a47a82f49dd6d5a04a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118867 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 36f040ce3a72..625c09c818c5 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -876,7 +876,6 @@ bool ImplLOKHandleMouseEvent(const VclPtr& xWindow, MouseNotifyEven } } } -else pFrameData->mbStartDragCalled = true; } }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/winproc.cxx | 57 ++
1 file changed, 57 insertions(+)
New commits:
commit bd212a4f26ae4532bf2be3d1d35a60b67ac15ef5
Author: Henry Castro
AuthorDate: Tue Jul 6 10:12:41 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:45:05 2021 +0200
lok: add drag & drop functionality
In the desktop case, the drag over and drag drop events are
handled external like GTK framework. In tiled rendering case,
we do not have it, so handle the drag and drop events in the
cloned ImplLOKHandleMouseEvent function.
Change-Id: Ib41232b3b9d5d6d859b2c965311b87af5d193ddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118869
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 625c09c818c5..6c8645dcf30a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -26,6 +26,7 @@
#include
+#include
#include
#include
#include
@@ -54,6 +55,7 @@
#include
#include
+#include
#include
#include
@@ -816,6 +818,61 @@ bool ImplLOKHandleMouseEvent(const VclPtr&
xWindow, MouseNotifyEven
pFrameData->mnMouseCode = nCode;
pFrameData->mbMouseIn = false;
+vcl::Window* pDragWin = pFrameData->mpMouseDownWin;
+if (pDragWin && pFrameData->mbStartDragCalled &&
+nSVEvent == MouseNotifyEvent::MOUSEMOVE)
+{
+css::uno::Reference
xDropTargetDragContext =
+new GenericDropTargetDragContext();
+css::uno::Reference xDropTarget(
+pDragWin->ImplGetWindowImpl()->mxDNDListenerContainer,
css::uno::UNO_QUERY);
+
+if (!xDropTargetDragContext.is() ||
+!xDropTarget.is() ||
+(nCode & (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)) ==
+(MouseSettings::GetStartDragCode() & (MOUSE_LEFT | MOUSE_RIGHT |
MOUSE_MIDDLE)))
+{
+// cancel dragdrop
+pDragWin->ImplGetFrameData()->mbStartDragCalled = false;
+return false;
+}
+
+static_cast(xDropTarget.get())->fireDragOverEvent(
+xDropTargetDragContext,
+css::datatransfer::dnd::DNDConstants::ACTION_MOVE,
+aWinPos.X(),
+aWinPos.Y(),
+(css::datatransfer::dnd::DNDConstants::ACTION_COPY |
+ css::datatransfer::dnd::DNDConstants::ACTION_MOVE |
+ css::datatransfer::dnd::DNDConstants::ACTION_LINK));
+
+return true;
+}
+
+if (pDragWin && pFrameData->mbStartDragCalled &&
+nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP)
+{
+css::uno::Reference
xDropTargetDropContext =
+new GenericDropTargetDropContext();
+css::uno::Reference xDropTarget(
+pDragWin->ImplGetWindowImpl()->mxDNDListenerContainer,
css::uno::UNO_QUERY);
+
+if (xDropTargetDropContext.is() && xDropTarget.is())
+{
+static_cast(xDropTarget.get())->fireDropEvent(
+xDropTargetDropContext,
+css::datatransfer::dnd::DNDConstants::ACTION_MOVE,
+aWinPos.X(),
+aWinPos.Y(),
+(css::datatransfer::dnd::DNDConstants::ACTION_COPY |
+ css::datatransfer::dnd::DNDConstants::ACTION_MOVE |
+ css::datatransfer::dnd::DNDConstants::ACTION_LINK),
+css::uno::Reference());
+}
+
+pDragWin->ImplGetFrameData()->mbStartDragCalled = false;
+}
+
vcl::Window* pDownWin = pFrameData->mpMouseDownWin;
if (pDownWin && nEvent == MouseNotifyEvent::MOUSEMOVE)
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source
sc/source/ui/view/gridwin.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit eb5a3c3e6cd0505dab672a124c53ea71f156c9d3
Author: Henry Castro
AuthorDate: Thu Jun 24 07:41:14 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:50:11 2021 +0200
lok: sc: apply local mouse tracking only for Calc
Change-Id: I6c3d4c3c59652f20596e32d3f31c5357b7ed61eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118873
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 7fbbda5decd2..125a5fc48a69 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -440,6 +440,7 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent,
ScViewData& rData, ScSplitPos
OSL_FAIL("GridWindow: wrong position");
}
+SetUseFrameData(comphelper::LibreOfficeKit::isActive());
SetBackground();
SetMapMode(mrViewData.GetLogicMode(eWhich));
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/qa sc/source
sc/qa/unit/rangelst_test.cxx | 14 ++
sc/source/core/tool/rangelst.cxx | 10 +-
sc/source/ui/unoobj/chart2uno.cxx |8
3 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 7f623ef99920e75af22eda95a616aa749f20d1d0
Author: Luboš Luňák
AuthorDate: Wed Oct 6 12:57:15 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 7 12:12:03 2021 +0200
ScRangeList::UpdateReference() join all ranges properly (tdf#140901)
This is basically a revert of 6eb8634a9f62bfe486ecd2f46, which
made this Join() just the last range, probably under the assumption
that the function is always called with just one range to update,
or to avoid the possibility that Join() removes several items
from the list, breaking the next step of the loop. But DeleteArea()
may split several ranges, so we need to make sure to Join()
all of them.
Change-Id: Iea124142335ccdc8fa578344cddce8670c27573d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123135
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit e7ec79fe36a0f22f10167806da80e3c1f30b36e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123154
Reviewed-by: Xisco Fauli
(cherry picked from commit d138dd209e99300c4fc0412f726b1058fbb0039d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123157
diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index bfd4acd5dae1..4239cc91e8a9 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -520,6 +520,20 @@ void Test::testUpdateReference_DeleteRow()
ScRangeList aList2(ScRange(2,2,0,2,2,0));
aList2.UpdateReference(URM_INSDEL, m_pDoc, ScRange(0,3,0,MAXCOL,MAXROW,0),
0, -1, 0);
CPPUNIT_ASSERT(aList2.empty());
+
+ScRangeList aList3;
+aList3.push_back(ScRange(2,2,0,2,8,0));
+aList3.push_back(ScRange(4,2,0,4,8,0));
+aList3.UpdateReference(URM_INSDEL, m_pDoc, ScRange(2,5,0,MAXCOL,MAXROW,0),
0, -1, 0);
+// Verify all ranges in the list have been updated properly.
+CPPUNIT_ASSERT_EQUAL(size_t(2), aList3.size());
+CPPUNIT_ASSERT_EQUAL(ScRange(2,2,0,2,7,0), aList3[0]);
+CPPUNIT_ASSERT_EQUAL(ScRange(4,2,0,4,7,0), aList3[1]);
+
+ScRangeList aList4(ScRange(0,0,0,MAXCOL,MAXROW,0));
+ScRangeList aList4Copy = aList4;
+aList4.UpdateReference(URM_INSDEL, m_pDoc, ScRange(14,3,0,MAXCOL,7,0), 0,
-2, 0);
+CPPUNIT_ASSERT_EQUAL(aList4Copy, aList4);
}
void Test::testUpdateReference_DeleteLastRow()
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index c49e9694c0c8..eb1ad4fc37e5 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -438,7 +438,15 @@ bool ScRangeList::UpdateReference(
if( nDx < 0 || nDy < 0 )
{
size_t n = maRanges.size();
-Join(maRanges[n-1], true);
+for(size_t i = n-1; i > 0;)
+{
+Join(maRanges[i], true);
+// Join() may merge and remove even more than one item,
protect against it.
+if(i >= maRanges.size())
+i = maRanges.size()-1;
+else
+--i;
+}
}
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 004729176c2e..7c0fa22096f6 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2715,7 +2715,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
}
}
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes.");
unique_ptr pUndoRanges;
@@ -2728,7 +2728,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
if (bChanged)
{
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes
after the reference update.");
// Bring the change back from the range list to the token list.
@@ -2750,7 +2750,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
if (!m_pRangeIndices || m_pRangeIndices->empty())
{
-OSL_FAIL(" faulty range indices");
+assert(false && " faulty range indices");
break;
}
@@ -2759,7 +2759,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster&
/*rBC*/, const SfxHint& rHint
size_t nCount = rRanges.size();
if (nCount != m_pRangeIndices->size())
{
-OSL_FAIL("range count and range index count differ.");
+assert(false && "range
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - svtools/uiconfig vcl/unx
svtools/uiconfig/ui/thineditcontrol.ui |3 +++ vcl/unx/gtk3/gtkdata.cxx |4 +++- vcl/unx/gtk3/gtkinst.cxx | 22 -- 3 files changed, 22 insertions(+), 7 deletions(-) New commits: commit bc3571887f5fa3abc6655400560fd0c0fd530528 Author: Caolán McNamara AuthorDate: Wed Oct 6 14:53:58 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Oct 7 13:39:06 2021 +0200 Related: tdf#141633 similiarly support match spinbutton font size to the desired zoomed font size in the table control Change-Id: I9aafec5b9a236bf5d140fd9b8bfc9000c3f0bf35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123147 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui index e2258743f381..e839b02df82c 100644 --- a/svtools/uiconfig/ui/thineditcontrol.ui +++ b/svtools/uiconfig/ui/thineditcontrol.ui @@ -29,6 +29,9 @@ True True False + ++ 0 diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index 86ea3a430875..98424d95e673 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -432,6 +432,7 @@ static GtkStyleProvider* CreateStyleProvider() which would instead be combobox button.small-button if we didn't replace GtkComboBox, see GtkInstanceComboBox for an explanation for why we do that) 1.e) entry in the data browser for tdf#137695 (entry.small-button) + 1.f) spinbutton in the data browser tdf#141633 (spinbutton.small-button) 2) hide the unwanted active tab in an 'overflow' notebook of double-decker notebooks. (tdf#122623) it's nigh impossible to have a GtkNotebook without an active (checked) tab, @@ -440,7 +441,8 @@ static GtkStyleProvider* CreateStyleProvider() GtkCssProvider* pStyleProvider = gtk_css_provider_new(); static const gchar data[] = "button.small-button, toolbar.small-button button, box.small-button button, " - "combobox.small-button *.combo, box#combobox.small-button *.combo, entry.small-button { " + "combobox.small-button *.combo, box#combobox.small-button *.combo, entry.small-button, " + "spinbutton.small-button, spinbutton.small-button entry, spinbutton.small-button button { " "padding: 0; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0;" "border-width: 0; min-height: 0; min-width: 0; }" "notebook.overflow > header.top > tabs > tab:checked { " diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index b033be801ff3..66cefee6b559 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -11877,8 +11877,8 @@ class GtkInstanceEditable : public GtkInstanceWidget, public virtual weld::Entry protected: GtkEditable* m_pEditable; GtkWidget* m_pDelegate; -private: WidgetFont m_aCustomFont; +private: gulong m_nChangedSignalId; gulong m_nInsertTextSignalId; gulong m_nCursorPosSignalId; @@ -12133,11 +12133,6 @@ public: g_signal_handler_unblock(m_pDelegate, m_nActivateSignalId); } -virtual void set_font(const vcl::Font& rFont) override -{ -m_aCustomFont.use_custom_font(, u"entry"); -} - virtual vcl::Font get_font() override { if (const vcl::Font* pFont = m_aCustomFont.get_custom_font()) @@ -12255,6 +12250,11 @@ public: : GtkInstanceEditable(GTK_WIDGET(pEntry), pBuilder, bTakeOwnership) { } + +virtual void set_font(const vcl::Font& rFont) override +{ +m_aCustomFont.use_custom_font(, u"entry"); +} }; } @@ -15827,6 +15827,11 @@ public: return gtk_spin_button_get_digits(m_pButton); } +virtual void set_font(const vcl::Font& rFont) override +{ +m_aCustomFont.use_custom_font(, u"spinbutton"); +} + virtual void disable_notify_events() override { g_signal_handler_block(m_pButton, m_nValueChangedSignalId); @@ -16031,6 +16036,11 @@ public: enable_notify_events(); } +virtual void set_font(const vcl::Font& rFont) override +{ +m_aCustomFont.use_custom_font(, u"spinbutton"); +} + virtual void disable_notify_events() override { g_signal_handler_block(m_pButton, m_nValueChangedSignalId);
Minutes from the UX/design meeting 2021-Oct-07
Present: Heiko Comments: Sascha, Regina, Tomaz Tickets/Topics * FEATURE REQUEST: Allow setting Icon color separate from Line color + https://bugs.documentfoundation.org/show_bug.cgi?id=144633 + "Symbol color" would be relevant for only one out of four options + symbols' color is aligned to the line color + sure an improvement but only for lesser needs a.k.a. impact minor (Sascha) + renaming the feature makes sense (Adolfo) + depends on whether this attribute is defined in the format and if other formats/applications allow changing the color; in this case we need it for proper round-trips + ODF1.2: "The fill attributes of the series and data points specify how the symbols are filled. By default the symbols are filled solid with the same color as the connecting line. In case no line color is given but a fill color, the line uses the fill color." => keep open and verify WF * Line thickness specification - too many choices, nonintuitive + https://bugs.documentfoundation.org/show_bug.cgi?id=48622 + change to 0.5/0.75/2/4/5 pt? + hairline with actual 0pt resp. 1 device pixel is required (Regina, Tomaz) + MSO2016 does ¼, ½, ¾, 1, 1½, 2¼, 3, 4½, 6pt => suggest 0.05 (very thin), 0.5 (thin), 1.5 (medium), 2.25 (thick), 4.5pt (extra thick) * Default table border width is useless + https://bugs.documentfoundation.org/show_bug.cgi?id=99027 + "Default" TS (applied per toolbar) uses 0.5pt, "None" (insert per menu) has 0.05pt => WFM * Writer table border styles offered are different in the toolbar button vs. Table Properties dialog + https://bugs.documentfoundation.org/show_bug.cgi?id=144938 + what is thin/thick in respect to the predefined border styles? + in my opinion the most important condition to change (Sascha) + unclear what the difference exactly are; the preview is hard to read and would benefit from labels + unclear if defined in the format => get more information from developers * Image position off when changing 'to paragraph' to 'to character' back 'to paragraph' and drag the anchor + https://bugs.documentfoundation.org/show_bug.cgi?id=144611 + "If you move the anchor from one paragraph to another paragraph, LO keeps the distance between anchor and image. If you drag the image, you can reduce or expand the distance between anchor and image." - is this the intended behavior? (Dieter) + anchors are a wild-card, 1000 other bugs needs more attention, keep it open (Sascha) => prefer to resolve as NAB OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/vcl vcl/inc vcl/source
include/vcl/window.hxx|2 +
vcl/inc/window.h |2 +
vcl/source/window/window.cxx |2 +
vcl/source/window/window2.cxx | 52 --
vcl/source/window/winproc.cxx | 16 +++-
5 files changed, 60 insertions(+), 14 deletions(-)
New commits:
commit c816eb597ee7f4d6819da28d3bbb961cb2f7f96c
Author: Henry Castro
AuthorDate: Thu Jun 24 07:30:15 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:41:50 2021 +0200
lok: introduce local mouse tracking
Add the term local mouse tracking per frame window (per user)
instead of global mouse tracking in the desktop case.
Change-Id: I3f8c55fc770b4ac7dea167385586d8639ac4d93b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118856
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 41b35a24063d..220df94e97f2 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1162,6 +1162,8 @@ public:
voidSetComponentInterface( css::uno::Reference<
css::awt::XWindowPeer > const & xIFace );
+voidSetUseFrameData(bool bUseFrameData);
+
/// Interface to register for dialog / window tunneling.
voidSetLOKNotifier(const
vcl::ILibreOfficeKitNotifier* pNotifier, bool bParent = false);
const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index aebd513426f9..e6acaa78dbbf 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -139,6 +139,7 @@ struct ImplFrameData
VclPtr mpFocusWin; //< focus window (is also set,
when frame doesn't have the focus)
VclPtr mpMouseMoveWin; //< last window, where
MouseMove() called
VclPtr mpMouseDownWin; //< last window, where
MouseButtonDown() called
+VclPtr mpTrackWin; //< window, that is in
tracking mode
std::vector > maOwnerDrawList;//< List of system
windows with owner draw decoration
std::shared_ptr mxFontCollection; //< Font-List
for this frame
std::shared_ptr mxFontCache; //< Font-Cache for this frame
@@ -399,6 +400,7 @@ public:
const vcl::ILibreOfficeKitNotifier* mpLOKNotifier; ///< To emit the LOK
callbacks eg. for dialog tunneling.
vcl::LOKWindowId mnLOKWindowId; ///< ID of this specific window.
bool mbLOKParentNotifier;
+bool mbUseFrameData;
};
namespace vcl
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3b0e390721e3..e2efee60dce8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -740,6 +740,7 @@ WindowImpl::WindowImpl( WindowType nType )
mpLOKNotifier = nullptr;
mnLOKWindowId = 0;
mbLOKParentNotifier = false;
+mbUseFrameData = false;
}
WindowImpl::~WindowImpl()
@@ -774,6 +775,7 @@ ImplFrameData::ImplFrameData( vcl::Window *pWindow )
mpFocusWin = nullptr;
mpMouseMoveWin = nullptr;
mpMouseDownWin = nullptr;
+mpTrackWin = nullptr;
mxFontCollection = pSVData->maGDIData.mxScreenFontList;
mxFontCache= pSVData->maGDIData.mxScreenFontCache;
mnFocusId = nullptr;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index b8307db328b1..8b2e145d0aae 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -241,17 +241,30 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer,
void )
Tracking( aTEvt );
}
+void Window::SetUseFrameData(bool bUseFrameData)
+{
+if (mpWindowImpl)
+mpWindowImpl->mbUseFrameData = bUseFrameData;
+}
+
void Window::StartTracking( StartTrackingFlags nFlags )
{
+if (!mpWindowImpl)
+return;
+
ImplSVData* pSVData = ImplGetSVData();
+VclPtr pTrackWin = mpWindowImpl->mbUseFrameData ?
+mpWindowImpl->mpFrameData->mpTrackWin :
+pSVData->mpWinData->mpTrackWin;
-if ( pSVData->mpWinData->mpTrackWin.get() != this )
+if ( pTrackWin.get() != this )
{
-if ( pSVData->mpWinData->mpTrackWin )
-pSVData->mpWinData->mpTrackWin->EndTracking(
TrackingEventFlags::Cancel );
+if ( pTrackWin )
+pTrackWin->EndTracking( TrackingEventFlags::Cancel );
}
-if ( nFlags & (StartTrackingFlags::ScrollRepeat |
StartTrackingFlags::ButtonRepeat) )
+if ( !mpWindowImpl->mbUseFrameData &&
+ (nFlags & (StartTrackingFlags::ScrollRepeat |
StartTrackingFlags::ButtonRepeat)) )
{
pSVData->mpWinData->mpTrackTimer = new AutoTimer;
@@ -264,30 +277,43 @@ void Window::StartTracking( StartTrackingFlags nFlags )
pSVData->mpWinData->mpTrackTimer->Start();
}
-pSVData->mpWinData->mpTrackWin = this;
-pSVData->mpWinData->mnTrackFlags = nFlags;
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/vcl sc/source vcl/inc vcl/source
include/vcl/window.hxx|1 +
sc/source/ui/view/select.cxx |3 +++
vcl/inc/window.h |1 +
vcl/source/window/mouse.cxx |5 +
vcl/source/window/window.cxx |1 +
vcl/source/window/winproc.cxx | 26 +-
6 files changed, 28 insertions(+), 9 deletions(-)
New commits:
commit de1e60f01f5806cc55088846aaaf3429aea754fb
Author: Henry Castro
AuthorDate: Wed Jun 30 18:45:38 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:47:23 2021 +0200
lok: sc: introduce LocalStartDrag method
Update the mouse mode to start drag,
otherwise it will conflict with normal cell selection.
Change-Id: I6d4939b704114e7de1c9c051459fd02100a7536c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118874
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 220df94e97f2..643e50a67550 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1075,6 +1075,7 @@ public:
static VclPtr SaveFocus();
static void EndSaveFocus(const
VclPtr& xFocusWin);
+voidLocalStartDrag();
voidCaptureMouse();
voidReleaseMouse();
boolIsMouseCaptured() const;
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 89baed62a9f5..28d3133a0e49 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -204,6 +204,9 @@ void ScViewFunctionSet::BeginDrag()
if ( pWindow->IsTracking() )
pWindow->EndTracking( TrackingEventFlags::Cancel );// abort
selecting
+if (comphelper::LibreOfficeKit::isActive())
+pWindow->LocalStartDrag();
+
SC_MOD()->SetDragObject( pTransferObj.get(), nullptr ); // for
internal D
pTransferObj->StartDrag( pWindow, nDragActions );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e6acaa78dbbf..0b6fc72ad46b 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -180,6 +180,7 @@ struct ImplFrameData
css::uno::Reference< css::datatransfer::clipboard::XClipboard >
mxSelection;
boolmbInternalDragGestureRecognizer;
+boolmbDragging;
VclPtr mpBuffer; ///< Buffer for the double-buffering
bool mbInBufferedPaint; ///< PaintHelper is in the process of painting
into this buffer.
tools::Rectangle maBufferedRect; ///< Rectangle in the buffer that has to
be painted to the screen.
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 6517ad2d90c1..9e2cd5045392 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -443,6 +443,11 @@ void Window::SetMouseTransparent( bool bTransparent )
mpWindowImpl->mbMouseTransparent = bTransparent;
}
+void Window::LocalStartDrag()
+{
+ImplGetFrameData()->mbDragging = true;
+}
+
void Window::CaptureMouse()
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e2efee60dce8..da1b2005b255 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -811,6 +811,7 @@ ImplFrameData::ImplFrameData( vcl::Window *pWindow )
maResizeIdle.SetInvokeHandler( LINK( pWindow, vcl::Window,
ImplHandleResizeTimerHdl ) );
maResizeIdle.SetDebugName( "vcl::Window maResizeIdle" );
mbInternalDragGestureRecognizer = false;
+mbDragging = false;
mbInBufferedPaint = false;
mnDPIX = 96;
mnDPIY = 96;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6c8645dcf30a..48e016c47cde 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -819,21 +819,27 @@ bool ImplLOKHandleMouseEvent(const VclPtr&
xWindow, MouseNotifyEven
pFrameData->mbMouseIn = false;
vcl::Window* pDragWin = pFrameData->mpMouseDownWin;
-if (pDragWin && pFrameData->mbStartDragCalled &&
-nSVEvent == MouseNotifyEvent::MOUSEMOVE)
+if (pDragWin &&
+nSVEvent == MouseNotifyEvent::MOUSEMOVE &&
+pFrameData->mbDragging)
{
css::uno::Reference
xDropTargetDragContext =
new GenericDropTargetDragContext();
css::uno::Reference xDropTarget(
pDragWin->ImplGetWindowImpl()->mxDNDListenerContainer,
css::uno::UNO_QUERY);
-if (!xDropTargetDragContext.is() ||
-!xDropTarget.is() ||
-(nCode & (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)) ==
+if ((nCode & (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)) !=
(MouseSettings::GetStartDragCode() & (MOUSE_LEFT | MOUSE_RIGHT |
MOUSE_MIDDLE)))
+{
+pDragWin->ImplGetFrameData()->mbDragging = false;
+return false;
+}
+
+if (!xDropTargetDragContext.is() ||
+!xDropTarget.is())
{
//
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/mouse.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d7ef45f32caa8c91e662fda5890ffec24875b07e
Author: Henry Castro
AuthorDate: Tue Jun 29 20:15:36 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 11:49:08 2021 +0200
lok: fix sending mouse pointer
The ScGridWindow is a document window, but the Parent
is not the notifier, fix it to send mouse pointer when
action is drag & drop.
Change-Id: I5071dce2566331ce0268a96e023ffd61a1f09e56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118870
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 9e2cd5045392..717713a68952 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -510,8 +510,10 @@ void Window::SetPointer( PointerStyle nPointer )
// issue mouse pointer events only for document windows
// Doc windows' immediate parent SfxFrameViewWindow_Impl is the one with
// parent notifier set during initialization
-if (GetParent()->ImplGetWindowImpl()->mbLOKParentNotifier &&
-GetParent()->ImplGetWindowImpl()->mnLOKWindowId == 0)
+if ((ImplGetFrameData()->mbDragging &&
+ ImplGetFrameData()->mpMouseDownWin == this) ||
+(GetParent()->ImplGetWindowImpl()->mbLOKParentNotifier &&
+ GetParent()->ImplGetWindowImpl()->mnLOKWindowId == 0))
{
pWin->GetLOKNotifier()->libreOfficeKitViewCallback(LOK_CALLBACK_MOUSE_POINTER,
aPointerString.getStr());
}
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/font/PhysicalFontFamily.hxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 1ef671c5a2f4b629ba6e280c5036ba781cc8787c
Author: Mike Kaganski
AuthorDate: Wed Oct 6 22:34:16 2021 +0300
Commit: Mike Kaganski
CommitDate: Thu Oct 7 12:13:21 2021 +0200
Delete copy ctors/assignments for DLLEXPORT class
Same as ee405fb2ef36337851801f1bd34411c606d55988 for
GraphicHelper, but this time for PhysicalFontFamily.
Change-Id: I7a9d6f0cdee29b754244ab6260f78bb7d8deb488
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123195
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/inc/font/PhysicalFontFamily.hxx
b/vcl/inc/font/PhysicalFontFamily.hxx
index a3c4d0b90a31..7bbcf566c395 100644
--- a/vcl/inc/font/PhysicalFontFamily.hxx
+++ b/vcl/inc/font/PhysicalFontFamily.hxx
@@ -66,6 +66,13 @@ public:
PhysicalFontFamily(const OUString& rSearchName);
~PhysicalFontFamily();
+// Avoid implicitly defined copy constructors/assignments for the
DLLPUBLIC class (they may
+// require forward-declared classes used internally to be defined in
places using this)
+PhysicalFontFamily(const PhysicalFontFamily&) = delete;
+PhysicalFontFamily(PhysicalFontFamily&&) = delete;
+PhysicalFontFamily& operator=(const PhysicalFontFamily&) = delete;
+PhysicalFontFamily& operator=(PhysicalFontFamily&&) = delete;
+
const OUString& GetFamilyName() const { return maFamilyName; }
const OUString& GetSearchName() const { return maSearchName; }
const OUString& GetAliasNames() const { return maMapNames; }
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen5.cxx |4 ++--
sc/source/ui/docshell/docsh4.cxx |2 +-
sc/source/ui/view/gridwin.cxx|3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 852292feee08b4d256f8255926e1f84b4c6fd4b6
Author: Eike Rathke
AuthorDate: Wed Oct 6 22:16:30 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Oct 7 12:53:09 2021 +0200
Related: tdf#144970 Make Drag of Chart range work with UI
representation
Drag of cell range onto an existing Chart worked with Calc A1
but not Excel A1 or R1C1 address syntax conventions.
Change-Id: I1cd1a134f284ef5b28237589c544f93cb4aca841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123197
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 60d6d6cf068b..68bb7b4a7444 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -229,7 +229,7 @@ void ScDocument::GetOldChartParameters( std::u16string_view
rName,
OUString aRangesStr;
lcl_GetChartParameters( xChartDoc, aRangesStr,
eDataRowSource, bHasCategories, bFirstCellAsLabel );
-rRanges.Parse( aRangesStr, *this );
+rRanges.Parse( aRangesStr, *this, GetAddressConvention());
if ( eDataRowSource == chart::ChartDataRowSource_COLUMNS )
{
rRowHeaders = bHasCategories;
@@ -285,7 +285,7 @@ void ScDocument::UpdateChartArea( const OUString&
rChartName,
// append to old ranges, keep other settings
aNewRanges = new ScRangeList;
-aNewRanges->Parse( aRangesStr, *this );
+aNewRanges->Parse( aRangesStr, *this,
GetAddressConvention());
for ( size_t nAdd = 0, nAddCount = rNewList->size();
nAdd < nAddCount; ++nAdd )
aNewRanges->push_back( (*rNewList)[nAdd] );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 951f0fe96823..bba2d90a0a71 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -384,7 +384,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
if (!bValid)
{
aRangeListRef = new ScRangeList;
-aRangeListRef->Parse( aRangeName, rDoc );
+aRangeListRef->Parse( aRangeName, rDoc,
rDoc.GetAddressConvention());
if ( !aRangeListRef->empty() )
{
bMultiRange = true;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4f65327b4a4d..facbba012fe2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4230,7 +4230,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj*
pTransObj, SCCOL nDestPos
OUString aChartName;
if (rThisDoc.HasChartAtPoint( nThisTab, rLogicPos, aChartName ))
{
-OUString aRangeName(aSource.Format(rThisDoc,
ScRefFlags::RANGE_ABS_3D));
+OUString aRangeName(aSource.Format(rThisDoc,
ScRefFlags::RANGE_ABS_3D,
+rThisDoc.GetAddressConvention()));
SfxStringItem aNameItem( SID_CHART_NAME, aChartName );
SfxStringItem aRangeItem( SID_CHART_SOURCE, aRangeName );
sal_uInt16 nId = bIsMove ? SID_CHART_SOURCE :
SID_CHART_ADDSOURCE;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source
sc/source/ui/view/gridwin.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 51dc26375e00e380eea5f8c53f35f21dbf8f8166
Author: Henry Castro
AuthorDate: Thu Jun 24 07:48:19 2021 -0400
Commit: Szymon Kłos
CommitDate: Thu Oct 7 18:10:49 2021 +0200
lok: sc: handle all local mouse tracking for Calc
Change-Id: I11f3477c0f966d403e076fc73b7e5507ad6597f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118877
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 125a5fc48a69..995c3009b28c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2721,16 +2721,13 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt
)
}
else if ( rTEvt.IsTrackingEnded() )
{
-if ( !comphelper::LibreOfficeKit::isActive() )
-{
-// MouseButtonUp always with matching buttons (eg for test tool, #
63148 #)
-// The tracking event will indicate if it was completed and not
canceled.
-MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
-rMEvt.GetMode(), nButtonDown,
rMEvt.GetModifier() );
-MouseButtonUp( aUpEvt );
-}
+// MouseButtonUp always with matching buttons (eg for test tool, #
63148 #)
+// The tracking event will indicate if it was completed and not
canceled.
+MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
+rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier()
);
+MouseButtonUp( aUpEvt );
}
-else if ( !comphelper::LibreOfficeKit::isActive() )
+else
MouseMove( rMEvt );
}
ESC meeting minutes: 2021-10-07
* Present: + Caolan, Cloph, Gabriel, Heiko, Hossein, Michael S, Michael M, Olivier, Xisco, Miklos, Eike, Kendy * Completed Action Items: + send a short mail about the openssh update to the dev list (Heiko) * Pending Action Items: + None * Release Engineering update (Cloph) + 7.2 status: 7.2.2 rc2 is tagged, builds are done, currently uploading + 7.1 status: 7.1.7 rc1 next week + Remotes: Android, iOS + Android viewer + 7.3 release plan will be at https://wiki.documentfoundation.org/ReleasePlan/7.3, expect it to be similar to 7.1 + what happened to the rolling release discussion? (Heiko) + depends on the autoupdater work first (Michael M) * Documentation (Olivier) + New Help + Fix index search (Ross Johnson) + Helpcontents2 + Updates and fixes (ohallot, R. Lima, S. Fanning, R. Johnson, A. Gelmini) + Refactors (ohallot, Johnny_M) + Bugs: 248 open, 30 partially addressed, 1 open, 4 closed + Update dialogs with extended tips (ohallot) + Guides + Work in progress * UX Update (Heiko) + Bugzilla (topicUI) statistics 257(257) (topicUI) bugs open, 157(157) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 10(1) 17(-1)42(-1) 92(-1) commented 90(40) 224(10) 751(9) 3302(-43) removed 0(0) 2(-1) 6(-3) 36(-1) resolved 9(7) 27(-2)95(1) 472(-13) + top 10 contributors: Heiko Tietze made 131 changes in 1 month, and 2258 changes in 1 year Foote, V Stuart made 42 changes in 1 month, and 588 changes in 1 year Dieter made 35 changes in 1 month, and 314 changes in 1 year Ross Johnson made 23 changes in 1 month, and 23 changes in 1 year Roman Kuznetsov made 16 changes in 1 month, and 214 changes in 1 year Telesto made 16 changes in 1 month, and 643 changes in 1 year Xisco Fauli made 13 changes in 1 month, and 186 changes in 1 year Nabet, Julien made 11 changes in 1 month, and 51 changes in 1 year Kaganski, Mike made 10 changes in 1 month, and 184 changes in 1 year Adolfo Jayme Barrientos made 9 changes in 1 month, and 52 changes in 1 year + New tickets with needsUXEval Sep/30-Oct/07 [Bug 113310] Special characters: A favorite character is only added to recent, if you insert it from the special characters dialog [Bug 144977] Please apply the "tip of the day" to the opened applications [wish] [Bug 144121] Writer: Table can be moved to new page, but not back [Bug 144946] Base: Tabbed Application UI -> [Bug 144938] Writer table border styles offered are different in the toolbar button vs. Table Properties dialog + trying to improve consistency here [Bug 141335] Tabbed Notebookbar: Style preview should not move the selected style to the first one [Bug 144920] Selecting text BOLD makes bold numbering as well [Bug 140561] wrong term for gutter position in mirrored page layout [Bug 144611] Image position off when changing 'to paragraph' to 'to character' back 'to paragraph' and drag the anchor [Bug 144879] Minor wording corrections [Bug 144839] Cannot access certain options in Tabbed interface [Bug 144853] Sentence case not undone when cycling case -> [Bug 48622] Line thickness specification - too many choices, nonintuitive + suggest 0.05 (very thin), 0.5 (thin), 1.5 (medium), 2.25 (thick), 4.5pt (extra thick), and custom + preliminary patch at https://gerrit.libreoffice.org/c/core/+/122683 * Crash Testing (Caolan) + 6(-1) import failure, 4(+0) export failures + 0 coverity issues + 3 ossfuzz issues (all Timeouts) + how many of the formats are missing fuzzing? (Michael M) + dbf is the most recent one (Caolan) + 3 Word fuzzers, 1 Excel one, no 1:1 file format ↔ fuzzer mapping * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/7.1.6.2 + (+256) 906 650 210 0 + https://crashreport.libreoffice.org/stats/version/7.2.0.4 + (-181) 1842 2023 2483 2159 1768 1068 0 + https://crashreport.libreoffice.org/stats/version/7.2.1.2 + (+592) 2042 1450 0 + https://crashreport.libreoffice.org/stats/signature/ScDBData::UpdateReference(ScDocument%20const%20*,UpdateRefMode,short,long,short,short,long,short,short,long,short) + Since 7.2.1.2 + Likely introduced in 0c0444c44107f1a18f23dd0833d462d8dbf56569. Tünde Tóth ? + regression from https://bugs.documentfoundation.org/show_bug.cgi?id=126926 + no repro steps yet * Mentoring/EasyHack update (Hossein) committer... 1 week 1 month
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/outdev.cxx | 55 +-
1 file changed, 45 insertions(+), 10 deletions(-)
New commits:
commit d7358047d9bcee8368a940bfb75b41fb65f87514
Author: Chris Sherlock
AuthorDate: Thu Sep 30 20:26:26 2021 +1000
Commit: Tomaž Vajngerl
CommitDate: Thu Oct 7 16:55:57 2021 +0200
vcl: test OutputDevice::Erase()
Change-Id: Id15ad1419a5f9d0e628c746770f05b2983c1f65b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122893
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index ca3b1d0a11be..351392362ed6 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -23,6 +23,8 @@
#include
#include
+const size_t INITIAL_SETUP_ACTION_COUNT = 5;
+
class VclOutdevTest : public test::BootstrapFixture
{
public:
@@ -68,6 +70,7 @@ public:
void testSystemTextColor();
void testShouldDrawWavePixelAsRect();
void testGetWaveLineSize();
+void testErase();
void testDrawPixel();
void testDrawLine();
void testDrawRect();
@@ -114,6 +117,7 @@ public:
CPPUNIT_TEST(testSystemTextColor);
CPPUNIT_TEST(testShouldDrawWavePixelAsRect);
CPPUNIT_TEST(testGetWaveLineSize);
+CPPUNIT_TEST(testErase);
CPPUNIT_TEST(testDrawPixel);
CPPUNIT_TEST(testDrawLine);
CPPUNIT_TEST(testDrawRect);
@@ -1037,6 +1041,36 @@ void VclOutdevTest::testGetWaveLineSize()
}
}
+void VclOutdevTest::testErase()
+{
+ScopedVclPtrInstance pVDev;
+GDIMetaFile aMtf;
+aMtf.Record(pVDev.get());
+
+// this actually triggers Erase()
+pVDev->SetOutputSizePixel(Size(1, 1));
+pVDev->Erase();
+
+MetaAction* pAction = aMtf.GetAction(INITIAL_SETUP_ACTION_COUNT);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a line color action (start)",
MetaActionType::LINECOLOR,
+ pAction->GetType());
+
+pAction = aMtf.GetAction(1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a fill color action (start)",
MetaActionType::FILLCOLOR,
+ pAction->GetType());
+
+pAction = aMtf.GetAction(2);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a rect action", MetaActionType::RECT,
pAction->GetType());
+
+pAction = aMtf.GetAction(3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a line color action (end)",
MetaActionType::LINECOLOR,
+ pAction->GetType());
+
+pAction = aMtf.GetAction(4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a fill color action (end)",
MetaActionType::FILLCOLOR,
+ pAction->GetType());
+}
+
void VclOutdevTest::testDrawPixel()
{
{
@@ -1044,13 +1078,14 @@ void VclOutdevTest::testDrawPixel()
GDIMetaFile aMtf;
aMtf.Record(pVDev.get());
+// triggers an Erase()
pVDev->SetOutputSizePixel(Size(1, 1));
pVDev->SetLineColor(COL_RED);
pVDev->DrawPixel(Point(0, 0), COL_GREEN);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Color not green", COL_GREEN,
pVDev->GetPixel(Point(0, 0)));
-MetaAction* pAction = aMtf.GetAction(aMtf.GetActionSize() - 1);
+MetaAction* pAction = aMtf.GetAction(INITIAL_SETUP_ACTION_COUNT + 1);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a pixel action",
MetaActionType::PIXEL,
pAction->GetType());
MetaPixelAction* pPixelAction =
dynamic_cast(pAction);
@@ -1071,7 +1106,7 @@ void VclOutdevTest::testDrawPixel()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Color not red", COL_RED,
pVDev->GetPixel(Point(0, 0)));
-MetaAction* pAction = aMtf.GetAction(aMtf.GetActionSize() - 1);
+MetaAction* pAction = aMtf.GetAction(INITIAL_SETUP_ACTION_COUNT + 1);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a point action",
MetaActionType::POINT,
pAction->GetType());
MetaPointAction* pPointAction =
dynamic_cast(pAction);
@@ -1090,7 +1125,7 @@ void VclOutdevTest::testDrawLine()
pVDev->SetOutputSizePixel(Size(1, 100));
pVDev->DrawLine(Point(0, 0), Point(0, 50));
-MetaAction* pAction = aMtf.GetAction(aMtf.GetActionSize() - 1);
+MetaAction* pAction = aMtf.GetAction(INITIAL_SETUP_ACTION_COUNT);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a line action",
MetaActionType::LINE, pAction->GetType());
MetaLineAction* pLineAction = dynamic_cast(pAction);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Line start has incorrect position",
Point(0, 0),
@@ -1115,7 +1150,7 @@ void VclOutdevTest::testDrawLine()
pVDev->SetOutputSizePixel(Size(1, 100));
pVDev->DrawLine(Point(0, 0), Point(0, 50), aLineInfo);
-MetaAction* pAction = aMtf.GetAction(aMtf.GetActionSize() - 1);
+MetaAction* pAction = aMtf.GetAction(INITIAL_SETUP_ACTION_COUNT);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a line action",
MetaActionType::LINE, pAction->GetType());
MetaLineAction* pLineAction =
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/dbconversion.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 97cf7321e0cddae4570c6ec4c5fb5b55764c26fa
Author: Caolán McNamara
AuthorDate: Thu Oct 7 12:54:18 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 7 17:41:23 2021 +0200
ofz: Integer-overflow
Change-Id: Ib0c1863c5fed92622b4bd601021a1174cf6ee68d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123213
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index e7df86d39215..fe26e3341d9f 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -273,7 +273,7 @@ namespace dbtools
static void addDays(const sal_Int32 nDays, css::util::Date& _rDate)
{
-sal_Int32 nTempDays = implRelativeToAbsoluteNull( _rDate );
+sal_Int64 nTempDays = implRelativeToAbsoluteNull(_rDate);
nTempDays += nDays;
if ( nTempDays > maxDays )
@@ -296,7 +296,7 @@ namespace dbtools
static void subDays(const sal_Int32 nDays, css::util::Date& _rDate )
{
-sal_Int32 nTempDays = implRelativeToAbsoluteNull( _rDate );
+sal_Int64 nTempDays = implRelativeToAbsoluteNull(_rDate);
nTempDays -= nDays;
if ( nTempDays > maxDays )
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdedxv.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c24f5e24e062ba76bc7ad94ee6f362ea1becbf59
Author: Tomaž Vajngerl
AuthorDate: Tue Sep 28 08:35:22 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Oct 7 18:53:13 2021 +0200
svx: defining "i" variable inside "for" statement is good enough
Change-Id: I30c8eb216ecde97451f2c8501424f95fee36d680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123218
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3a66fff6b2e2..ee10c54d853e 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1086,12 +1086,12 @@ bool SdrObjEditView::SdrBeginTextEdit(SdrObject* pObj_,
SdrPageView* pPV, vcl::W
bTextEditOnlyOneView = bOnlyOneView;
bTextEditNewObj = bIsNewObj;
const sal_uInt32 nWinCount(PaintWindowCount());
-sal_uInt32 i;
+
bool bBrk(false);
if (!pWin)
{
-for (i = 0; i < nWinCount && !pWin; i++)
+for (sal_uInt32 i = 0; i < nWinCount && !pWin; i++)
{
SdrPaintWindow* pPaintWindow = GetPaintWindow(i);
@@ -1279,7 +1279,7 @@ bool SdrObjEditView::SdrBeginTextEdit(SdrObject* pObj_,
SdrPageView* pPV, vcl::W
// register all windows as OutlinerViews with the Outliner
if (!bOnlyOneView)
{
-for (i = 0; i < nWinCount; i++)
+for (sal_uInt32 i = 0; i < nWinCount; i++)
{
SdrPaintWindow* pPaintWindow = GetPaintWindow(i);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdmrkv.hxx |1 +
svx/source/svdraw/svdmrkv.cxx | 11 ---
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit fee3bc725bffe4fe6970a3ec5eaf5efdcd53285c
Author: Tomaž Vajngerl
AuthorDate: Thu Sep 23 09:08:20 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Oct 7 18:52:03 2021 +0200
svx: move LOKit specifics into it's own method
Change-Id: I87f04d460d88c902426e881c03701b95414207d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123217
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 58f38d594c89..9b33b07c3a22 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -153,6 +153,7 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
virtual void ModelHasChanged() override; // Is called by the PaintView
virtual void SetMarkHandles(SfxViewShell* pOtherShell); // maHdlList -
fill (List of handles)
+void modelHasChangedLOKit();
void SetMarkRects();
// Rects at the PageViews
void CheckMarked();
// Scan MarkList after Del and Lock Layer ...
void AddDragModeHdl(SdrDragMode eMode);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 7334b82324aa..9c39166d5bf1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -229,7 +229,13 @@ void SdrMarkView::ModelHasChanged()
AdjustMarkHdl();
}
-if (!(comphelper::LibreOfficeKit::isActive() && GetMarkedObjectCount() >
0))
+if (comphelper::LibreOfficeKit::isActive())
+modelHasChangedLOKit();
+}
+
+void SdrMarkView::modelHasChangedLOKit()
+{
+if (GetMarkedObjectCount() <= 0)
return;
//TODO: Is MarkedObjRect valid at this point?
@@ -269,11 +275,10 @@ void SdrMarkView::ModelHasChanged()
pResultSelection =
}
-if(SfxViewShell* pViewShell = GetSfxViewShell())
+if (SfxViewShell* pViewShell = GetSfxViewShell())
SfxLokHelper::notifyInvalidation(pViewShell, pResultSelection);
}
-
bool SdrMarkView::IsAction() const
{
return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() ||
IsMarkGluePoints();
[Libreoffice-commits] core.git: connectivity/registry
connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 418e56997c9e63a5bc669c1b79157b2a4dbf6a2c Author: jucasaca AuthorDate: Mon Sep 13 20:39:53 2021 +0200 Commit: Julien Nabet CommitDate: Thu Oct 7 19:04:39 2021 +0200 tdf#85148 New option on database wizard to connect to Firebird Server Add a new option to the database connection wizard to connect to firebird database server Change-Id: Ie9c75187347a8532c1d869939c72a6f0a892d861 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122073 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu index 586264183b60..11b214855bc6 100644 --- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu @@ -77,13 +77,13 @@ - + com.sun.star.comp.sdbc.firebird.Driver -Firebird File +Firebird External
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk|1 source/auxiliary/sbasic.tree |1 source/text/sbasic/shared/03090413.xhp | 34 ++--- source/text/sbasic/shared/03102800.xhp | 60 +--- source/text/sbasic/shared/03104600.xhp | 76 ++- source/text/sbasic/shared/is_keyword.xhp | 71 6 files changed, 168 insertions(+), 75 deletions(-) New commits: commit 82e70eb6efa88c3d21606292a042cd6978385480 Author: Rafael Lima AuthorDate: Wed Oct 6 16:17:39 2021 +0200 Commit: Rafael Lima CommitDate: Thu Oct 7 19:37:03 2021 +0200 tdf#143687 Document the "IS" Basic keyword This patch also improves related help pages about the functions IsObject and EqualUnoObjects. Change-Id: I5f16596ed057c1104d5fa2650299861741bd7b2e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123153 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index dd4e3ebbe..75a17ee3a 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -385,6 +385,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/0317 \ helpcontent2/source/text/sbasic/shared/03170010 \ helpcontent2/source/text/sbasic/shared/05060700 \ +helpcontent2/source/text/sbasic/shared/is_keyword \ helpcontent2/source/text/sbasic/shared/calc_functions \ helpcontent2/source/text/sbasic/shared/code-stubs \ helpcontent2/source/text/sbasic/shared/classmodule \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index f811d0391..73969aca1 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -194,6 +194,7 @@ Int Function IPmt Function [VBA] IRR Function [VBA] +Is Operator IsArray Function IsDate Function IsEmpty Function diff --git a/source/text/sbasic/shared/03090413.xhp b/source/text/sbasic/shared/03090413.xhp index e7c2329ea..38c6709ae 100644 --- a/source/text/sbasic/shared/03090413.xhp +++ b/source/text/sbasic/shared/03090413.xhp @@ -1,5 +1,5 @@ - + - - - - Type Statement - /text/sbasic/shared/03090413.xhp - - - - - - Type statement - - Type Statement - Define non-UNO data structures. - + + +Type Statement +/text/sbasic/shared/03090413.xhp + + + + + + + Type statement + +Type Statement +Define non-UNO data structures. + A Type structure is an ordered collection of data fields, that can be manipulated as a single item. Type statement diagram @@ -66,4 +66,4 @@ CreateObject function - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03102800.xhp b/source/text/sbasic/shared/03102800.xhp index 650992598..4655ee47f 100644 --- a/source/text/sbasic/shared/03102800.xhp +++ b/source/text/sbasic/shared/03102800.xhp @@ -1,4 +1,5 @@ + - + - -IsObject Function -/text/sbasic/shared/03102800.xhp - - -Sun Microsystems, Inc. - + +IsObject Function +/text/sbasic/shared/03102800.xhp + + +Sun Microsystems, Inc. + - -IsObject function - -IsObject Function -Tests if a variable is an object, as opposed to primitive data types such as dates, numbers, texts. The function returns True if the variable is an object, otherwise it returns False. - -Syntax: - -IsObject(var) - -Return value: -Boolean -Parameters: - -var: Any variable that you want to test. - - -The following objects return True: + + + IsObject function + +IsObject Function +Tests if a variable is an object, as opposed to primitive data types such as dates, numbers, texts. The function returns True if the variable is an object, otherwise it returns False. + + This function returns True for the following object types: OLE objects or UNO objects Class module object instances @@ -53,8 +44,21 @@ %PRODUCTNAME Basic modules Data structures return True even when empty. Object defined variables return True even if uninitialized. + + +IsObject(var) + + + Boolean + + + var: The variable to be tested. + + + - Enum statement + +Enum statement @@ -65,4 +69,4 @@ Using variables - \ No newline at end of file + diff --git a/source/text/sbasic/shared/03104600.xhp b/source/text/sbasic/shared/03104600.xhp index 1339f6bc6..a3bd26262 100644 --- a/source/text/sbasic/shared/03104600.xhp +++ b/source/text/sbasic/shared/03104600.xhp @@ -1,5 +1,5 @@ - + - - -EqualUnoObjects Function -/text/sbasic/shared/03104600.xhp - - -Sun Microsystems, Inc. - + +EqualUnoObjects Function +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c6bd2fd7c0b54b3a2c32e49db6c66fabe9db3689 Author: Rafael Lima AuthorDate: Thu Oct 7 19:37:04 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Oct 7 19:37:04 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 82e70eb6efa88c3d21606292a042cd6978385480 - tdf#143687 Document the "IS" Basic keyword This patch also improves related help pages about the functions IsObject and EqualUnoObjects. Change-Id: I5f16596ed057c1104d5fa2650299861741bd7b2e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123153 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 163eaf2bf056..82e70eb6efa8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 163eaf2bf056073232a1336632e11e535c8a3000 +Subproject commit 82e70eb6efa88c3d21606292a042cd6978385480
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dbdata.hxx |4 ++--
sc/source/core/tool/dbdata.cxx | 13 +++--
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 9a0d52c95b6fd8639a56df2c2ceff07277253183
Author: Eike Rathke
AuthorDate: Thu Oct 7 18:02:23 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Oct 7 20:14:25 2021 +0200
Blind fix crash in ScDBData::UpdateReference(), tdf#126926 follow-up
Crash reports at
https://crashreport.libreoffice.org/stats/signature/ScDBData::UpdateReference(ScDocument%20const%20*,UpdateRefMode,short,long,short,short,long,short,short,long,short)
No reproducer yet, for a possible reproducer see
https://bugs.documentfoundation.org/show_bug.cgi?id=126926#c12
but creating such a scenario with 8 AutoFilters / sheets wasn't
sufficient.
However, ScDBCollection::NamedDBs (maNamedDBs) uses a std::set so after
erase(iterator++) iterator is still valid, but ScDBCollection::AnonDBs
maAnonDBs uses a std::vector for which after erase(iterator++) iterator
may be invalid if vector was shrunk and reallocated.
So use the iterator returning erase() instead to have a valid following
iterator, and for consistency do that for both.
A reproducer may need a bunch of sheets / anonymous AutoFilter for a
vector to shrink and be reallocated, and it may depend on the
plattform/compiler's implementation.
Change-Id: Ib57294d8af9f486b734f4294d8d310ce0fa20551
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123224
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 8ecd2faf602f..4f328ce88a6a 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -263,7 +263,7 @@ public:
*/
bool insert(std::unique_ptr p);
-void erase(const iterator& itr);
+iterator erase(const iterator& itr);
bool empty() const;
size_t size() const;
bool operator== (const NamedDBs& r) const;
@@ -295,7 +295,7 @@ public:
void deleteOnTab(SCTAB nTab);
ScDBData* getByRange(const ScRange& rRange);
void insert(ScDBData* p);
-void erase(const iterator& itr);
+iterator erase(const iterator& itr);
bool empty() const;
bool has( const ScDBData* p ) const;
bool operator== (const AnonDBs& r) const;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index f95d1e94b681..285654ef25c7 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1175,9 +1175,9 @@ bool
ScDBCollection::NamedDBs::insert(std::unique_ptr pData)
return r.second;
}
-void ScDBCollection::NamedDBs::erase(const iterator& itr)
+ScDBCollection::NamedDBs::iterator ScDBCollection::NamedDBs::erase(const
iterator& itr)
{
-m_DBs.erase(itr);
+return m_DBs.erase(itr);
}
bool ScDBCollection::NamedDBs::empty() const
@@ -1256,8 +1256,9 @@ void ScDBCollection::AnonDBs::insert(ScDBData* p)
m_DBs.push_back(std::unique_ptr(p));
}
-void ScDBCollection::AnonDBs::erase(const iterator& itr) {
-m_DBs.erase(itr);
+ScDBCollection::AnonDBs::iterator ScDBCollection::AnonDBs::erase(const
iterator& itr)
+{
+return m_DBs.erase(itr);
}
bool ScDBCollection::AnonDBs::empty() const
@@ -1461,7 +1462,7 @@ void ScDBCollection::UpdateReference(UpdateRefMode
eUpdateRefMode,
// Delete the database range, if some part of the reference became
invalid.
if (it->get()->UpdateReference(, eUpdateRefMode, nCol1, nRow1,
nTab1, nCol2, nRow2,
nTab2, nDx, nDy, nDz))
-maNamedDBs.erase(it++);
+it = maNamedDBs.erase(it);
else
++it;
}
@@ -1470,7 +1471,7 @@ void ScDBCollection::UpdateReference(UpdateRefMode
eUpdateRefMode,
// Delete the database range, if some part of the reference became
invalid.
if (it->get()->UpdateReference(, eUpdateRefMode, nCol1, nRow1,
nTab1, nCol2, nRow2,
nTab2, nDx, nDy, nDz))
-maAnonDBs.erase(it++);
+it = maAnonDBs.erase(it);
else
++it;
}
[Libreoffice-bugs] [Bug 128492] When opening HTML in Writer column and table width are not taken into account
https://bugs.documentfoundation.org/show_bug.cgi?id=128492 --- Comment #6 from Dieter --- Still present in Version: 7.2.1.2 (x64) / LibreOffice Community Build ID: 87b77fad49947c1441b67c559c339af8f3517e22 CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-GB Calc: CL -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144651] Field using ROUND formula works in MS Office but broken in LibreOffice
https://bugs.documentfoundation.org/show_bug.cgi?id=144651 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de Whiteboard| QA:needsComment| --- Comment #2 from Dieter --- I confirm the behaviour with Version: 7.2.1.2 (x64) / LibreOffice Community Build ID: 87b77fad49947c1441b67c559c339af8f3517e22 CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-GB Calc: CL Word count field should disply "7" but displays "70" But if you display field names (Strg+F9) you can see that there are two fields: "Statistics" and "ROUND(|-2)" I can't compare with Word 2016, because I get a Syntax Error So not sure for 100%, if it is a bug or not. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144987] New: When im trying to change the number in numbering field it shows space
https://bugs.documentfoundation.org/show_bug.cgi?id=144987 Bug ID: 144987 Summary: When im trying to change the number in numbering field it shows space Product: LibreOffice Version: 7.1.6.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: generiummadn...@gmail.com Description: When I put the line number in the headers and footers and try to change the initial value via RMB > edit fields, the program gives an incorrect value (just white space). But when I create many pages, erase numbers and paste them again, i see them clearly (or when reopen the document) and always, even when i see most of them, few last pages are still having these troubles. I will attach ODT document and screenshots how i see this bug. Steps to Reproduce: 1. create new document 2. add numbering into page(or foot, or both) header 3. increase it's value with RMB Actual Results: https://i.imgur.com/cZCtPiN.png Expected Results: https://i.imgur.com/LR9LRdS.png Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: Version: 7.2.1.2 (x64) / LibreOffice Community Build ID: 87b77fad49947c1441b67c559c339af8f3517e22 CPU threads: 16; OS: Windows 10.0 Build 22000; UI render: Skia/Vulkan; VCL: win Locale: ru-RU (ru_RU); UI: ru-RU Calc: CL It is Windows 11. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144986] Formula to Value renders a blank non-empty cell
https://bugs.documentfoundation.org/show_bug.cgi?id=144986 m.a.riosv changed: What|Removed |Added CC||miguelangelrv@libreoffice.o ||rg --- Comment #1 from m.a.riosv --- I don't agree, to change the value, for me it's fine, it is not an empty cell, with the same value before the operation. 1 2 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144988] Fontwork has wrong size text, if it has more than one paragraph and font size is too large
https://bugs.documentfoundation.org/show_bug.cgi?id=144988 Regina Henschel changed: What|Removed |Added Summary|Fontwork has wrong size |Fontwork has wrong size |text has more than one |text, if it has more than |paragraph and font size is |one paragraph and font size |too large |is too large -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144037] kf5: Unable to insert table from toolbar button
https://bugs.documentfoundation.org/show_bug.cgi?id=144037 Julien Nabet changed: What|Removed |Added CC||wod...@gmail.com --- Comment #27 from Julien Nabet --- *** Bug 144974 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144974] FORMATEAR: no se pueden seleccionar con el ratón opciones como color del texto y de fondo
https://bugs.documentfoundation.org/show_bug.cgi?id=144974 Julien Nabet changed: What|Removed |Added Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #2 from Julien Nabet --- *** This bug has been marked as a duplicate of bug 144037 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144835] EDITING Increasing indent on a paragraph is not recorded as tracked change
https://bugs.documentfoundation.org/show_bug.cgi?id=144835 Deep17 changed: What|Removed |Added CC||deepoose2...@gmail.com Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #4 from Deep17 --- I can reproduce the bug in stable and master build. Version: 7.2.1.2 (x64) / LibreOffice Community Build ID: 87b77fad49947c1441b67c559c339af8f3517e22 CPU threads: 4; OS: Windows 10.0 Build 19042; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL Version: 7.3.0.0.alpha0+ (x64) / LibreOffice Community Build ID: c2de581d1943df2d84f2b71817b6a8bee41f0217 CPU threads: 4; OS: Windows 10.0 Build 19042; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144987] When im trying to change the number in numbering field it shows space
https://bugs.documentfoundation.org/show_bug.cgi?id=144987 --- Comment #4 from Anatoliy --- Created attachment 175586 --> https://bugs.documentfoundation.org/attachment.cgi?id=175586=edit last page from my pov -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144987] When im trying to change the number in numbering field it shows space
https://bugs.documentfoundation.org/show_bug.cgi?id=144987 --- Comment #3 from Anatoliy --- Created attachment 175585 --> https://bugs.documentfoundation.org/attachment.cgi?id=175585=edit second page from my pov -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144987] When im trying to change the number in numbering field it shows space
https://bugs.documentfoundation.org/show_bug.cgi?id=144987 --- Comment #2 from Anatoliy --- Created attachment 175584 --> https://bugs.documentfoundation.org/attachment.cgi?id=175584=edit first page from my pov -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144988] New: Fontwork has wrong size text has more than one paragraph and font size is too large
https://bugs.documentfoundation.org/show_bug.cgi?id=144988 Bug ID: 144988 Summary: Fontwork has wrong size text has more than one paragraph and font size is too large Product: LibreOffice Version: 5.4.7.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: rb.hensc...@t-online.de Created attachment 175587 --> https://bugs.documentfoundation.org/attachment.cgi?id=175587=edit Fontwork examples Open attached document. It has four Fontwork shapes. The style is set by an own style "myFontwork for testing". The font size is so, that the text fits into the width of the shape. Now open the style and set the font size a little bit larger, e.g. to 28pt. Notice, that the text in those shapes, which have two paragraphs, is wrongly rendered. The expected behavior can be seen in the examples with one paragraph. If the font size is so large, that the text block does not fit into the width of the bounding box of the path, then the font size used for rendering is decreased until it fits. The path in these objects are one or two horizontal lines from left to right of the shape. The text-path-scale attribute is set to "shape", which corresponds to "ScaleX=true" in the property "TextPath" in property "CustomShapeGeometry". -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144986] New: Formula to Value renders a blank non-empty cell
https://bugs.documentfoundation.org/show_bug.cgi?id=144986 Bug ID: 144986 Summary: Formula to Value renders a blank non-empty cell Product: LibreOffice Version: 7.0.6.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: iavs.le...@gmail.com Description: When a formula result is "", Formula to Value renders the cell content as an empty paragraph (), not as an empty cell. Steps to Reproduce: 1. In A2 type ="" 2. Select A2, choose menu Data - Calculate - Formula to Value 3. Press Ctrl+End (Moves the cursor to the last cell on the sheet that contains data.) Actual Results: Last cell is A2. Expected Results: Last cell is A1. Reproducible: Always User Profile Reset: No Additional Info: Version: 7.0.6.2 (x86) Build ID: 144abb84a525d8e30c9dbbefa69cbbf2d8d4ae3b CPU threads: 4; OS: Windows 6.1 Service Pack 1 Build 7601; UI render: Skia/Raster; VCL: win Locale: es-MX (es_MX); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 123616] qtz / keyID builds: key IDs are not shown in new dialogs
https://bugs.documentfoundation.org/show_bug.cgi?id=123616 Andras Timar changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED --- Comment #9 from Andras Timar --- I think the workaround suggested in Comment 8 is good enough for the very few users who need the KeyID feature. I added a note to https://wiki.documentfoundation.org/Language#KeyID -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144987] When im trying to change the number in numbering field it shows space
https://bugs.documentfoundation.org/show_bug.cgi?id=144987 --- Comment #1 from Anatoliy --- Created attachment 175583 --> https://bugs.documentfoundation.org/attachment.cgi?id=175583=edit glitched file -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144974] FORMATEAR: no se pueden seleccionar con el ratón opciones como color del texto y de fondo
https://bugs.documentfoundation.org/show_bug.cgi?id=144974 Julien Nabet changed: What|Removed |Added Version|7.0.0.2 rc |7.2.1.2 release -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144981] Insert Hyperlink dialog with artifacts in icons on the left bar
https://bugs.documentfoundation.org/show_bug.cgi?id=144981 Dieter changed: What|Removed |Added Whiteboard|QA:needsComment | Blocks||112125 CC||dgp-m...@gmx.de --- Comment #2 from Dieter --- Also not a problem in Windows. Tested with Version: 7.2.1.2 (x64) / LibreOffice Community Build ID: 87b77fad49947c1441b67c559c339af8f3517e22 CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-GB Calc: CL Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112125 [Bug 112125] [META] Hyperlink dialog bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 112125] [META] Hyperlink dialog bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=112125 Dieter changed: What|Removed |Added Depends on||144981 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=144981 [Bug 144981] Insert Hyperlink dialog with artifacts in icons on the left bar -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 37808] Button 'Word Justify' works incorrectly on fontwork
https://bugs.documentfoundation.org/show_bug.cgi?id=37808 Regina Henschel changed: What|Removed |Added CC||rb.hensc...@t-online.de --- Comment #12 from Regina Henschel --- The current rendering is wrong, the text should be centered. The option "Word justify" is currently bound to the setting "option middle/center with checked 'Full width'" in the 'Text Attributes' dialog. That means, that it specifies an anchor for the text block. [The options 'Left align', 'Right align' and 'Center' are too bound the Anchor setting in the 'Text Attributes' dialog.] The setting 'Full width' means, that the reference for the alignment of paragraphs in the text block of a custom shape is the edge of the text area of the custom shape. 'Full width disabled' means, that the reference is the box of the longest paragraph. But that makes no sense for Fontwork. The paragraphs in the text of a Fontwork cannot have different alignments and the text area is ignored for Fontwork. This bounding to the "Text Attributes" dialog exists already in OOo2.4.3. and also the error, that the text becomes left aligned. The expected behavior of "justify" cannot be achieved with binding to anchor "middle/center with 'full width' checked". So either the option should be removed or a new implementation is needed. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144190] _Left Align and _Right Align should be Align _Left and Align _Right
https://bugs.documentfoundation.org/show_bug.cgi?id=144190 Regina Henschel changed: What|Removed |Added CC||rb.hensc...@t-online.de --- Comment #1 from Regina Henschel --- The settings "Left Align", "Center", "Right Align" and "Word justify" in the drop-down "Fontwork Alignment" are bound to the "Anchor" setting in the 'Text Attributes' dialog. Thereby only the vertical middle options are supported (at least for horizontal writing mode, don't now for top-bottom writing mode). When you set the anchor to the option "middle right" in the 'Text Attributes', then the "Fontwork Alignment" will be "Right Align" and vis-a-vis. The option "Center" belongs to option "middle/center disabled 'Full width" and the option "Word justify" belongs to option "middle/center with checked 'Full width'". "Word justify" rendering is broken, see bug 37808. Therefore I'm not sure whether "align" is the correct term at all. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144763] icons degrade Skia Vulkan rendering on nVidia MX130 with 462.376 driver
https://bugs.documentfoundation.org/show_bug.cgi?id=144763 --- Comment #19 from V Stuart Foote --- Ok Marta, despite the updated drivers (and challenges of getting nVidia Optimus control over the Intel or the discrete GPU) with updated driver you still have issues with Skia Vulkan rendering. RenderMethod: vulkan Vendor: 0x10de Device: 0x174d API: 1.2.175 Driver: 472.48.0 DeviceType: discrete DeviceName: NVIDIA GeForce MX130 Denylisted: no Meaning, simply avoid Vulkan and use Skia software raster rendering instead: Tools -> Options -> View and add the check for "Force Skia software rendering" See if doing so behaves (for either GPU). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 126862] [META] Issues with unusual builds / unit tests
https://bugs.documentfoundation.org/show_bug.cgi?id=126862 Bug 126862 depends on bug 123616, which changed state. Bug 123616 Summary: qtz / keyID builds: key IDs are not shown in new dialogs https://bugs.documentfoundation.org/show_bug.cgi?id=123616 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144985] New: Chart custom colors are not used in the legend
https://bugs.documentfoundation.org/show_bug.cgi?id=144985 Bug ID: 144985 Summary: Chart custom colors are not used in the legend Product: LibreOffice Version: 7.2.0.4 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Chart Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jean-francois.nifenec...@laposte.net Created attachment 175581 --> https://bugs.documentfoundation.org/attachment.cgi?id=175581=edit A chart with custom colors and a legend When setting custom colors for the data range (fill color), the newly used colors are not used in the legend, where the standard ones are still present. See attachment. Checked present under Linux and Windows (same version, see below). Version: 7.2.0.4 / LibreOffice Community Build ID: 9a9c6381e3f7a62afc1329bd359cc48accb6435b CPU threads: 4; OS: Linux 4.19; UI render: default; VCL: gtk3 Locale: fr-FR (fr_FR.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 141724] The dialog in Report Wizard use localized string instead of KeyID
https://bugs.documentfoundation.org/show_bug.cgi?id=141724 Andras Timar changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144037] kf5: Unable to insert table from toolbar button
https://bugs.documentfoundation.org/show_bug.cgi?id=144037 Julien Nabet changed: What|Removed |Added CC||serval2...@yahoo.fr Severity|major |critical --- Comment #28 from Julien Nabet --- I know it's not a crash and specific to Linux/kde env but: - it's a regression - it makes LO unusable on KDE - it has a lot of duplicates I think this one requires an exception on bug triaging rules. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 142214] Improve Calc's auto-complete feature
https://bugs.documentfoundation.org/show_bug.cgi?id=142214 Timur changed: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org Keywords||needsUXEval --- Comment #56 from Timur --- This bug was started and commits and reviews done by the single person. It didn't have UXeval, which I ask now. IMO it's of the highest priority for UX, given number and content of comments, including those hidden. This is WIP and should not affect Fresh version 7.2 with frozen GUI and features, so I asked to revert all commits in 7.2 and consider issue with 7.3+. Personally at this moment, unless explained differently, I don't see other option than to add changes only as an option. While "we can't have options for all" they should exist for controversial features, where user expectations are different. -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-bugs] [Bug 144989] New: Exported PDF of master document with hidden sections in chapters looses pagination
https://bugs.documentfoundation.org/show_bug.cgi?id=144989 Bug ID: 144989 Summary: Exported PDF of master document with hidden sections in chapters looses pagination Product: LibreOffice Version: 7.3.0.0 alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: olivier.hal...@libreoffice.org Created attachment 175588 --> https://bugs.documentfoundation.org/attachment.cgi?id=175588=edit Situation of correct page number of PDF toc This bug is a follow-up of bug#84913, and add sample data for testing and verification. The zip file contains all files needed. https://nextcloud.documentfoundation.org/s/t4s5e3GtZe29GPN The archive contains GS70-GettingStarted.odm * A master doc linking all chapters. * On page 3 of the master doc there is a string "book [0|1]. 0 or 1 is a variable field controlling hidden sections in the chapters. * When 'book eq 1', the chapter sections containing the heading "Copyright..." are hidden and the hidden section are not visible nor printed. * When 'book eq 0', the chapter sections containing the heading "Copyright..." are not hidden and are visible and printed. * Open the master document and update the links as usual. GS70NN-(..).odt * Chapter files. * All chapter files have a section with condition "book eq 1" wrapping the Copyright heading and the chapter TOC. When 'book eq 1' the section is hidden. 0.pdf - A pdf file where 'book eq 0', meaning that all sections are visible. 1.pdf - A pdf file where 'book eq 1', meaning all chapter's copyright + TOC are hidden. Actual results -- The screen shots shows the issue Screenshot_0.pdf.png shows a PDF reader with PDF "Contents" on the right, accessing heading "Changing formula color". The PDF page is correctly displays showing the heading. The PDF ToC shows page 342 and the PDF page is actually 342. That is OK. Likewise, Screenshot_1.pdf.png access heading "Changing formula color" on page 313 but the heading target is lost. The page number does not correspond to the heading "Changing formula color". Actually the "Changing formula color" heading is located in page 337 of the PDF file. Expected results with hidden sections actually hidden, the page numbers of the exported PDF contents right pane should point to the right page in the file. In the case above, instead of "Changing formula color" on page 313, it should be "Changing formula color" on page 337. Note The issue (page number offset) is even more visible when TOC points to the end of the PDF file, higher chapters. The issue is not visible in the beginning of the file (lower chapters) It seems that the offset depend on the number and size of the hidden sections. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144675] Dokumentation, Fehlerhafte Hilfeseiten
https://bugs.documentfoundation.org/show_bug.cgi?id=144675 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144681] UI: Comment box starts flashing on keypress when in table
https://bugs.documentfoundation.org/show_bug.cgi?id=144681 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144190] _Left Align and _Right Align should be Align _Left and Align _Right
https://bugs.documentfoundation.org/show_bug.cgi?id=144190 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 134729] "updates available" icon in the macOS menu bar doesn't bring up LibreOffice when clicked
https://bugs.documentfoundation.org/show_bug.cgi?id=134729 QA Administrators changed: What|Removed |Added Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 140452] Image anchored to Page misplaced after PDF export
https://bugs.documentfoundation.org/show_bug.cgi?id=140452 --- Comment #5 from QA Administrators --- Dear Telesto, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 40244] FILESAVE to read-only location gives wrong error message
https://bugs.documentfoundation.org/show_bug.cgi?id=40244 --- Comment #16 from QA Administrators --- Dear brookembecker, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 46180] FILEOPEN - LO Base fails to connect to "*.DBF" files but connects OK to "*.dbf"
https://bugs.documentfoundation.org/show_bug.cgi?id=46180 --- Comment #17 from QA Administrators --- Dear Aleksey, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 139014] Heading Format & TOC carry preceding UNDELETEABLE period, sometimes a space also.
https://bugs.documentfoundation.org/show_bug.cgi?id=139014 --- Comment #7 from QA Administrators --- Dear matthew.musial609, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 139014] Heading Format & TOC carry preceding UNDELETEABLE period, sometimes a space also.
https://bugs.documentfoundation.org/show_bug.cgi?id=139014 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 136508] Drop down list is in black color in ' Tools -> Customize -> Toolbars' of Calc [Version 7.0.1.2]
https://bugs.documentfoundation.org/show_bug.cgi?id=136508 --- Comment #8 from QA Administrators --- Dear Nukool Chompuparn, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 141262] libreoffice can't generate word 2003 xml file rightliy , especial it has table in
https://bugs.documentfoundation.org/show_bug.cgi?id=141262 --- Comment #2 from QA Administrators --- Dear netmou, This bug has been in NEEDINFO status with no change for at least 6 months. Please provide the requested information as soon as possible and mark the bug as UNCONFIRMED. Due to regular bug tracker maintenance, if the bug is still in NEEDINFO status with no change in 30 days the QA team will close the bug as INSUFFICIENTDATA due to lack of needed information. For more information about our NEEDINFO policy please read the wiki located here: https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO If you have already provided the requested information, please mark the bug as UNCONFIRMED so that the QA team knows that the bug is ready to be confirmed. Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-NeedInfo-Ping -- You are receiving this mail because: You are the assignee for the bug.
