sfx2/source/view/viewsh.cxx | 1 +
wizards/com/sun/star/wizards/db/CommandMetaData.java | 7 ++++++-
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 10 +++++-----
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit eea21fab2b3c5bd692b71cf446de2f37e049a153
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 08:52:08 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:12 2024 +0200
cid#1606722 PA: Public Attribute
Change-Id: I23f518a7b492ae92417657f5a319eb1aae4dac3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173941
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java
b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index cec77c795634..66b507ca69c9 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -53,7 +53,7 @@ public class CommandMetaData extends DBMetaData
public String[][] AggregateFieldNames = new String[][]
{
};
- public String[] NumericFieldNames = new String[]
+ private String[] NumericFieldNames = new String[]
{
};
protected String[] NonAggregateFieldNames;
@@ -105,6 +105,11 @@ public class CommandMetaData extends DBMetaData
}
}
+ public String[] getNumericFieldNames()
+ {
+ return NumericFieldNames;
+ }
+
public Map<String, String> getFieldTitleSet()
{
return FieldTitleSet;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 1eaee1fb6ab4..deed09843d13 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -296,9 +296,9 @@ public class AggregateComponent extends ControlScroller
String[][] sAggregateFieldNames = this.getAggregateFieldNames();
if (benableGroupPage)
{
- for (int i = 0; i < CurDBMetaData.NumericFieldNames.length;
i++)
+ for (int i = 0; i <
CurDBMetaData.getNumericFieldNames().length; i++)
{
- boolean bisthere =
(JavaTools.FieldInTable(sAggregateFieldNames,
CurDBMetaData.NumericFieldNames[i]) > -1);
+ boolean bisthere =
(JavaTools.FieldInTable(sAggregateFieldNames,
CurDBMetaData.getNumericFieldNames()[i]) > -1);
if (!bisthere)
{
return true;
@@ -362,7 +362,7 @@ public class AggregateComponent extends ControlScroller
if ((iselfield.length > 0) && (iselfunction.length
> 0))
{
String[] curaggregatename = new String[] {
-
CurDBMetaData.NumericFieldNames[iselfield[0]],
+
CurDBMetaData.getNumericFieldNames()[iselfield[0]],
this.sFunctionOperators[iselfunction[0]] };
aggregatevector.add(curaggregatename);
}
@@ -446,7 +446,7 @@ public class AggregateComponent extends ControlScroller
PropertyValue[] currowproperties = new PropertyValue[2];
if (_index < CurDBMetaData.AggregateFieldNames.length)
{
- short iselfieldsindex = (short)
JavaTools.FieldInList(CurDBMetaData.NumericFieldNames,
CurDBMetaData.AggregateFieldNames[_index][0]);
+ short iselfieldsindex = (short)
JavaTools.FieldInList(CurDBMetaData.getNumericFieldNames(),
CurDBMetaData.AggregateFieldNames[_index][0]);
iselfieldslist = new short[]
{
iselfieldsindex
@@ -535,7 +535,7 @@ public class AggregateComponent extends ControlScroller
private void insertFieldNames()
{
- Helper.setUnoPropertyValue(UnoDialog.getModel(xFieldListBox),
PropertyNames.STRING_ITEM_LIST, CurDBMetaData.NumericFieldNames);
+ Helper.setUnoPropertyValue(UnoDialog.getModel(xFieldListBox),
PropertyNames.STRING_ITEM_LIST, CurDBMetaData.getNumericFieldNames());
}
private boolean isComplete()
commit 2c2fc06966dc91306ff83f7d0f2c37925b6b57f4
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 13:31:33 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:01 2024 +0200
Related: cool#9735 allow LOK_CALLBACK_DOCUMENT_SIZE_CHANGED during paint
we want this to get through because of a scenario like
#0 ignoreLibreOfficeKitViewCallback (nType=13, pImpl=0xf9bd620) at
/home/caolan/LibreOffice/co-24.04/sfx2/source/view/viewsh.cxx:3219
#1 0x00007fd4a2428979 in SfxViewShell::libreOfficeKitViewCallback
(this=0xf9bd090, nType=13, pPayload=...) at
/home/caolan/LibreOffice/co-24.04/sfx2/source/view/viewsh.cxx:3278
#2 0x00007fd4a23ab80b in SfxLokHelper::notifyDocumentSizeChanged
(pThisView=0xf9bd090, rPayload=..., pDoc=0xec53578, bInvalidateAll=true) at
/home/caolan/LibreOffice/co-24.04/sfx2/source/view/lokhelper.cxx:711
#3 0x00007fd484eba265 in SwViewShell::SizeChgNotify (this=0xf9bf3c0) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/view/viewsh.cxx:1154
#4 0x00007fd484775a62 in AdjustSizeChgNotify (pRoot=0xed16880) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/pagechg.cxx:842
#5 0x00007fd48477e029 in SwRootFrame::CheckViewLayout (this=0xed16880,
pViewOpt=0x0, pVisArea=0x0) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/pagechg.cxx:2436
#6 0x00007fd484775da2 in SwPageFrame::Cut (this=0x120350f0) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/pagechg.cxx:914
#7 0x00007fd484779ec8 in SwRootFrame::RemovePage (this=0xed16880,
pDelRef=0x7ffe90279548, eResult=SwRemoveResult::Prev) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/pagechg.cxx:1511
#8 0x00007fd48477a187 in SwRootFrame::RemoveSuperfluous (this=0xed16880)
at /home/caolan/LibreOffice/co-24.04/sw/source/core/layout/pagechg.cxx:1550
#9 0x00007fd4847336b2 in SwLayAction::InternalAction
(this=0x7ffe90279a60, pRenderContext=0xf9bb5f0) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/layact.cxx:694
#10 0x00007fd4847323b8 in SwLayAction::Action (this=0x7ffe90279a60,
pRenderContext=0xf9bb5f0) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/layout/layact.cxx:396
#11 0x00007fd484eb5fc2 in SwViewShell::ImplEndAction (this=0xf9bf3c0,
bIdleEnd=false) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/view/viewsh.cxx:309
#12 0x00007fd483fa3f78 in SwViewShell::EndAction (this=0xf9bf3c0,
bIdleEnd=false) at /home/caolan/LibreOffice/co-24.04/sw/inc/viewsh.hxx:637
#13 0x00007fd484ebf56b in SwViewShell::ApplyViewOptions (this=0xeddec90,
rOpt=...) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/view/viewsh.cxx:2235
#14 0x00007fd484577013 in SwEditShell::ApplyViewOptions (this=0xeddec90,
rOpt=...) at
/home/caolan/LibreOffice/co-24.04/sw/source/core/edit/editsh.cxx:1094
#15 0x00007fd48574a5cf in SwWrtShell::ApplyViewOptions (this=0xeddec90,
rOpt=...) at
/home/caolan/LibreOffice/co-24.04/sw/source/uibase/wrtsh/wrtsh1.cxx:2137
#16 0x00007fd484ebe79e in SwViewShell::PaintTile (this=0xeddec90,
rDevice=..., contextWidth=1792, contextHeight=768, tilePosX=0, tilePosY=113280,
tileWidth=13440, tileHeight=5760)
at
/home/caolan/LibreOffice/co-24.04/sw/source/core/view/viewsh.cxx:2019
#17 0x00007fd4855fc5f0 in SwXTextDocument::paintTile (this=0xec53280,
rDevice=..., nOutputWidth=1792, nOutputHeight=768, nTilePosX=0,
nTilePosY=113280, nTileWidth=13440, nTileHeight=5760)
at
/home/caolan/LibreOffice/co-24.04/sw/source/uibase/uno/unotxdoc.cxx:3145
#18 0x00007fd4a24c5ada in doc_paintTile (pThis=0xed2fa10,
pBuffer=0x12871f30 "", nCanvasWidth=1792, nCanvasHeight=768, nTilePosX=0,
nTilePosY=113280, nTileWidth=13440, nTileHeight=5760)
at /home/caolan/LibreOffice/co-24.04/desktop/source/lib/init.cxx:4431
#19 0x00007fd4a24c6bb3 in doc_paintPartTile (pThis=0xed2fa10,
pBuffer=0x12871f30 "", nPart=0, nMode=0, nCanvasWidth=1792, nCanvasHeight=768,
nTilePosX=0, nTilePosY=113280, nTileWidth=13440, nTileHeight=5760)
at /home/caolan/LibreOffice/co-24.04/desktop/source/lib/init.cxx:4629
#20 0x00000000005f0f0e in lok::Document::paintPartTile (this=0xf521420,
pBuffer=0x12871f30 "", nPart=0, nMode=0, nCanvasWidth=1792, nCanvasHeight=768,
nTilePosX=0, nTilePosY=113280, nTileWidth=13440, nTileHeight=5760)
at
/home/caolan/LibreOffice/co-24.04/include/LibreOfficeKit/LibreOfficeKit.hxx:621
#21 0x00000000005c2627 in
RenderTiles::doRender(std::shared_ptr<lok::Document> const&, DeltaGenerator&,
TileCombined&, ThreadPool&, std::function<void (unsigned char*, int, int,
unsigned long, unsigned long, int, int, LibreOfficeKitTileMode)> const&,
std::function<void (char const*, unsigned long)> const&, unsigned int, int,
bool) (document=..., deltaGen=..., tileCombined=..., pngPool=...,
blendWatermark=..., outputMessage=...,
mobileAppDocId=3, canonicalViewId=1000, dumpTiles=false) at
./common/RenderTiles.hpp:123
#22 0x00000000005cd29d in Document::renderTiles (this=0xe6eefc0,
tileCombined=...) at kit/Kit.cpp:933
where otherwise the browser gets no update of the document size.
Change-Id: I396daa9c7ee5c306ee107839f6fba6b26a70683d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173936
Tested-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit ed75469d322f61abef634d417c5c81bb28585023)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 09483712ccca..db8529957e95 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -3216,6 +3216,7 @@ static bool ignoreLibreOfficeKitViewCallback(int nType,
const SfxViewShell_Impl*
case LOK_CALLBACK_FORM_FIELD_BUTTON:
case LOK_CALLBACK_TEXT_SELECTION:
case LOK_CALLBACK_COMMENT:
+ case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
break;
default:
// Reject e.g. invalidate during paint.
