License statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/transparent.cxx | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 1f5ac5b08fd8c1ddadc5f38595a487db2895957e
Author: Mike Kaganski
AuthorDate: Mon Aug 24 07:56:46 2020 +0300
Commit: Mike Kaganski
CommitDate: Mon Aug 24 07:49:02 2020 +0200
Don't apply transparency twice when drawing to mpAlphaVDev
We pass fTransparency to mpAlphaVDev->DrawTransparent; using adjusted
fill/line color is wrong. The correct COL_BLACK/COL_TRANSPARENT were
already set in mpAlphaVDev when SetFillColor/SetLineColor were called
to the virtual device.
Wrong implementation from commit 9c621ee8ea41a1c53bfeca49827290826785973e.
Change-Id: Ic858ede1ba793ac00f831a3960f748ad20ccb70a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101262
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/outdev/transparent.cxx
b/vcl/source/outdev/transparent.cxx
index f9da8c9975da..839550c0fe1c 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -248,6 +248,8 @@ void OutputDevice::DrawTransparent(
// create ObjectToDevice transformation
const basegfx::B2DHomMatrix
aFullTransform(ImplGetDeviceTransformation() * rObjectTransform);
+// TODO: this must not drop transparency for mpAlphaVDev case, but
instead use premultiplied
+// aplha... but that requires using premultiplied alpha also for
already drawn data
const double fAdjustedTransparency = mpAlphaVDev ? 0 : fTransparency;
bool bDrawnOk(true);
@@ -294,20 +296,8 @@ void OutputDevice::DrawTransparent(
}
if (mpAlphaVDev)
-{
-const Color aFillCol(mpAlphaVDev->GetFillColor());
-const Color aLineColor(mpAlphaVDev->GetLineColor());
-const auto nGreyScale = static_cast(std::round(255
* fTransparency));
-const Color aNewColor(nGreyScale, nGreyScale, nGreyScale);
-mpAlphaVDev->SetFillColor(aNewColor);
-mpAlphaVDev->SetLineColor(aNewColor);
-
mpAlphaVDev->DrawTransparent(rObjectTransform, rB2DPolyPoly,
fTransparency);
-mpAlphaVDev->SetFillColor(aFillCol);
-mpAlphaVDev->SetLineColor(aLineColor);
-}
-
return;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crstrvl.cxx |2 +-
sw/source/core/txtnode/ndtxt.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2c7bf3543ab798d1c117d9f3258467e4aef9a8db
Author: Samuel Mehrbrodt
AuthorDate: Thu Aug 20 15:33:49 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Aug 24 07:34:25 2020 +0200
Related tdf#100492 Detect click into empty field
Change-Id: Ic2937d619a8361b9d17b7dfa16698a5005f34ec6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101076
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 5bea3f176289..11589b8e4181 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -927,7 +927,7 @@ bool SwCursorShell::CursorInsideInputField() const
{
for(SwPaM& rCursor : GetCursor()->GetRingContainer())
{
-if (dynamic_cast(GetTextFieldAtCursor(&rCursor, false)))
+if (dynamic_cast(GetTextFieldAtCursor(&rCursor, true)))
return true;
}
return false;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6d6f241e7b2c..1dd213960885 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1778,7 +1778,7 @@ SwTextField* SwTextNode::GetFieldTextAttrAt(
dynamic_cast( GetTextAttrAt(
nIndex,
RES_TXTATR_INPUTFIELD,
-bIncludeInputFieldAtStart ? DEFAULT : PARENT ));
+bIncludeInputFieldAtStart ? DEFAULT : EXPAND ));
}
return pTextField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bitmap.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 9ff0cd1f6b2200940ac51e580809e2a17c4b9550
Author: Mike Kaganski
AuthorDate: Mon Aug 24 00:13:19 2020 +0300
Commit: Mike Kaganski
CommitDate: Mon Aug 24 04:33:34 2020 +0200
tdf#136047: fix OutputDevice::DrawTransformBitmapExDirect for ...
transparent bitmap case
This has been broken in commit 9c621ee8ea41a1c53bfeca49827290826785973e,
where transparent bitmap started to override any transparency of vdev
with transparency of its pixels, and not use alpha when drawing RGB when
mpAlphaVDev was present.
Instead, this restores using alpha in RGB output, and blends alpha to
what is already in mpAlphaVDev.
Change-Id: Id82717def4535336450a7118f8bd29a1660c9520
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101254
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 58a096a79045..88898d93179d 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1050,7 +1050,6 @@ bool OutputDevice::DrawTransformBitmapExDirect(
const basegfx::B2DPoint aTopX(aFullTransform * basegfx::B2DPoint(1.0,
0.0));
const basegfx::B2DPoint aTopY(aFullTransform * basegfx::B2DPoint(0.0,
1.0));
SalBitmap* pSalSrcBmp = rBitmapEx.GetBitmap().ImplGetSalBitmap().get();
-SalBitmap* pSalAlphaBmp = nullptr;
Bitmap aAlphaBitmap;
if(rBitmapEx.IsTransparent())
@@ -1063,8 +1062,6 @@ bool OutputDevice::DrawTransformBitmapExDirect(
{
aAlphaBitmap = rBitmapEx.GetMask();
}
-if (!mpAlphaVDev)
-pSalAlphaBmp = aAlphaBitmap.ImplGetSalBitmap().get();
}
else if (mpAlphaVDev)
{
@@ -1072,6 +1069,8 @@ bool OutputDevice::DrawTransformBitmapExDirect(
aAlphaBitmap.Erase(COL_BLACK);
}
+SalBitmap* pSalAlphaBmp = aAlphaBitmap.ImplGetSalBitmap().get();
+
bDone = mpGraphics->DrawTransformedBitmap(
aNull,
aTopX,
@@ -1081,7 +1080,12 @@ bool OutputDevice::DrawTransformBitmapExDirect(
this);
if (mpAlphaVDev)
-mpAlphaVDev->DrawTransformBitmapExDirect(aFullTransform,
BitmapEx(aAlphaBitmap));
+{
+// Merge bitmap alpha to alpha device
+Bitmap aBlack(rBitmapEx.GetSizePixel(), 1);
+aBlack.Erase(COL_BLACK);
+mpAlphaVDev->DrawTransformBitmapExDirect(aFullTransform,
BitmapEx(aBlack, aAlphaBitmap));
+}
return bDone;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsh3.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit a06a83b29a9da770787bffe416b138102aa12531
Author: Ahmed ElShreif
AuthorDate: Fri Aug 21 04:04:03 2020 +0200
Commit: Ahmed ElShreif
CommitDate: Mon Aug 24 01:04:07 2020 +0200
uilogger : Add support in the Logger and DSL for ZOOM in CALC
For example the DSL syntax will be:
>>"Set Zoom to 46"
Change-Id: Ie8a77441da10bd32efd7a95c3f1550671a62d16f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101125
Tested-by: Jenkins
Reviewed-by: Ahmed ElShreif
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 2a883642b2da..80748d849c3d 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -57,6 +59,17 @@
namespace
{
+void collectUIInformation(const OUString& aZoom)
+{
+EventDescription aDescription;
+aDescription.aID = "grid_window";
+aDescription.aParameters = {{"ZOOM", aZoom}};
+aDescription.aAction = "SET";
+aDescription.aKeyWord = "ScGridWinUIObject";
+aDescription.aParent = "MainWindow";
+UITestLogger::getInstance().logEvent(aDescription);
+}
+
enum class DetectFlags
{
NONE,
@@ -793,6 +806,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScAppOptions aNewOpt = pScMod->GetAppOptions();
aNewOpt.SetZoom( nCurrentZoom );
+
collectUIInformation(OUString::number(nCurrentZoom));
aNewOpt.SetZoomType( GetZoomType() );
pScMod->SetAppOptions( aNewOpt );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl uitest/ui_logger_dsl vcl/source
include/vcl/uitest/logger.hxx |2 ++
include/vcl/uitest/uiobject.hxx|2 ++
uitest/ui_logger_dsl/UI_Object_commands.tx |6 +-
uitest/ui_logger_dsl/dsl_core.py | 20
vcl/source/uitest/logger.cxx | 15 +++
vcl/source/uitest/uiobject.cxx | 11 +++
vcl/source/window/toolbox2.cxx |2 ++
7 files changed, 57 insertions(+), 1 deletion(-)
New commits:
commit 3ceccd384cb61686a96e73821035c6ac5d0d1604
Author: Ahmed ElShreif
AuthorDate: Sun Aug 16 10:24:20 2020 +0200
Commit: Ahmed ElShreif
CommitDate: Mon Aug 24 00:26:03 2020 +0200
uilogger : Add support in the Logger and DSL for the ToolBox
The support is tested on the FindBar and it works well .
For example the DSL syntax in the FindBar should be like:
>>"Click on item number 3 in FindBar"
Change-Id: I3ec5f5afc260df4b38dc4e420fcc48d9c774c29f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100811
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index a2339b8b8e39..927c9cbf38ef 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -44,6 +44,8 @@ public:
void logAction(VclPtr const& xUIElement, VclEventId nEvent);
+void logAction(vcl::Window* const& xUIWin, VclEventId nEvent);
+
void log(const OUString& rString);
void logKeyInput(VclPtr const& xUIElement, const KeyEvent&
rEvent);
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 50533157e19b..7d709a342eb4 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -499,6 +499,8 @@ public:
static std::unique_ptr create(vcl::Window* pWindow);
+virtual OUString get_action(VclEventId nEvent) const override;
+
private:
virtual OUString get_name() const override;
diff --git a/uitest/ui_logger_dsl/UI_Object_commands.tx
b/uitest/ui_logger_dsl/UI_Object_commands.tx
index 2d3724f2d11e..a3fe81b72b2b 100644
--- a/uitest/ui_logger_dsl/UI_Object_commands.tx
+++ b/uitest/ui_logger_dsl/UI_Object_commands.tx
@@ -10,12 +10,13 @@ import type_options
6) ComboBoxUIObject ( Select event )
7) SpinUIObject ( Increase event - Decrease event )
8) TabControlUIObject ( Change tab event )
+9) ToolBoxUIObject ( Click on item event )
*/
UIObjectCommand:
ButtonUIObject | CheckBoxUIObject | EditUIObject |
RadioButtonUIObject | ListBoxUIObject | ComboBoxUIObject |
- SpinFieldUIObject | TabControlUIObject
+ SpinFieldUIObject | TabControlUIObject | ToolBoxUIObject
;
ButtonUIObject:
@@ -42,6 +43,9 @@ SpinFieldUIObject:
ListBoxUIObject:
'Select element with position ' POS=INT 'in' list_id=STRING ('from'
parent_id=ID)?
;
+ToolBoxUIObject:
+ 'Click on item number' POS=INT 'in' toolbox_id=ID
+;
//=
//helper grammar for EditUIObject
action_on_UIObject:
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index ebe936bba76a..feb69b76a320 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -103,6 +103,7 @@ class ul_Compiler:
"ListBoxUIObject": self.handle_List_box,
"SpinFieldUIObject": self.handle_spin_field,
"EditUIObject": self.handle_Edit_uiObject,
+"ToolBoxUIObject": self.handle_ToolBox_uiObject,
"writer_Type_command": self.handle_writer_type,
"writer_Select_command": self.handle_writer_select,
"writer_GOTO_command": self.handle_writer_goto,
@@ -607,6 +608,25 @@ class ul_Compiler:
self.prev_command = EditUIObject
+def handle_ToolBox_uiObject(self, ToolBoxUIObject):
+name_of_obj = ""
+if keyword.iskeyword(ToolBoxUIObject.toolbox_id):
+name_of_obj = "x" + ToolBoxUIObject.toolbox_id
+else:
+name_of_obj = ToolBoxUIObject.toolbox_id
+
+self.init_Object(
+name_of_obj,
+ToolBoxUIObject.toolbox_id,
+self.last_parent[self.parent_hierarchy_count],
+)
+
+self.write_line_with_one_parameters(
+name_of_obj, "CLICK", "POS", ToolBoxUIObject.POS
+)
+
+self.prev_command = ToolBoxUIObject
+
def handle_writer_type(self, writer_Type_command):
self.init_app()
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 8cd0c4b6f15f..b7a9e02ac48a 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -166,6 +166,21 @@ void UITestLogger::logAction(VclPtr const&
xUIElement, VclEventId nEven
maStream.WriteLine(OUStringToOString(aAction, RTL_TEXTENCODING_UTF8));
}
+void UITestLogger::logAction(vcl::Window* const& xUIWin, VclEve
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpnumericfmt.cxx |6 +++---
lotuswordpro/source/filter/lwpnumericfmt.hxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 57520e35bb250eff60bd8e3dcdd3d7ef1129e1b5
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:41:25 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 23:43:15 2020 +0200
Fix typo in code
Change-Id: Ie0f3d8b01e0370f0a2e95d46b61be56943d3bd78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101198
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx
b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index 3edf96eeb8dc..c2dc4d4e76a6 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -209,7 +209,7 @@ LwpNumericFormat::GetDecimalPlaces()
return cDecimalPlaces;
return GetDefaultDecimalPlaces(cFormat);
}
-void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber,
OUString& aPrefix, OUString& aSuffix, bool bNegtive)
+void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber,
OUString& aPrefix, OUString& aSuffix, bool bNegative)
{
aPrefix = aNumber.GetPrefix();
aSuffix = aNumber.GetSuffix();
@@ -220,7 +220,7 @@ void
LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString&
bool bShowSpace = m_aCurrencyInfo.IsShowSpace(cFormat);
if ( aNumber.IsDefaultPrefix())
{
-if (bNegtive)
+if (bNegative)
{
aPrefix = "(";
}
@@ -246,7 +246,7 @@ void
LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString&
}
-if (bNegtive)
+if (bNegative)
{
aSuffix += ")";
}
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx
b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 225f373c4f6f..ef1af1da01ec 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -269,7 +269,7 @@ private:
static sal_uInt16 GetDefaultDecimalPlaces(sal_uInt16 Format);
static LwpCurrencyPool m_aCurrencyInfo;
-void GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix,
OUString& aSuffix, bool bNegtive=false);
+void GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix,
OUString& aSuffix, bool bNegative=false);
void SetNumberType(XFNumberStyle* pStyle);
static OUString reencode(const OUString& sCode);
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/view.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit c123bfff501229f398a1b679fc7434b82d53685c
Author: Tor Lillqvist
AuthorDate: Thu Aug 20 22:58:24 2020 +0300
Commit: Tor Lillqvist
CommitDate: Sun Aug 23 22:40:33 2020 +0200
Bin overly eager early return that stops replacement image creation
The return causes a customer's Java code that handles some .odt
document to unexpectedly not create object replacement images in the
document.
The problem is that in the bad case, the SwTextShell is created later
than .uno:UpdateAll is dispatched, so the dispatch does nothing.
SwBaseShell::Execute() for FN_UPDATE_ALL is not called. And this is
required, becase that calls setUserAllowsLinkUpdate(true), so that on
save, when EmbeddedObjectContainer::StoreAsChildren() in comphelper/
hits the 'if ( !xStream.is() && getUserAllowsLinkUpdate() )'
condition, then we create a replacement image.
This is a Basic script that demonstrates the same issue:
desktop = CreateUnoService("com.sun.star.frame.Desktop")
Dim props(0) as new com.sun.star.beans.PropertyValue
props(0).Name = "Hidden"
props(0).Value = true
component = desktop.loadComponentFromURL("file:///.../test.odt",
"_default", 0, props)
dispatcher = createUnoService("com.sun.star.frame.DispatchHelper")
frame = component.CurrentController.Frame
dispatcher.executeDispatch(frame, ".uno:UpdateAll", "", 0, Array())
component.storeSelf(Array())
component.dispose()
(Will also try to add a unit test that demonstrates the problem and
verifies this fix.)
Change-Id: I4a5f78a2118a387f062c2d5213a0012a7df2dd9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101138
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 5ee6f15b65a9..b93880751bd0 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1385,9 +1385,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence <
beans::PropertyValue >
return;
Point aCursorPos( nX, nY );
-const long nAdd = m_pWrtShell->GetViewOptions()->getBrowseMode() ?
DOCUMENTBORDER : DOCUMENTBORDER*2;
-if (nBottom > (m_pWrtShell->GetDocSize().Height()+nAdd) )
-return;
m_pWrtShell->EnableSmooth( false );
const tools::Rectangle aVis( nLeft, nTop, nRight, nBottom );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 9d0d788fa73744fcdf50534360a2942e5c3cc6d4
Author: Caolán McNamara
AuthorDate: Sun Aug 23 20:12:28 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 22:14:54 2020 +0200
tdf#135779 move focus back to usual parent before grabbing pointer
Change-Id: Ia4f1f2f1672a76515ab586d679a05467515868d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101247
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b4ddd142ca1d..5959bb62a67d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1997,6 +1997,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle
)
void GtkSalFrame::grabPointer( bool bGrab, bool bKeyboardAlso, bool
bOwnerEvents )
{
+if (bGrab)
+{
+// tdf#135779 move focus back inside usual input window out of any
+// other gtk widgets before grabbing the pointer
+GrabFocus();
+}
+
static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
if (pEnv && *pEnv)
return;
@@ -2533,8 +2540,10 @@ void GtkSalFrame::GrabFocus()
pGrabWidget = GTK_WIDGET(m_pWindow);
else
pGrabWidget = GTK_WIDGET(m_pFixedContainer);
-gtk_widget_set_can_focus(pGrabWidget, true);
-gtk_widget_grab_focus(pGrabWidget);
+if (!gtk_widget_get_can_focus(pGrabWidget))
+gtk_widget_set_can_focus(pGrabWidget, true);
+if (!gtk_widget_has_focus(pGrabWidget))
+gtk_widget_grab_focus(pGrabWidget);
}
gboolean GtkSalFrame::signalButton(GtkWidget*, GdkEventButton* pEvent,
gpointer frame)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [core] tdf#87963: Add percentage value to new calculated compressed image size
Hi
I am developing on Visual Studio. I can access .cxx and .hxx files.
How can get access to .ui files (so that I can add label to
compressgraphicdialog.ui) ?
Regards
Anshu
On Mon, 24 Aug, 2020, 12:35 AM Shivam, Kumar Singh (via Code Review), <
ger...@gerrit.libreoffice.org> wrote:
> Shivam, Kumar Singh has posted comments on this change. (
> https://gerrit.libreoffice.org/c/core/+/101242 )
>
> Change subject: tdf#87963: Add percentage value to new calculated
> compressed image size
> ..
>
>
> Patch Set 2:
>
> The correct way to do this would be to add a new label say
> "label-new-percentage" in the svx/ui/compressgraphicdialog.ui file right
> next to where the label for the current size is added.
> After that declare a new label similar to m_xFixedText6 in
> compressgraphicdialog.hxx and initialise it
> something like this in the cxx file
>
> " m_xFixedPercentage = m_xBuilder->weld_label("label-new-percentage"); "
>
> and add the new calculated percentage to this label using set_label().
> Do you get my point?
>
> There might be a better way to do this, but this is what i would have
> done. I am adding Tomaz as a reviewer he might be able to judge this idea.
>
>
> --
> To view, visit https://gerrit.libreoffice.org/c/core/+/101242
> To unsubscribe, or for help writing mail filters, visit
> https://gerrit.libreoffice.org/settings
>
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Change-Id: I5fb87fd4d8cceb38775cb98520c0c7ba1d49bc93
> Gerrit-Change-Number: 101242
> Gerrit-PatchSet: 2
> Gerrit-Owner: Anshu
> Gerrit-Reviewer: Jenkins
> Gerrit-Reviewer: Julien Nabet
> Gerrit-CC: Shivam, Kumar Singh
> Gerrit-CC: Tomaž Vajngerl
> Gerrit-Comment-Date: Sun, 23 Aug 2020 19:04:51 +
> Gerrit-HasComments: No
> Gerrit-Has-Labels: No
> Gerrit-MessageType: comment
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [core] tdf#87963: Add percentage value to new calculated compressed image size
On Mon, 24 Aug 2020 at 00:30, anshu khare wrote: > To show it in UI we have to create another label and display it over > there. > > Could u please tell me how to it? > > Please look for my comment on your patch. sincerely, Shivam Kumar Singh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [core] tdf#87963: Add percentage value to new calculated compressed image size
To show it in UI we have to create another label and display it over there. Could u please tell me how to it? Regards Anshu On Sun, 23 Aug, 2020, 11:57 PM Julien Nabet (via Code Review), < ger...@gerrit.libreoffice.org> wrote: > Julien Nabet has posted comments on this change. ( > https://gerrit.libreoffice.org/c/core/+/101242 ) > > Change subject: tdf#87963: Add percentage value to new calculated > compressed image size > .. > > > Patch Set 2: Code-Review-2 > > I'm not an expert but the main problem I see is you use "printf". The goal > of the bugtracker is to display the information on UI not on a console. > > > -- > To view, visit https://gerrit.libreoffice.org/c/core/+/101242 > To unsubscribe, or for help writing mail filters, visit > https://gerrit.libreoffice.org/settings > > Gerrit-Project: core > Gerrit-Branch: master > Gerrit-Change-Id: I5fb87fd4d8cceb38775cb98520c0c7ba1d49bc93 > Gerrit-Change-Number: 101242 > Gerrit-PatchSet: 2 > Gerrit-Owner: Anshu > Gerrit-Reviewer: Jenkins > Gerrit-Reviewer: Julien Nabet > Gerrit-Comment-Date: Sun, 23 Aug 2020 18:27:20 + > Gerrit-HasComments: No > Gerrit-Has-Labels: Yes > Gerrit-MessageType: comment > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Anshu Khare License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. On Sun, 23 Aug, 2020, 11:57 PM Julien Nabet (via Code Review), < ger...@gerrit.libreoffice.org> wrote: > Julien Nabet has posted comments on this change. ( > https://gerrit.libreoffice.org/c/core/+/101242 ) > > Change subject: tdf#87963: Add percentage value to new calculated > compressed image size > .. > > > Patch Set 2: Code-Review-2 > > I'm not an expert but the main problem I see is you use "printf". The goal > of the bugtracker is to display the information on UI not on a console. > > > -- > To view, visit https://gerrit.libreoffice.org/c/core/+/101242 > To unsubscribe, or for help writing mail filters, visit > https://gerrit.libreoffice.org/settings > > Gerrit-Project: core > Gerrit-Branch: master > Gerrit-Change-Id: I5fb87fd4d8cceb38775cb98520c0c7ba1d49bc93 > Gerrit-Change-Number: 101242 > Gerrit-PatchSet: 2 > Gerrit-Owner: Anshu > Gerrit-Reviewer: Jenkins > Gerrit-Reviewer: Julien Nabet > Gerrit-Comment-Date: Sun, 23 Aug 2020 18:27:20 + > Gerrit-HasComments: No > Gerrit-Has-Labels: Yes > Gerrit-MessageType: comment > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/cdouthdl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ed61a80297cd97331d08837553c4fd4f623ccd6b
Author: Caolán McNamara
AuthorDate: Sun Aug 23 17:21:15 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 20:36:57 2020 +0200
WaE: -Werror=maybe-uninitialized
with --enable-dbgutil + --enable-optimized=debug
Change-Id: I98fdc7e0b97c48bfb7c425013640c91c29e46a3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101244
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index 98fcf264026a..74eee9fa6b08 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -155,7 +155,7 @@ XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl()
bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue,
uno::Any& rValue, const SvXMLUnitConverter& ) const
{
-sal_uInt16 eNewStrikeout;
+sal_uInt16 eNewStrikeout(0);
bool bRet = SvXMLUnitConverter::convertEnum(
eNewStrikeout, rStrImpValue, pXML_CrossedoutStyle_Enum );
if( bRet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/StaticLibrary_fuzzerstubs.mk vcl/workben
vcl/StaticLibrary_fuzzerstubs.mk|1
vcl/workben/localestub/localedata_en_HK.cxx | 121
2 files changed, 122 insertions(+)
New commits:
commit 94e8eedece9adc5dc92cc1afeed338237c2f2e5e
Author: Caolán McNamara
AuthorDate: Sun Aug 23 17:39:28 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 20:36:32 2020 +0200
ofz#25174 build failure
Change-Id: Ibc26e53d00bbbeb990c617334ca3c126d83c52e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101245
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/StaticLibrary_fuzzerstubs.mk b/vcl/StaticLibrary_fuzzerstubs.mk
index 7d8105906870..73462577d912 100644
--- a/vcl/StaticLibrary_fuzzerstubs.mk
+++ b/vcl/StaticLibrary_fuzzerstubs.mk
@@ -27,6 +27,7 @@ $(eval $(call
gb_StaticLibrary_add_exception_objects,fuzzerstubs,\
vcl/workben/localestub/localedata_en_GB \
vcl/workben/localestub/localedata_en_GH \
vcl/workben/localestub/localedata_en_GM \
+vcl/workben/localestub/localedata_en_HK \
vcl/workben/localestub/localedata_en_IE \
vcl/workben/localestub/localedata_en_IN \
vcl/workben/localestub/localedata_en_JM \
diff --git a/vcl/workben/localestub/localedata_en_HK.cxx
b/vcl/workben/localestub/localedata_en_HK.cxx
new file mode 100644
index ..89c7da0cd439
--- /dev/null
+++ b/vcl/workben/localestub/localedata_en_HK.cxx
@@ -0,0 +1,121 @@
+#include
+
+#include
+
+extern "C" {
+
+static const sal_Unicode langID[] = { 0x65, 0x6e, 0x0 };
+static const sal_Unicode langDefaultName[] = { 0x45, 0x6e, 0x67, 0x6c, 0x69,
0x73, 0x68, 0x0 };
+static const sal_Unicode countryID[] = { 0x48, 0x4b, 0x0 };
+static const sal_Unicode countryDefaultName[]
+= { 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x0 };
+static const sal_Unicode Variant[] = { 0x0 };
+
+static const sal_Unicode* LCInfoArray[]
+= { langID, langDefaultName, countryID, countryDefaultName, Variant };
+
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLCInfo_en_HK(sal_Int16& count)
+{
+count = SAL_N_ELEMENTS(LCInfoArray);
+return (sal_Unicode**)LCInfoArray;
+}
+extern sal_Unicode** SAL_CALL getLocaleItem_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLocaleItem_en_HK(sal_Int16&
count)
+{
+return getLocaleItem_en_GB(count);
+}
+static const sal_Unicode replaceTo0[]
+= { 0x5b, 0x24, 0x48, 0x4b, 0x24, 0x2d, 0x33, 0x43, 0x30, 0x39, 0x5d, 0x0
};
+extern sal_Unicode const* const* SAL_CALL getAllFormats0_en_GB(sal_Int16&
count,
+ const
sal_Unicode*& from,
+ const
sal_Unicode*& to);
+SAL_DLLPUBLIC_EXPORT sal_Unicode const* const* SAL_CALL
+getAllFormats0_en_HK(sal_Int16& count, const sal_Unicode*& from, const
sal_Unicode*& to)
+{
+to = replaceTo0;
+const sal_Unicode* tmp;
+return getAllFormats0_en_GB(count, from, tmp);
+}
+extern sal_Unicode** SAL_CALL getDateAcceptancePatterns_en_GB(sal_Int16&
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getDateAcceptancePatterns_en_HK(sal_Int16& count)
+{
+return getDateAcceptancePatterns_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollatorImplementation_en_GB(sal_Int16&
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getCollatorImplementation_en_HK(sal_Int16& count)
+{
+return getCollatorImplementation_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollationOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getCollationOptions_en_HK(sal_Int16& count)
+{
+return getCollationOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getSearchOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getSearchOptions_en_HK(sal_Int16&
count)
+{
+return getSearchOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getIndexAlgorithm_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getIndexAlgorithm_en_HK(sal_Int16&
count)
+{
+return getIndexAlgorithm_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getUnicodeScripts_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getUnicodeScripts_en_HK(sal_Int16&
count)
+{
+return getUnicodeScripts_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getFollowPageWords_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getFollowPageWords_en_HK(sal_Int16& count)
+{
+return getFollowPageWords_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getAllCalendars_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getAllCalendars_en_HK(sal_Int16&
count)
+{
+return getAllCalendars_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getAllCurrencies_zh_HK(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getAllCurrencies_en_HK(sal_Int16&
count)
+{
+return getAllCurrencies_zh_HK(count);
+}
+extern sal_Unicode** SAL_CALL getTran
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/securitypage.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3e33e4435351dd03b8f89b4006c657910eace25f
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:30:26 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 20:16:39 2020 +0200
Fix typo in code
Change-Id: I546bd10f5b7e69f82252cf147c5fcc5756d77a78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101212
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/dialog/securitypage.cxx
b/sfx2/source/dialog/securitypage.cxx
index 84df48131b99..ad4c30b4e6c1 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -331,9 +331,9 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl,
RecordChangesCBToggleHdl, weld::ToggleButt
m_bEndRedliningWarningDone = true;
}
-const bool bNeedPasssword = !m_bOrigPasswordIsConfirmed
+const bool bNeedPassword = !m_bOrigPasswordIsConfirmed
&& m_xUnProtectPB->get_visible(); // tdf#128230 Require password
if the Unprotect button is visible
-if (!bAlreadyDone && bNeedPasssword)
+if (!bAlreadyDone && bNeedPassword)
{
OUString aPasswordText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/externalrefmgr.hxx|2 +-
sc/source/ui/docshell/externalrefmgr.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bd6af4f36af2d8e855a45db96aa2006710739cad
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:43:23 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 20:15:02 2020 +0200
Fix typo in code
Change-Id: I23faddfd329a36f8bfb668554e8f06b41e9cb4f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101202
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 368ceb4385fd..6a3f348dfd1e 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -64,7 +64,7 @@ public:
const OUString& rMimeType, const css::uno::Any & rValue) override;
virtual void Edit(weld::Window* pParent, const Link&
rEndEditHdl) override;
-void SetDoReferesh(bool b);
+void SetDoRefresh(bool b);
private:
ScExternalRefLink() = delete;
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index c4391e553cbf..305035304257 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1468,7 +1468,7 @@ void ScExternalRefLink::Edit(weld::Window* pParent, const
Link
SvBaseLink::Edit(pParent, Link());
}
-void ScExternalRefLink::SetDoReferesh(bool b)
+void ScExternalRefLink::SetDoRefresh(bool b)
{
mbDoRefresh = b;
}
@@ -2625,9 +2625,9 @@ void ScExternalRefManager::maybeLinkExternalFile(
sal_uInt16 nFileId, bool bDefe
pLinkMgr->InsertFileLink(*pLink, sfx2::SvBaseLinkObjectType::ClientFile,
*pFileName,
(aFilter.isEmpty() && bDeferFilterDetection ? nullptr : &aFilter));
-pLink->SetDoReferesh(false);
+pLink->SetDoRefresh(false);
pLink->Update();
-pLink->SetDoReferesh(true);
+pLink->SetDoRefresh(true);
maLinkedDocs.emplace(nFileId, true);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/dbase/DTable.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a939013f54c60545f2fc31defb5889ad527f051c
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:37:47 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 20:15:56 2020 +0200
Fix typo in code
Change-Id: I40897e88fba67ea845578e0db7782c20a4f17806
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101196
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 7ad53b04c97d..879a23f8a3f4 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2271,13 +2271,13 @@ void SAL_CALL ODbaseTable::rename( const OUString&
newName )
}
namespace
{
-void renameFile(file::OConnection const * _pConenction,const OUString&
oldName,
+void renameFile(file::OConnection const * _pConnection,const OUString&
oldName,
const OUString& newName,const OUString& _sExtension)
{
-OUString aName = ODbaseTable::getEntry(_pConenction,oldName);
+OUString aName = ODbaseTable::getEntry(_pConnection,oldName);
if(aName.isEmpty())
{
-OUString aIdent =
_pConenction->getContent()->getIdentifier()->getContentIdentifier();
+OUString aIdent =
_pConnection->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
aIdent += "/";
aIdent += oldName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/notebookbar/PriorityHBox.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2baa024820b4275db708afaba7bf75340297e4f0
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:29:32 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 20:13:43 2020 +0200
Fix typo in code
Change-Id: I9061af75ef5d89bf15010f14ede074ec1739a61c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101210
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx
b/sfx2/source/notebookbar/PriorityHBox.cxx
index a0f5052ccd44..b6a0ed22ced0 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -88,13 +88,13 @@ Size PriorityHBox::calculateRequisition() const
++nVisibleChildren;
Size aChildSize = getLayoutRequisition(*pChild);
-bool bAllwaysExpanded = true;
+bool bAlwaysExpanded = true;
vcl::IPrioritable* pPrioritable =
dynamic_cast(pChild);
if (pPrioritable && pPrioritable->GetPriority() !=
VCL_PRIORITY_DEFAULT)
-bAllwaysExpanded = false;
+bAlwaysExpanded = false;
-if (bAllwaysExpanded)
+if (bAlwaysExpanded)
{
long nPrimaryDimension = getPrimaryDimension(aChildSize);
nPrimaryDimension += pChild->get_padding() * 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accdoc.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9d8fe885f242ab7dd21e338cc5a40a278db6b2ff
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:28:56 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 20:13:14 2020 +0200
Fix typo in code
Change-Id: I028a75b1ce4cceb601ac2e50693cde94df57f684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101208
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index bf2c0e844a2b..53a974acc96a 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -512,14 +512,14 @@ uno::Any SAL_CALL
SwAccessibleDocument::getExtendedAttributes()
{
SolarMutexGuard g;
-uno::Any anyAtrribute;
+uno::Any anyAttribute;
SwDoc *pDoc = GetMap() ? GetShell()->GetDoc() : nullptr;
if (!pDoc)
-return anyAtrribute;
+return anyAttribute;
SwCursorShell* pCursorShell = GetCursorShell();
if( !pCursorShell )
-return anyAtrribute;
+return anyAttribute;
SwFEShell* pFEShell = dynamic_cast( pCursorShell) !=
nullptr
? static_cast( pCursorShell )
@@ -705,9 +705,9 @@ uno::Any SAL_CALL
SwAccessibleDocument::getExtendedAttributes()
OUString::number( nSctColCount ) + ";";
}
-anyAtrribute <<= sValue;
+anyAttribute <<= sValue;
}
-return anyAtrribute;
+return anyAttribute;
}
sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpstyl.cxx | 71
xmloff/source/draw/ximpstyl.hxx | 20 +--
2 files changed, 40 insertions(+), 51 deletions(-)
New commits:
commit fa45a2189b9285d3dc1cde532d3bc32b4ca6599b
Author: Noel Grandin
AuthorDate: Sun Aug 23 18:07:18 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 23 20:05:19 2020 +0200
use fastparser in SdXMLPresentationPageLayoutContext
Change-Id: Ic3b371be9a363d40cd5c82dcc1d00fa5b007cf5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101243
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index ff2796023d1f..611c70f85e05 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -418,38 +418,38 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
SdXMLPageMasterContext
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
SdXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLName,
-const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList,
XmlStyleFamily::SD_PRESENTATIONPAGELAYOUT_ID),
+sal_Int32 nElement,
+const uno::Reference< xml::sax::XFastAttributeList >& xAttrList)
+: SvXMLStyleContext(rImport, nElement, xAttrList,
XmlStyleFamily::SD_PRESENTATIONPAGELAYOUT_ID),
mnTypeId( AUTOLAYOUT_NONE )
{
// set family to something special at SvXMLStyleContext
// for differences in search-methods
}
-SvXMLImportContextRef SdXMLPresentationPageLayoutContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler >
SdXMLPresentationPageLayoutContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
{
SvXMLImportContextRef xContext;
-if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName,
XML_PLACEHOLDER ) )
+if(nElement == XML_ELEMENT(PRESENTATION, XML_PLACEHOLDER))
{
const rtl::Reference< SdXMLPresentationPlaceholderContext >
xLclContext{
-new SdXMLPresentationPlaceholderContext(GetSdImport(), nPrefix,
rLocalName, xAttrList)};
+new SdXMLPresentationPlaceholderContext(GetSdImport(), nElement,
xAttrList)};
// presentation:placeholder inside style:presentation-page-layout
context
xContext = xLclContext.get();
// remember SdXMLPresentationPlaceholderContext for later evaluation
maList.push_back(xLclContext);
}
+else
+SAL_WARN("xmloff", "unknown element " <<
SvXMLImport::getPrefixAndNameFromToken(nElement));
-return xContext;
+return xContext.get();
}
-void SdXMLPresentationPageLayoutContext::EndElement()
+void SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32 )
{
// build presentation page layout type here
// calc mnTpeId due to content of maList
@@ -657,46 +657,41 @@ void SdXMLPresentationPageLayoutContext::EndElement()
SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
SdXMLImport& rImport,
-sal_uInt16 nPrfx, const
-OUString& rLName,
-const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-: SvXMLImportContext( rImport, nPrfx, rLName),
+sal_Int32 /*nElement*/,
+const uno::Reference< xml::sax::XFastAttributeList>& xAttrList)
+: SvXMLImportContext( rImport ),
mnX(0)
{
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for(sal_Int16 i=0; i < nAttrCount; i++)
+for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
{
-OUString sAttrName = xAttrList->getNameByIndex(i);
-OUString aLocalName;
-sal_uInt16 nPrefix =
GetSdImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName);
-OUString sValue = xAttrList->getValueByIndex(i);
-const SvXMLTokenMap& rAttrTokenMap =
GetSdImport().GetPresentationPlaceholderAttrTokenMap();
-
-switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+OUString sValue = aIter.toString();
+switch(aIter.getToken())
{
-case XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME:
+case XML_ELEMENT(PRESENTATION, XML_OBJECT):
{
msName = sValue;
break;
}
-case XML_TOK_PRESENTATIONPLACEHOLDER_X:
+case XML_ELEMENT(SVG, XML_X):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnX, sValue);
break;
}
-case XML_TOK_PRESENTATIONPLACEHOLDER_Y:
+case XML_ELEMENT(SVG, XML_Y):
{
break;
}
-case XML_TOK_PR
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - configure.ac .gitignore instsetoo_native/util setup_native/source solenv/bin
.gitignore |1 + configure.ac |5 - instsetoo_native/util/openoffice.lst.in |2 +- setup_native/source/packinfo/finals_instsetoo.txt.in |1 + solenv/bin/modules/installer/globals.pm |2 +- solenv/bin/modules/installer/windows/admin.pm|3 ++- solenv/bin/modules/installer/windows/msp.pm |2 +- 7 files changed, 11 insertions(+), 5 deletions(-) New commits: commit 925639d32d6ff3b99f9c48e6991382d184033856 Author: Andras Timar AuthorDate: Sun Aug 23 11:47:54 2020 +0200 Commit: Andras Timar CommitDate: Sun Aug 23 19:17:14 2020 +0200 Bump version to 6.4-3 Change-Id: I90c29a59200c506e28346293e80e0125a95a827f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101237 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/configure.ac b/configure.ac index 2f3b4ff74a4d..1b723d6e824d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[6.4.10.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.3],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit ae17170cf3edb45fd2e270e7be83d06b91df0d9e Author: Andras Timar AuthorDate: Mon Oct 10 13:56:31 2016 -0700 Commit: Andras Timar CommitDate: Sun Aug 23 19:16:58 2020 +0200 [cp] Enable MSP patching (cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2) Change-Id: I1de9776e161161daf7349be304e05d5bb959f891 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92847 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101236 diff --git a/.gitignore b/.gitignore index d68dd20e1b58..fc0482e11d52 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ /README /AUTHORS /MAINTAINERS +/setup_native/source/packinfo/finals_instsetoo.txt # make id /ID diff --git a/configure.ac b/configure.ac index 6350e9c6282b..2f3b4ff74a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -3268,6 +3268,7 @@ if test "$_os" = "WINNT"; then BITNESS_OVERRIDE=64 fi fi +AC_SUBST(WINDOWS_SDK_ARCH) if test "$_os" = "iOS"; then cross_compiling="yes" fi @@ -4743,6 +4744,7 @@ if test "$cross_compiling" = "yes"; then bin/odfvalidator.sh.in \ bin/officeotron.sh.in \ instsetoo_native/util/openoffice.lst.in \ +setup_native/source/packinfo/finals_instsetoo.txt.in \ config_host/*.in \ sysui/desktop/macosx/Info.plist.in) \ | (cd CONF-FOR-BUILD && tar xf -) @@ -12973,6 +12975,7 @@ AC_CONFIG_FILES([config_host.mk bin/odfvalidator.sh bin/officeotron.sh instsetoo_native/util/openoffice.lst + setup_native/source/packinfo/finals_instsetoo.txt sysui/desktop/macosx/Info.plist]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 988218ff6992..4b6191cba3a7 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -27,7 +27,7 @@ Globals REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 -CREATE_MSP_INSTALLSET 0 +CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt.in similarity index 82% rename from setup_native/source/packinfo/finals_instsetoo.txt rename to setup_native/source/packinfo/finals_instsetoo.txt.in index d5a68d369f7b..0804f7e49150 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt +++ b/setup_native/source/packinfo/finals_instsetoo.txt.in @@ -30,3 +30,4 @@ # OpenOffice pro de msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi # OpenOfficeLanguagePack pro es msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi # URE pro en-US msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi +CollaboraOfficepro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit b243549bb1c2d254b52c51b6250e9e0e48942fe9
Author: Szymon Kłos
AuthorDate: Tue Aug 11 10:28:52 2020 +0200
Commit: Andras Timar
CommitDate: Sun Aug 23 19:16:17 2020 +0200
Instant update shadow fields in sidebar
This allows mobile LOK client to receive updated
state.
Change-Id: I07fb397c1566546e6e2eb8071eaf6d848f6effc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100466
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101234
Reviewed-by: Andras Timar
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 8c93ee2708d0..61c30fcb9eb5 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -143,12 +144,27 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl,
Button*, void)
SdrOnOffItem aItem(makeSdrShadowItem(false));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mpShowShadow->SetState( TRISTATE_FALSE );
+UpdateControls();
+}
}
else
{
SdrOnOffItem aItem(makeSdrShadowItem(true));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (mpShadowDistance->GetValue( FieldUnit::POINT ) == 0)
+mpShadowDistance->SetValue( 8, FieldUnit::POINT );
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mpShowShadow->SetState( TRISTATE_TRUE );
+UpdateControls();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source svx/sdi
sc/source/ui/drawfunc/drawsh.cxx |8
svx/sdi/svx.sdi |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3e9dda1e2ea7ce16c9d2c2d86c311d2b50188dac
Author: Szymon Kłos
AuthorDate: Tue Aug 11 15:14:23 2020 +0200
Commit: Andras Timar
CommitDate: Sun Aug 23 19:16:34 2020 +0200
Shadow color setter for online
Change-Id: Id79d879a6017beb39e95a8d923e8368178901c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100502
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101235
Reviewed-by: Andras Timar
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 069642c55268..36d18b69ba43 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
@@ -103,6 +104,13 @@ namespace
pArgs->Put(aFillColorItem);
break;
}
+
+case SID_ATTR_SHADOW_COLOR:
+{
+XColorItem aItem(SDRATTR_SHADOWCOLOR, aColor);
+pArgs->Put(aItem);
+break;
+}
}
}
if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON,
false, &pItem))
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 8e43464f8b4a..3b4ae1fdd48c 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7669,7 +7669,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
]
XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR)
[
AutoUpdate = TRUE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source
sw/source/core/txtnode/atrfld.cxx |2 +-
sw/source/core/undo/undobj.cxx|4
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 5563f6ba24a7d96062ab8f1a6f3234a39e999bc2
Author: Michael Stahl
AuthorDate: Fri Aug 14 16:35:32 2020 +0200
Commit: Andras Timar
CommitDate: Sun Aug 23 19:15:59 2020 +0200
tdf#135457 sw: fix invalidation of SwXTextField
This was supposed to happen from SwNodes::ChgNode() when moving to the
undo nodes array.
There are fields with a range that contains other fields, when the outer
field's range is deleted, the contained field moves to the undo array
and its position is no longer valid to be given out by
SwXTextField::getAnchor().
(regression from c73b5e969b2f9abdb2b9191938ca30bec5af725d
ERR no, actually more likely from e18359445fabad9ba1a704600e9ee327112cc6ae)
Change-Id: I38c8b3393a777ca8dc8739b5ca4233a7f124961e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100749
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 14fd4b54113f884cfd6871aeff693734fc06224b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100705
Reviewed-by: Caolán McNamara
(cherry picked from commit 27e9ead64d4e3a3f3b3d1203f7b9fee50eb0d04d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100987
Tested-by: Michael Stahl
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101233
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index fba15a6107f9..ebcdced03c52 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -217,7 +217,7 @@ void SwFormatField::InvalidateField()
{
SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
&static_cast(*this)); // cast to base class (void*)
-NotifyClients(&item, &item);
+CallSwClientNotify(sw::LegacyModifyHint{ &item, &item });
}
void SwFormatField::SwClientNotify( const SwModify& rModify, const SfxHint&
rHint )
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index bfea81a886b6..fa86072a3008 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -849,6 +849,10 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition&
rMark,
SwDoc* pDoc = rMark.nNode.GetNode().GetDoc();
+// if it's not in the doc array, probably missing some invalidation
somewhere
+assert(&rPoint.nNode.GetNodes() == &pDoc->GetNodes());
+assert(&rMark.nNode.GetNodes() == &pDoc->GetNodes());
+
::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
// 1. Footnotes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source
sw/source/uibase/lingu/olmenu.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 05d086e432644d80160723009a2b3eebf50417d2 Author: Michael Stahl AuthorDate: Wed Aug 19 18:55:27 2020 +0200 Commit: Andras Timar CommitDate: Sun Aug 23 19:15:15 2020 +0200 tdf#135721 sw: fix spell check context menu deleting flys Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df but the problem is at a higher level: SwTextShell::Execute() with SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but just Replace(). (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit ec579354af954867b829e7d08e4d752518c83728) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101072 Reviewed-by: Thorsten Behrens Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101231 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index cb14cd26aca7..2ee4737abfb6 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -746,9 +746,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter); m_pSh->StartAction(); -m_pSh->DelLeft(); -m_pSh->Insert( aTmp ); +m_pSh->Replace(aTmp, false); /* #102505# EndAction/EndUndo moved down since insertion of temporary auto correction is now undoable two and ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa sw/source
sw/qa/extras/rtfexport/data/tdf133437.rtf | 571 ++
sw/qa/extras/rtfexport/rtfexport5.cxx | 39 ++
sw/source/core/unocore/unodraw.cxx| 15
3 files changed, 617 insertions(+), 8 deletions(-)
New commits:
commit 202099e967c2a46c01b5d3ec5a041972610292bf
Author: Vasily Melenchuk
AuthorDate: Wed Jul 8 08:49:04 2020 +0300
Commit: Andras Timar
CommitDate: Sun Aug 23 19:15:37 2020 +0200
tdf#133437: sw: set generated shape name if it is missing
Shape names are required for seting format name and undo/redo
and correct displaying of objects in Navigator pane
Change-Id: I43caf6a4d5f054283d48c46b081d43b743bd4433
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98312
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0c53a58b2dd9bee3d4de6843966486428fdaa78f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100942
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101232
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sw/qa/extras/rtfexport/data/tdf133437.rtf
b/sw/qa/extras/rtfexport/data/tdf133437.rtf
new file mode 100644
index ..4cd6ef182e06
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf133437.rtf
@@ -0,0 +1,571 @@
+{\rtf1\ansi\deff0
+{\fonttbl
+{\f0\fnil\fcharset204\fprq0\cpg1251 Arial;}
+{\f1\fnil\fcharset204\fprq0\cpg1251 Times New Roman;}
+{\f2\fnil\fcharset204\fprq0\cpg1251 Courier New;}
+}
+{\*\viewkind1}{\*\viewscale100}\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837{\pard\plain\qc\sl-200\sb40\phmrg\pvmrg\posx840\posy1120\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
��� (���), �.��}\par}
+{\pard\plain\qc\sl-200\sb40\phmrg\pvmrg\posx840\posy1400\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
��� "� ���"}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2540\posy1680\absw3680\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
��� ��� �� � N}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx6060\posy1680\absw2200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
4070281040001109}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx8160\posy1680\absw300\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
c}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx8300\posy1680\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
01.05.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx9260\posy1680\absw420\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
��}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx9580\posy1680\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
17.05.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx840\posy1960\absw1520\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
�� �:}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2200\posy1960\absw620\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
RUR}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx7640\posy1960\absw2600\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
� :}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx10080\posy1960\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
28.04.2012}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx840\posy2240\absw1960\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
���:}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2700\posy2240\absw1100\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20
146 678.74}\par}
+{\pard\plain\qr\sl-200\sb40\phmrg\pvmrg\posx840\posy2440\absw10200\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
1 �� 3}\par}
+{\shp{\*\shpinst\shpleft840\shptop2720\shpright11220\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0
+{\shp{\*\shpinst\shpleft1840\shptop2720\shpright1840\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx880\posy2880\absw1160\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
.}\par}
+{\shp{\*\shpinst\shpleft2180\shptop2720\shpright2180\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx1860\posy2880\absw520\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
��}\par}
+{\shp{\*\shpinst\shpleft2860\shptop2720\shpright2860\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
shapeType}{\sv 20
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2220\posy2760\absw800\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
�}\par}
+{\pard\plain\ql\sl-200\sb40\phmrg\pvmrg\posx2220\posy3000\absw820\absh0\dxfrtext0\dfrmtxtx0\dfrmtxty0{\f1\fs20\b
�.}\par}
+{\shp{\*\shpinst\shpleft4200\shptop2720\shpright4200\shpbottom3280\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
shapeType}{\sv 20
+{\pard\plain\ql\sl-200\s
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/inc sw/source
sw/inc/textboxhelper.hxx|5 +
sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +-
sw/source/core/doc/textboxhelper.cxx| 16 +---
sw/source/core/undo/undobj1.cxx |1 +
4 files changed, 4 insertions(+), 24 deletions(-)
New commits:
commit 16febdbee217525fb0e1dc23bbf574d0fdd1dbec
Author: Michael Stahl
AuthorDate: Wed Aug 19 16:44:09 2020 +0200
Commit: Andras Timar
CommitDate: Sun Aug 23 19:14:52 2020 +0200
tdf#135412 tdf#135888 sw: fix copying of linked text-boxes
The resetLink()/restoreLinks() were added in commit
00a007be5ad88bac9905b373bc5e02d02acab11a because testMissingPath
missing-path.docx was crashing.
But then 0bcc5b3daebeb2a7d2b5ba132af4745cc6c78cd0 refactored how linking
works and introduced the isTextBox function, which is called in the
middle of DocumentContentOperationsManager::CopyFlyInFlyImpl() after
resetLink(), and this now always returns false, the same for another
call inside CopyLayoutFormat() (when called from CopyFlyInFlyImpl()),
which causes text-boxes to be copied to 2 separate flys (tdf#135888).
The problem in tdf#135412 is that somehow when called from
SwFEShell::Paste() the content-index from the clipboard document ends up
in the SwDrawFrameFormat that is created in the target document,
and this causes crash in Undo because the node index is out of bounds.
10 SwUndoInsLayFormat::UndoImpl (this=0x7c2a760, rContext=...) at
sw/source/core/undo/undobj1.cxx:310
(rr) p rContent.GetContentIdx()->GetNode().GetDoc()->IsClipBoard()
(rr) $29 = true
It turns out that missing-path.docx doesn't crash any more without
resetLink(), and removing it fixes the 2 bugs.
Change-Id: I0c6c91a42e00b9f3b79b774c814e7323f2bb3e05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101004
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 10ae7ba661dff57a7d08174792565ec5e33fae9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100948
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101230
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index db565c2e8915..746a5e90b356 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -120,12 +120,9 @@ public:
/// Saves the current shape -> textbox links in a map, so they can be
restored later.
static void saveLinks(const SwFrameFormats& rFormats,
std::map& rLinks);
-/// Reset the shape -> textbox link on the shape, and save it to the map,
so it can be restored later.
-static void resetLink(SwFrameFormat* pShape,
- std::map&
rOldContent);
/// Undo the effect of saveLinks() + individual resetLink() calls.
static void restoreLinks(std::set& rOld,
std::vector& rNew,
- SavedLink& rSavedLinks, SavedContent&
rResetContent);
+ SavedLink& rSavedLinks);
};
#endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 162b8389e463..ecebb3d000b6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3595,7 +3595,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
SwTextBoxHelper::SavedLink aOldTextBoxes;
SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrameFormats(), aOldTextBoxes);
-SwTextBoxHelper::SavedContent aOldContent;
for ( size_t n = 0; n < nArrLen; ++n )
{
@@ -3662,9 +3661,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
}
if( bAdd )
{
-// Make sure draw formats don't refer to content, so that such
-// content can be removed without problems.
-SwTextBoxHelper::resetLink(pFormat, aOldContent);
aSet.insert( ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
}
}
@@ -3834,7 +3830,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// Re-create content property of draw formats, knowing how old shapes
// were paired with old fly formats (aOldTextBoxes) and that aSet is
// parallel with aVecSwFrameFormat.
-SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes,
aOldContent);
+SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes);
}
}
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index 4656e3bec14c..ea57aa58319d 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -639,19 +639,8 @@ void SwTextBoxHelper:
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg
icon-themes/breeze/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze/cmd/32/linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/breeze/cmd/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/sc_linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/32/linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/sc_linenumberingdialog.png|binary icon-themes/breeze_dark_svg/cmd/32/ar/linenumberingdialog.svg |2 +- icon-themes/breeze_dark_svg/cmd/32/linenumberingdialog.svg|2 +- icon-themes/breeze_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/breeze_dark_svg/cmd/ar/sc_linenumberingdialog.svg |1 + icon-themes/breeze_dark_svg/cmd/lc_linenumberingdialog.svg|2 +- icon-themes/breeze_dark_svg/cmd/sc_linenumberingdialog.svg|1 + icon-themes/breeze_dark_svg/cmd/sc_showsinglepage.svg |2 +- icon-themes/breeze_svg/cmd/32/ar/linenumberingdialog.svg |2 +- icon-themes/breeze_svg/cmd/32/linenumberingdialog.svg |2 +- icon-themes/breeze_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/breeze_svg/cmd/ar/sc_linenumberingdialog.svg |1 + icon-themes/breeze_svg/cmd/lc_linenumberingdialog.svg |2 +- icon-themes/breeze_svg/cmd/sc_linenumberingdialog.svg |1 + icon-themes/breeze_svg/cmd/sc_showsinglepage.svg |2 +- 26 files changed, 14 insertions(+), 10 deletions(-) New commits: commit 925f976531f48155bc7eaadfeaf4b1a34e5f3b3a Author: Rizal Muttaqin AuthorDate: Thu Aug 20 05:59:03 2020 +0700 Commit: Andras Timar CommitDate: Sun Aug 23 19:14:08 2020 +0200 tdf#135931 Breeze Line Numbering icons Change-Id: Ie7ff70c83135ed6bf0c1bcdaea31796518f5632c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101051 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101228 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/icon-themes/breeze/cmd/32/ar/linenumberingdialog.png b/icon-themes/breeze/cmd/32/ar/linenumberingdialog.png index 999a2a2da775..c5198ecce2af 100644 Binary files a/icon-themes/breeze/cmd/32/ar/linenumberingdialog.png and b/icon-themes/breeze/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/breeze/cmd/32/linenumberingdialog.png b/icon-themes/breeze/cmd/32/linenumberingdialog.png index f0bc5e2e061c..9ed7964d8190 100644 Binary files a/icon-themes/breeze/cmd/32/linenumberingdialog.png and b/icon-themes/breeze/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png b/icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png index bbae1bcf3be1..5d7947587caa 100644 Binary files a/icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png and b/icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png differ diff --git a/icon-themes/breeze/cmd/ar/sc_linenumberingdialog.png b/icon-themes/breeze/cmd/ar/sc_linenumberingdialog.png new file mode 100644 index ..6a40c2e58bd3 Binary files /dev/null and b/icon-themes/breeze/cmd/ar/sc_linenumberingdialog.png differ diff --git a/icon-themes/breeze/cmd/lc_linenumberingdialog.png b/icon-themes/breeze/cmd/lc_linenumberingdialog.png index 95369f9d19c9..62d262179a95 100644 Binary files a/icon-themes/breeze/cmd/lc_linenumberingdialog.png and b/icon-themes/breeze/cmd/lc_linenumberingdialog.png differ diff --git a/icon-themes/breeze/cmd/sc_linenumberingdialog.png b/icon-themes/breeze/cmd/sc_linenumberingdialog.png new file mode 100644 index ..dfd45c64fff3 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_linenumberingdialog.png differ diff --git a/icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png b/icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png index 0f5e6b68bab8..1cc0c700229a 100644 Binary files a/icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png and b/icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/breeze_dark/cmd/32/linenumberingdialog.png b/icon-themes/breeze_dark/cmd/32/linenumberingdialog.png index 87dcea3d8f33..73309a216dd9 100644 Binary files a/icon-themes/breeze_dark/cmd/32/linenumberingdialog.png and b/icon-themes/breeze_dark/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/breeze_dark/cmd/ar/lc_linenumberingdialog.png b/icon-themes/breeze_dark/cmd/ar/lc_linenumberingdialog.png index 487da34e6ce0..df4a94de0d0b 100644 Binary files a/icon-themes/bree
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - icon-themes/karasa_jaga icon-themes/karasa_jaga_svg
icon-themes/karasa_jaga/cmd/32/ar/linenumberingdialog.png |binary icon-themes/karasa_jaga/cmd/32/linenumberingdialog.png|binary icon-themes/karasa_jaga/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/karasa_jaga/cmd/lc_linenumberingdialog.png|binary icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png|binary icon-themes/karasa_jaga_svg/cmd/32/ar/linenumberingdialog.svg |2 +- icon-themes/karasa_jaga_svg/cmd/32/linenumberingdialog.svg|2 +- icon-themes/karasa_jaga_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/karasa_jaga_svg/cmd/lc_linenumberingdialog.svg|2 +- icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg|2 +- 12 files changed, 6 insertions(+), 6 deletions(-) New commits: commit b6b6821de3650122befaaddccfe337cd288c4523 Author: Rizal Muttaqin AuthorDate: Thu Aug 20 06:01:51 2020 +0700 Commit: Andras Timar CommitDate: Sun Aug 23 19:14:34 2020 +0200 KJ: Update Line Numbering icons Change-Id: Ia04b0f2b7703172f2557e24bb1fb63cfa566c91b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101054 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101229 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/icon-themes/karasa_jaga/cmd/32/ar/linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/32/ar/linenumberingdialog.png index c0a40a05ed38..1cc6f412eed6 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/ar/linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/32/linenumberingdialog.png index b4cf282b7830..cc8481af287a 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/ar/lc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/ar/lc_linenumberingdialog.png index 541e03704538..9bce9bda41e5 100644 Binary files a/icon-themes/karasa_jaga/cmd/ar/lc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/ar/lc_linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png index 18967b40e2ec..bca545c56639 100644 Binary files a/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/lc_linenumberingdialog.png index 8d77b03249a2..e265f7d6742b 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/lc_linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png index 0ceb15fc1e55..49bdb065819c 100644 Binary files a/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png differ diff --git a/icon-themes/karasa_jaga_svg/cmd/32/ar/linenumberingdialog.svg b/icon-themes/karasa_jaga_svg/cmd/32/ar/linenumberingdialog.svg index 54958aaf983b..582c22bcf41d 100644 --- a/icon-themes/karasa_jaga_svg/cmd/32/ar/linenumberingdialog.svg +++ b/icon-themes/karasa_jaga_svg/cmd/32/ar/linenumberingdialog.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/karasa_jaga_svg/cmd/32/linenumberingdialog.svg b/icon-themes/karasa_jaga_svg/cmd/32/linenumberingdialog.svg index 283ab3d8aca9..5a4a8370c0a9 100644 --- a/icon-themes/karasa_jaga_svg/cmd/32/linenumberingdialog.svg +++ b/icon-themes/karasa_jaga_svg/cmd/32/linenumberingdialog.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< path d="m76.00017 972.36227h52v78.3h-52z" fill="#4d4d4d"/> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/karasa_jaga_svg/cmd/ar/lc_linenumberingdialog.svg b/icon-themes/karasa_jaga_svg/cmd/ar/lc_linenumberingdialog.svg index 963df9a10f2e..439903cbb714 100644 --- a/icon-themes/karasa_jaga_svg/cmd/ar/lc_linenumberingdialog.svg +++ b/icon-themes/karasa_jaga_svg/cmd/ar/lc_linenumberingdialog.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source
sw/source/core/doc/docfmt.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9253d60c6fa4c8f37eba8e445cb5432e80a61696
Author: Vasily Melenchuk
AuthorDate: Mon Jul 20 09:55:19 2020 +0300
Commit: Andras Timar
CommitDate: Sun Aug 23 19:13:17 2020 +0200
sw: generate unique style name for table box and line frames
Since SwTableBoxFormat and SwTableLineFormat are derived from
SwFrameFormat they can behave incorrectly during undo/redo.
Undo/redo code is trying to rely style names instead of pointers
to format: this is dangerous.
Any problems with SwTableBoxFormat and SwTableLineFormat, I was
not able to reproduce with GUI. But external access to document
via UNO can bring surprises.
For example: NumberFormat for table cells in GUI is modified, but
can be changed to another by UNO call (see example/usecase in
/sw/qa/python/check_table.py: test_tdf32082. And such replacement
looks from core as a new style, not a modification of attributes
in existing one.
Change-Id: I6afc992f6cdb9ce692167204b3c98e8234cd87d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99023
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 083fe09958658de8c3da87a28e0f8ff7b3b8a5e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101225
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 6b92ee74e9ac..a738ea1596a0 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1696,6 +1696,7 @@ bool SwDoc::DontExpandFormat( const SwPosition& rPos,
bool bFlag )
SwTableBoxFormat* SwDoc::MakeTableBoxFormat()
{
SwTableBoxFormat* pFormat = new SwTableBoxFormat( GetAttrPool(),
mpDfltFrameFormat.get() );
+pFormat->SetName("TableBox" +
OUString::number(reinterpret_cast(pFormat)));
getIDocumentState().SetModified();
return pFormat;
}
@@ -1703,6 +1704,7 @@ SwTableBoxFormat* SwDoc::MakeTableBoxFormat()
SwTableLineFormat* SwDoc::MakeTableLineFormat()
{
SwTableLineFormat* pFormat = new SwTableLineFormat( GetAttrPool(),
mpDfltFrameFormat.get() );
+pFormat->SetName("TableLine" +
OUString::number(reinterpret_cast(pFormat)));
getIDocumentState().SetModified();
return pFormat;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source
sw/source/core/edit/edfcol.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit e4c4caea265b874f5f6b96b2aab108785e9ebc3a Author: Vasily Melenchuk AuthorDate: Thu Apr 30 16:27:37 2020 +0300 Commit: Andras Timar CommitDate: Sun Aug 23 19:13:32 2020 +0200 sw: moved setting shape name to earlier stage During setting of some shape properties undo/redo code is called. Undo/redo code should know about shape and style name. Change-Id: I5240c450d0c739a245e32e9ca6f34518f35ddda5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93214 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit db3d90abd3bb830b079169397f656c56bdcc3af8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100939 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101226 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 7216ab102c87..2b49ee16ecc8 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -1532,6 +1532,10 @@ static void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark, // Create and insert the shape. uno::Reference xShape(xMultiServiceFactory->createInstance(aShapeServiceName), uno::UNO_QUERY); + +uno::Reference xNamed(xShape, uno::UNO_QUERY); +xNamed->setName(sWatermark); + basegfx::B2DHomMatrix aTransformation; aTransformation.identity(); aTransformation.scale(nWidth, nHeight); @@ -1600,8 +1604,6 @@ static void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark, xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT, uno::makeAny(static_cast(text::HoriOrientation::CENTER))); xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT, uno::makeAny(static_cast(text::VertOrientation::CENTER))); -uno::Reference xNamed(xShape, uno::UNO_QUERY); -xNamed->setName(sWatermark); xLockable->removeActionLock(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg
icon-themes/sifr/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr/cmd/32/linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr/cmd/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/sc_linenumberingdialog.png |binary icon-themes/sifr/links.txt |6 +++--- icon-themes/sifr_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/32/linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/sc_linenumberingdialog.png|binary icon-themes/sifr_dark/links.txt |6 +++--- icon-themes/sifr_dark_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_dark_svg/cmd/32/linenumberingdialog.svg|1 + icon-themes/sifr_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_linenumberingdialog.svg|2 +- icon-themes/sifr_dark_svg/cmd/sc_linenumberingdialog.svg|2 +- icon-themes/sifr_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/32/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/sc_linenumberingdialog.svg |2 +- 26 files changed, 18 insertions(+), 14 deletions(-) New commits: commit 7a0418b2f90b804305cd9a11a4b14ec167436eaf Author: Rizal Muttaqin AuthorDate: Tue Aug 18 16:41:33 2020 +0700 Commit: Andras Timar CommitDate: Sun Aug 23 19:13:52 2020 +0200 Sifr: tdf#135872, missing Line Numbering icon Change-Id: Ic44d598b7f7c66f45dbf1e4e419f6f76e13c7f6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100910 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit cff430c6ba8a85faaf6e15abd26eceafb493ed9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100808 (cherry picked from commit da4b25dc11cfa22885ff260a4bdf99ec32f617f9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100937 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101227 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png new file mode 100644 index ..e13c7689663b Binary files /dev/null and b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/32/linenumberingdialog.png b/icon-themes/sifr/cmd/32/linenumberingdialog.png new file mode 100644 index ..c9609a0e9234 Binary files /dev/null and b/icon-themes/sifr/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png index 1a4e98ba941f..bdc3b598e011 100644 Binary files a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png index 6a9c5aa15f0a..99c3fd666ea0 100644 Binary files a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/lc_linenumberingdialog.png index 1f3913772e33..bdf92deeed9f 100644 Binary files a/icon-themes/sifr/cmd/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/sc_linenumberingdialog.png index 7d5526fb40c7..91fdd9619175 100644 Binary files a/icon-themes/sifr/cmd/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 4d8cf94569b3..9e45f065490a 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -129,7 +129,7 @@ cmd/32/inserttextframe.png cmd/32/insertframe.png cmd/32/inserttimefield.png cmd/32/timefield.png cmd/32/inserttimefieldfix.png cmd/32/timefield.png cmd/32/insobjctrl.png cmd/32/adddirect.png -cmd/32/linenumberingdialog.png cmd/32/linenumberdialog.png +cmd/32/linenumberdialog.png cmd/32/linenumberingdialog.png cmd/32/numberingmenu.png cmd/32/outlinebullet.png cmd/32/paragraphmenu.png cmd/32/paragraphdialog.png cmd/32/shapesmenu
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpstyl.cxx | 94
xmloff/source/draw/ximpstyl.hxx | 15 ++
2 files changed, 44 insertions(+), 65 deletions(-)
New commits:
commit 8d3f88f22e35936577f278b0fcc366c75c403a82
Author: Noel Grandin
AuthorDate: Sun Aug 23 16:43:25 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 23 18:57:37 2020 +0200
use fastparser in SdXMLPageMasterContext
Change-Id: Ie4c9419a226eb14e0ff0ded23e2749e68dadcaa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101241
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 22a77b320d78..ff2796023d1f 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -309,10 +309,9 @@ void XMLDrawingPageStyleContext::FillPropertySet(
SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
SdXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLName,
-const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList,
XmlStyleFamily::SD_PAGEMASTERSTYLECONEXT_ID),
+sal_Int32 nElement,
+const uno::Reference< xml::sax::XFastAttributeList>& xAttrList)
+: SvXMLStyleContext(rImport, nElement, xAttrList,
XmlStyleFamily::SD_PAGEMASTERSTYLECONEXT_ID),
mnBorderBottom( 0 ),
mnBorderLeft( 0 ),
mnBorderRight( 0 ),
@@ -324,54 +323,54 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
// set family to something special at SvXMLStyleContext
// for differences in search-methods
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for(sal_Int16 i=0; i < nAttrCount; i++)
+for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
{
-OUString sAttrName = xAttrList->getNameByIndex(i);
-OUString aLocalName;
-sal_uInt16 nPrefix =
GetSdImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName);
-OUString sValue = xAttrList->getValueByIndex(i);
-const SvXMLTokenMap& rAttrTokenMap =
GetSdImport().GetPageMasterStyleAttrTokenMap();
-
-switch(rAttrTokenMap.Get(nPrefix, aLocalName))
+OUString sValue = aIter.toString();
+switch(aIter.getToken())
{
-case XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP:
+case XML_ELEMENT(FO, XML_MARGIN_TOP):
+case XML_ELEMENT(FO_COMPAT, XML_MARGIN_TOP):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnBorderTop, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM:
+case XML_ELEMENT(FO, XML_MARGIN_BOTTOM):
+case XML_ELEMENT(FO_COMPAT, XML_MARGIN_BOTTOM):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnBorderBottom, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_MARGIN_LEFT:
+case XML_ELEMENT(FO, XML_MARGIN_LEFT):
+case XML_ELEMENT(FO_COMPAT, XML_MARGIN_LEFT):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnBorderLeft, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_MARGIN_RIGHT:
+case XML_ELEMENT(FO, XML_MARGIN_RIGHT):
+case XML_ELEMENT(FO_COMPAT, XML_MARGIN_RIGHT):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnBorderRight, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_PAGE_WIDTH:
+case XML_ELEMENT(FO, XML_PAGE_WIDTH):
+case XML_ELEMENT(FO_COMPAT, XML_PAGE_WIDTH):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnWidth, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_PAGE_HEIGHT:
+case XML_ELEMENT(FO, XML_PAGE_HEIGHT):
+case XML_ELEMENT(FO_COMPAT, XML_PAGE_HEIGHT):
{
GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
mnHeight, sValue);
break;
}
-case XML_TOK_PAGEMASTERSTYLE_PAGE_ORIENTATION:
+case XML_ELEMENT(STYLE, XML_PRINT_ORIENTATION):
{
if( IsXMLToken( sValue, XML_PORTRAIT ) )
meOrientation = view::PaperOrientation_PORTRAIT;
@@ -379,6 +378,8 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
meOrientation = view::PaperOrientation_LANDSCAPE;
break;
}
+default:
+SAL_WARN("xmloff", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=
Re: [libreoffice-documentation] What is data hierarchy in pivot table data field options?
Thanks, Kohei. I am grateful! Stay safe! Cheers ;D El 2020-08-23 09:08 AM, Kohei Yoshida escribió: Hi Celia, On 22.08.2020 21:45, Celia Palacios wrote: I do not want to be disrespectful regarding your name, that's why I call your full name. I do not know ettiquette. I am sorry. Just using my first name (Kohei) is fine. :-) From this text of yours, if I do not misunderstand, if a field has grouping, is it redundant to have hierarchy because it will be the same? Yup. For all intents and purposes, grouping equals hierarchy. The term "grouping" is used in the UI, whereas the term "hierarchy" is used in the code. I want to share this answer (complete of yours) if you may let me, Kohei Yoshida, in AskLibreOffice (or if you like, you can). This is the question link: https://ask.libreoffice.org/en/question/260914/whay-is-data-hierarchy-in-pivot-tables/ Absolutely! What I post here is public record. You are free to link to it and reference it any way you like. You don't need my permission to do it. All the best, Kohei -- Ego sum in porta limine. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 179909a9ec0ac3c73cc3f797da63ae20c9057636
Author: Caolán McNamara
AuthorDate: Fri Aug 21 19:17:36 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 18:22:41 2020 +0200
g_object_set_data to unset is unnecessary and unhelpful
Change-Id: I44665542f70c39c7861940d2191860ca9f53a700
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101179
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 671938d721c9..c73966efcd5c 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -15842,13 +15842,7 @@ public:
{
g_slist_free(m_pObjectList);
g_object_unref(m_pBuilder);
-
-if (m_xInterimGlue)
-{
-assert(m_pParentWidget);
-g_object_set_data(G_OBJECT(m_pParentWidget), "InterimWindowGlue",
nullptr);
-m_xInterimGlue.disposeAndClear();
-}
+m_xInterimGlue.disposeAndClear();
}
//ideally we would have/use weld::Container add and explicitly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Patch review
Hi mentors, Please check https://gerrit.libreoffice.org/c/core/+/101242 I have worked on the Bug 87963 Thank you Regards Anshu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/vbalistformat.cxx | 45 -
1 file changed, 35 insertions(+), 10 deletions(-)
New commits:
commit be50e025724d80009aaf8859a9d6ade6d511b2dd
Author: Mike Kaganski
AuthorDate: Sun Aug 23 17:29:54 2020 +0300
Commit: Mike Kaganski
CommitDate: Sun Aug 23 17:36:34 2020 +0200
Process nested paragraphs (e.g., in tables) in ConvertNumbersToText
Additionally process higher outline levels - make sure to convert
them to text, not to just decrease their level.
And correct the tabstop position (TODO: does this depend on compat
option TabsRelativeToIndent?)
Change-Id: I600f10811c542c1de716457e6c4547c9e8352408
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101240
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/ui/vba/vbalistformat.cxx
b/sw/source/ui/vba/vbalistformat.cxx
index d8642cb7fab0..798ca6fb29f7 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -98,6 +99,35 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const
css::uno::Reference< wor
while( xEnum->hasMoreElements() );
}
+template
+static void addParagraphsToList(const Ref& a,
+
std::vector>& rList)
+{
+if (css::uno::Reference xInfo{ a,
css::uno::UNO_QUERY })
+{
+if (xInfo->supportsService("com.sun.star.text.Paragraph"))
+{
+rList.emplace_back(xInfo, css::uno::UNO_QUERY_THROW);
+}
+else if (xInfo->supportsService("com.sun.star.text.TextTable"))
+{
+css::uno::Reference xTable(xInfo,
css::uno::UNO_QUERY_THROW);
+const auto aNames = xTable->getCellNames();
+for (const auto& rName : aNames)
+{
+addParagraphsToList(xTable->getCellByName(rName), rList);
+}
+}
+}
+if (css::uno::Reference xEnumAccess{ a,
+
css::uno::UNO_QUERY })
+{
+auto xEnum = xEnumAccess->createEnumeration();
+while (xEnum->hasMoreElements())
+addParagraphsToList(xEnum->nextElement(), rList);
+}
+}
+
void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
{
css::uno::Reference xModel(getThisWordDoc(mxContext));
@@ -111,15 +141,8 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
xUndoManager->leaveUndoContext();
});
-css::uno::Reference
xEnumAccess(mxTextRange,
-
css::uno::UNO_QUERY_THROW);
-auto xEnum = xEnumAccess->createEnumeration();
-if (!xEnum->hasMoreElements())
-return;
-
std::vector> aParagraphs;
-while (xEnum->hasMoreElements())
-aParagraphs.emplace_back(xEnum->nextElement(),
css::uno::UNO_QUERY_THROW);
+addParagraphsToList(mxTextRange, aParagraphs);
// in reverse order, to get proper label strings
for (auto it = aParagraphs.rbegin(); it != aParagraphs.rend(); ++it)
@@ -243,7 +266,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
css::uno::Sequence stops;
(*it)->getPropertyValue("ParaTabStops") >>= stops;
css::style::TabStop tabStop{};
-tabStop.Position = nListtabStopPosition - nIndentAt;
+tabStop.Position = nListtabStopPosition;
tabStop.Alignment =
com::sun::star::style::TabAlign::TabAlign_LEFT;
tabStop.FillChar = ' ';
(*it)->setPropertyValue(
@@ -257,7 +280,9 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
// TODO:
css::text::PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION
continue; // for now, keep such lists as is
}
-(*it)->setPropertyValue("NumberingRules", css::uno::Any());
+// In case of higher outline levels, each assignment of empty
value just sets level 1
+while ((*it)->getPropertyValue("NumberingRules") !=
css::uno::Any())
+(*it)->setPropertyValue("NumberingRules", css::uno::Any());
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/source
include/xmloff/table/XMLTableImport.hxx |2 -
sw/source/filter/xml/xmlfmt.cxx | 17
xmloff/source/draw/ximpstyl.cxx | 21 --
xmloff/source/draw/ximpstyl.hxx |3 +
xmloff/source/table/XMLTableImport.cxx | 64 +---
5 files changed, 63 insertions(+), 44 deletions(-)
New commits:
commit 1916366ff4d7f581ea2116e7411bab7f594425d4
Author: Noel Grandin
AuthorDate: Fri Aug 21 16:45:07 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 23 16:10:49 2020 +0200
use fastparser in CreateTableTemplateContext
Change-Id: Ic9274c30bfceba7d85d7c80ad259b3eab93ff618
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101175
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/table/XMLTableImport.hxx
b/include/xmloff/table/XMLTableImport.hxx
index f1d911616118..cb6e2da7b48c 100644
--- a/include/xmloff/table/XMLTableImport.hxx
+++ b/include/xmloff/table/XMLTableImport.hxx
@@ -49,7 +49,7 @@ public:
SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString&
rLName,
css::uno::Reference<
css::table::XColumnRowRange > const & xColumnRowRange );
-SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const
OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >&
xAttrList );
+SvXMLStyleContext* CreateTableTemplateContext( sal_Int32 nElement, const
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList );
const rtl::Reference< SvXMLImportPropertyMapper >&
GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; }
const rtl::Reference< SvXMLImportPropertyMapper >&
GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; }
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 49e1224cdb83..f07ec1c89cf7 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -751,9 +751,8 @@ class SwXMLStylesContext_Impl : public SvXMLStylesContext
protected:
using SvXMLStylesContext::CreateStyleChildContext;
-virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
) override;
+virtual SvXMLStyleContext *CreateStyleChildContext( sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
virtual SvXMLStyleContext *CreateStyleStyleChildContext( XmlStyleFamily
nFamily,
sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -784,19 +783,19 @@ public:
}
-SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleChildContext(
sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList )
+SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList
)
{
SvXMLStyleContext* pContext = nullptr;
-if(nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(rLocalName,
XML_TABLE_TEMPLATE))
+if(nElement == XML_ELEMENT(TABLE, XML_TABLE_TEMPLATE))
{
rtl::Reference xTableImport =
GetImport().GetShapeImport()->GetShapeTableImport();
-pContext = xTableImport->CreateTableTemplateContext(nPrefix,
rLocalName, xAttrList);
+pContext = xTableImport->CreateTableTemplateContext(nElement,
xAttrList);
}
if (!pContext)
-pContext = SvXMLStylesContext::CreateStyleChildContext(nPrefix,
rLocalName, xAttrList);
+pContext = SvXMLStylesContext::CreateStyleChildContext(nElement,
xAttrList);
return pContext;
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index aafeade525b7..22a77b320d78 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -903,6 +903,22 @@ SdXMLStylesContext::SdXMLStylesContext(
mpNumFmtHelper = std::make_unique(
mpNumFormatter.get(), xContext );
}
+SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
+sal_Int32 nElement,
+const uno::Reference< xml::sax::XFastAttributeList >& xAttrList)
+{
+SvXMLStyleContext* pContext = nullptr;
+if( nElement == XML_ELEMENT(TABLE, XML_TABLE_TEMPLATE) )
+{
+pContext =
GetImport().GetShapeImport()->GetShapeTableImport()->CreateTableTemplateContext(nElement,
xAttrList );
+if (pContext)
+return pContext;
+}
+
+// call base class
+return SvXMLStylesContext::CreateStyleChildContext(nElement, xAttrList);
+}
+
SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -960,11 +976,6 @@ SvXMLStyleContext*
SdXMLStylesContext::CreateStyleChildContext(
}
}
-if(!pContext &&
Re: [libreoffice-documentation] What is data hierarchy in pivot table data field options?
Hi Celia, On 22.08.2020 21:45, Celia Palacios wrote: I do not want to be disrespectful regarding your name, that's why I call your full name. I do not know ettiquette. I am sorry. Just using my first name (Kohei) is fine. :-) From this text of yours, if I do not misunderstand, if a field has grouping, is it redundant to have hierarchy because it will be the same? Yup. For all intents and purposes, grouping equals hierarchy. The term "grouping" is used in the UI, whereas the term "hierarchy" is used in the code. I want to share this answer (complete of yours) if you may let me, Kohei Yoshida, in AskLibreOffice (or if you like, you can). This is the question link: https://ask.libreoffice.org/en/question/260914/whay-is-data-hierarchy-in-pivot-tables/ Absolutely! What I post here is public record. You are free to link to it and reference it any way you like. You don't need my permission to do it. All the best, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/map.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 80e81048626cefeceab243135a1241e7dac32db1
Author: Caolán McNamara
AuthorDate: Sat Aug 22 19:38:03 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 15:47:31 2020 +0200
set point values via ctor
Change-Id: Icb17ea1b82128669d4f35492fba70c7d89f9fdca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101191
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 2430daec4f56..e6f7d485979b 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -543,13 +543,12 @@ tools::Polygon OutputDevice::ImplLogicToDevicePixel(
const tools::Polygon& rLogi
for ( i = 0; i < nPoints; i++ )
{
const Point& rPt = pPointAry[i];
-Point aPt;
-aPt.setX( ImplLogicToPixel( rPt.X()+maMapRes.mnMapOfsX, mnDPIX,
+Point aPt(ImplLogicToPixel( rPt.X()+maMapRes.mnMapOfsX, mnDPIX,
maMapRes.mnMapScNumX,
maMapRes.mnMapScDenomX,
-maThresRes.mnThresLogToPixX
)+mnOutOffX+mnOutOffOrigX );
-aPt.setY( ImplLogicToPixel( rPt.Y()+maMapRes.mnMapOfsY, mnDPIY,
+maThresRes.mnThresLogToPixX
)+mnOutOffX+mnOutOffOrigX,
+ ImplLogicToPixel( rPt.Y()+maMapRes.mnMapOfsY, mnDPIY,
maMapRes.mnMapScNumY,
maMapRes.mnMapScDenomY,
-maThresRes.mnThresLogToPixY
)+mnOutOffY+mnOutOffOrigY );
+maThresRes.mnThresLogToPixY
)+mnOutOffY+mnOutOffOrigY);
aPoly[i] = aPt;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/map.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d64d62f15eb98033273a90af3dc83b57b7b25359
Author: Caolán McNamara
AuthorDate: Sat Aug 22 19:35:33 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 15:47:11 2020 +0200
use a reference instead of a pointer
Change-Id: I15b23f8b8f469b9bfcadb0bd72b7f01f6b5c8fc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101190
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index e5ea1b416884..2430daec4f56 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -542,12 +542,12 @@ tools::Polygon OutputDevice::ImplLogicToDevicePixel(
const tools::Polygon& rLogi
{
for ( i = 0; i < nPoints; i++ )
{
-const Point* pPt = &(pPointAry[i]);
+const Point& rPt = pPointAry[i];
Point aPt;
-aPt.setX( ImplLogicToPixel( pPt->X()+maMapRes.mnMapOfsX, mnDPIX,
+aPt.setX( ImplLogicToPixel( rPt.X()+maMapRes.mnMapOfsX, mnDPIX,
maMapRes.mnMapScNumX,
maMapRes.mnMapScDenomX,
maThresRes.mnThresLogToPixX
)+mnOutOffX+mnOutOffOrigX );
-aPt.setY( ImplLogicToPixel( pPt->Y()+maMapRes.mnMapOfsY, mnDPIY,
+aPt.setY( ImplLogicToPixel( rPt.Y()+maMapRes.mnMapOfsY, mnDPIY,
maMapRes.mnMapScNumY,
maMapRes.mnMapScDenomY,
maThresRes.mnThresLogToPixY
)+mnOutOffY+mnOutOffOrigY );
aPoly[i] = aPt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/gdimtf.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 0f02412d6baf9edb54c62856c52cebfa707291b2
Author: Caolán McNamara
AuthorDate: Sat Aug 22 20:37:00 2020 +0100
Commit: Caolán McNamara
CommitDate: Sun Aug 23 15:46:51 2020 +0200
crashtesting avoid problematic scaling triggered by moz1545040-1.svg
Change-Id: I906891f8d01870bd13a98fc6720abb7ffaa9be1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101189
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 246b3c91f4de..22b516924b2b 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2782,6 +2782,10 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx,
BmpConversion eColorConve
{
// initialization seems to be complicated but is used to avoid rounding
errors
ScopedVclPtrInstance< VirtualDevice > aVDev;
+// set EnableB2dDraw to tease the rendering down the code paths which use
B2DPolygon and
+// avoid integer overflows on scaling tools::Polygon, e.g. moz1545040-1.svg
+// note: this is similar to DocumentToGraphicRenderer::renderToGraphic
+aVDev->SetAntialiasing(AntialiasingFlags::EnableB2dDraw |
aVDev->GetAntialiasing());
const Point aNullPt;
const Point aTLPix( aVDev->LogicToPixel( aNullPt, GetPrefMapMode() ) );
const Point aBRPix( aVDev->LogicToPixel( Point( GetPrefSize().Width()
- 1, GetPrefSize().Height() - 1 ), GetPrefMapMode() ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unodevtools/source
unodevtools/source/skeletonmaker/javacompskeleton.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b683bbb14e74489988e12667d3193c8a32794b88
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:55:50 2020 +0200
Commit: Stephan Bergmann
CommitDate: Sun Aug 23 15:37:13 2020 +0200
Fix typo in code
Change-Id: I186af7793c235cdd42c815049ee74543b705ffe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101206
Tested-by: Jenkins
Reviewed-by: Julien Nabet
Reviewed-by: Stephan Bergmann
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index f255989a79ac..b4d26e0e0a18 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -197,7 +197,7 @@ static bool checkAttribute(
/* com::sun::star::beans::PropertyValue::CONSTRAINED */ 4,
/* com::sun::star::beans::PropertyValue::TRANSIENT */ 8,
/* com::sun::star::beans::PropertyValue::READONLY */ 16,
-/* com::sun::star::beans::PropertyValue::MAYBEAMBIGIOUS */ 32,
+/* com::sun::star::beans::PropertyValue::MAYBEAMBIGUOUS */ 32,
/* com::sun::star::beans::PropertyValue::MAYBEDEFAULT */ 64,
/* com::sun::star::beans::PropertyValue::REMOVABLE */ 128,
/* com::sun::star::beans::PropertyValue::OPTIONAL */ 256 };
@@ -227,7 +227,7 @@ static bool checkAttribute(
attributeValue.append("PropertyAttribute.READONLY");
break;
case 32:
-attributeValue.append("PropertyAttribute.MAYBEAMBIGIOUS");
+attributeValue.append("PropertyAttribute.MAYBEAMBIGUOUS");
break;
case 64:
attributeValue.append("PropertyAttribute.MAYBEDEFAULT");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/preview.hxx |2 +-
sc/source/ui/view/preview.cxx | 24
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 594790152320757723a5e622a041316d27360b09
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:52:05 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 14:53:02 2020 +0200
Fix typo in code
Change-Id: I71d4c3c0d89841e5c7eecc2126ac4f79a9d9632c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101203
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 69133b9e9c1b..5459718f02b7 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -83,7 +83,7 @@ private:
std::vector mvRight;
longnLeftPosition;
longmnScale;
-SCCOL nColNumberButttonDown;
+SCCOL nColNumberButtonDown;
Point aButtonDownChangePoint;
Point aButtonDownPt;
Point aButtonUpPt;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 09f3da645d41..207d098ca8c5 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -119,7 +119,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell*
pDocSh, ScPreviewShell*
mbHasEmptyRangeTable(false),
nLeftPosition( 0 ),
mnScale( 0 ),
-nColNumberButttonDown( 0 ),
+nColNumberButtonDown( 0 ),
nHeaderHeight ( 0 ),
nFooterHeight ( 0 )
{
@@ -1016,7 +1016,7 @@ void ScPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
if( aNowPt.X() < mvRight[i] + 2 && aNowPt.X() > mvRight[i] - 2 )
{
-nColNumberButttonDown = i;
+nColNumberButtonDown = i;
break;
}
}
@@ -1024,10 +1024,10 @@ void ScPreview::MouseButtonDown( const MouseEvent&
rMEvt )
return;
SetMapMode( aMMMode );
-if( nColNumberButttonDown == aPageArea.aStart.Col() )
+if( nColNumberButtonDown == aPageArea.aStart.Col() )
DrawInvert( PixelToLogic( Point( nLeftPosition, 0 ),aMMMode ).X()
,PointerStyle::HSplit );
else
-DrawInvert( PixelToLogic( Point( mvRight[ nColNumberButttonDown-1 ], 0
),aMMMode ).X() ,PointerStyle::HSplit );
+DrawInvert( PixelToLogic( Point( mvRight[ nColNumberButtonDown-1 ], 0
),aMMMode ).X() ,PointerStyle::HSplit );
DrawInvert( aButtonDownChangePoint.X(), PointerStyle::HSplit );
bColRulerMove = true;
@@ -1241,27 +1241,27 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
if( aButtonDownPt.X() == aButtonUpPt.X() )
{
bMoveRulerAction = false;
-if( nColNumberButttonDown == aPageArea.aStart.Col() )
+if( nColNumberButtonDown == aPageArea.aStart.Col() )
DrawInvert( PixelToLogic( Point( nLeftPosition, 0
),aMMMode ).X() ,PointerStyle::HSplit );
else
-DrawInvert( PixelToLogic( Point( mvRight[
nColNumberButttonDown-1 ], 0 ),aMMMode ).X() ,PointerStyle::HSplit );
+DrawInvert( PixelToLogic( Point( mvRight[
nColNumberButtonDown-1 ], 0 ),aMMMode ).X() ,PointerStyle::HSplit );
DrawInvert( aButtonUpPt.X(), PointerStyle::HSplit );
}
if( bMoveRulerAction )
{
long nNewColWidth = 0;
-std::vector aCols(1,
sc::ColRowSpan(nColNumberButttonDown,nColNumberButttonDown));
+std::vector aCols(1,
sc::ColRowSpan(nColNumberButtonDown,nColNumberButtonDown));
if( !bLayoutRTL )
{
-nNewColWidth = static_cast( PixelToLogic( Point(
rMEvt.GetPosPixel().X() - mvRight[ nColNumberButttonDown ], 0), aMMMode ).X() /
HMM_PER_TWIPS ) * 100 / mnScale;
-nNewColWidth += pDocShell->GetDocument().GetColWidth(
nColNumberButttonDown, nTab );
+nNewColWidth = static_cast( PixelToLogic( Point(
rMEvt.GetPosPixel().X() - mvRight[ nColNumberButtonDown ], 0), aMMMode ).X() /
HMM_PER_TWIPS ) * 100 / mnScale;
+nNewColWidth += pDocShell->GetDocument().GetColWidth(
nColNumberButtonDown, nTab );
}
else
{
-nNewColWidth = static_cast( PixelToLogic( Point(
mvRight[ nColNumberButttonDown ] - rMEvt.GetPosPixel().X(), 0), aMMMode ).X() /
HMM_PER_TWIPS ) * 100 / mnScale;
-nNewColWidth += pDocShell->GetDocument().GetColWidth(
nColNumberButttonDown, nTab );
+nNewColWidth = static_cast( PixelToLogic( Point(
mvRight[ nColNumberButtonDown ] - rMEvt.GetPosPixel().X(), 0), aMMMode ).X() /
HMM_PER_TWIPS ) * 100 / mnScale;
+nNewColWidth += pDocShell->GetDocument().GetColWidth(
nColNumberButtonDown, nTab );
}
if( nNewColWidth >= 0 )
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2817695f069f05e7d6b3123d8e3e44ffe7c117b9
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:45:10 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 14:53:24 2020 +0200
Fix typo in code
Change-Id: I4c85b93b57fc36e64f2d33e7440d8f20bcb78960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101201
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 836e63e0c28b..d1a6b7d3758b 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2210,19 +2210,19 @@ uno::Any SAL_CALL
ScAccessibleDocument::getExtendedAttributes()
{
SolarMutexGuard g;
-uno::Any anyAtrribute;
+uno::Any anyAttribute;
sal_uInt16 sheetIndex;
OUString sSheetName;
sheetIndex = getVisibleTable();
if(GetDocument()==nullptr)
-return anyAtrribute;
+return anyAttribute;
GetDocument()->GetName(sheetIndex,sSheetName);
OUString sValue = "page-name:" + sSheetName +
";page-number:" + OUString::number(sheetIndex+1) +
";total-pages:" + OUString::number(GetDocument()->GetTableCount()) +
";";
-anyAtrribute <<= sValue;
-return anyAtrribute;
+anyAttribute <<= sValue;
+return anyAttribute;
}
sal_Int32 SAL_CALL ScAccessibleDocument::getForeground( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/shutdowniconw32.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ab38ed6e232013dc9df7ae1350319c41211fc726
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:29:50 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 14:53:45 2020 +0200
Fix typo in code
Change-Id: I2598723397edba3ae0d447d3f5dd327a38467741
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101211
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/appl/shutdowniconw32.cxx
b/sfx2/source/appl/shutdowniconw32.cxx
index 2540b2c79eb5..05b855f4cad4 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -713,7 +713,7 @@ static HRESULT WINAPI SHCoCreateInstance( LPVOID
lpszReserved, REFCLSID clsid, L
if ( hModShell != nullptr )
{
-typedef HRESULT (WINAPI *SHCoCreateInstance_PROC)( LPVOID
lpszReserved, REFCLSID clsid, LPUNKNOWN pUnkUnknwon, REFIID iid, LPVOID *ppv );
+typedef HRESULT (WINAPI *SHCoCreateInstance_PROC)( LPVOID
lpszReserved, REFCLSID clsid, LPUNKNOWN pUnkUnknown, REFIID iid, LPVOID *ppv );
SHCoCreateInstance_PROC lpfnSHCoCreateInstance =
reinterpret_cast(GetProcAddress( hModShell,
MAKEINTRESOURCEA(102) ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49a372a210b0390f6ebbac30c74a3d13cb302d52 Author: Andrea Gelmini AuthorDate: Sat Aug 22 23:03:41 2020 +0200 Commit: Julien Nabet CommitDate: Sun Aug 23 14:44:07 2020 +0200 Fix typo in code Change-Id: I00f81e25cd1f5a6ba71c8137486069368846f9f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101213 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 9c4cf99f81bd..6b074ae00378 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -92,7 +92,7 @@ public: @param ePart The part of the page object for which to return the bounding box. -@param eCoodinateSystem +@param eCoordinateSystem The bounding box can be returned in model and in pixel (window) coordinates. @param bIgnoreLocation ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/lineinfo.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 921e11d4716e9e418c9912b098482e8ee632016a
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:53:32 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 14:44:35 2020 +0200
Fix typo in code
Change-Id: I66657f300da57311d2965bc74e4a055e21926c5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101205
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index 602ac8af9f18..9490a0383133 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -229,12 +229,12 @@ void LineInfo::applyToB2DPolyPolygon(
for(auto const& rPolygon : io_rLinePolyPolygon)
{
-basegfx::B2DPolyPolygon aLineTraget;
+basegfx::B2DPolyPolygon aLineTarget;
basegfx::utils::applyLineDashing(
rPolygon,
fDotDashArray,
-&aLineTraget);
-aResult.append(aLineTraget);
+&aLineTarget);
+aResult.append(aLineTarget);
}
io_rLinePolyPolygon = aResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf123356.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 20
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4
3 files changed, 24 insertions(+)
New commits:
commit f1f27b2487ccfb7a03190ff68eadbfb611dd9749
Author: László Németh
AuthorDate: Sat Aug 22 17:22:04 2020 +0200
Commit: László Németh
CommitDate: Sun Aug 23 13:07:03 2020 +0200
tdf#123356 DOCX import: fix COUNT formula
Convert COUNT(x) to the equivalent, but
portable Writer formula SUM(x)/MEAN(x).
Note: this is a temporary conversion, which
supports only 1-level nesting of function calls.
Adding COUNT to Writer core, it will be possible
to remove portable conversion later.
Change-Id: I4b4019aadad52e6d1cf3b2d18d80b1d2c7485c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101185
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123356.docx
b/sw/qa/extras/ooxmlexport/data/tdf123356.docx
new file mode 100644
index ..9432ca2dbb06
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123356.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index ad96c19673c3..638a43761c76 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -113,6 +113,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.docx")
CPPUNIT_ASSERT_EQUAL(OUString("1"),
xEnumerationAccess2->getPresentation(false).trim());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123356, "tdf123356.docx")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("-11"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("-11"),
xEnumerationAccess1->getPresentation(false).trim());
+
+// Tests cell formula COUNT(x) to SUM(x)/MEAN(x) conversion
+uno::Reference
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
+
CPPUNIT_ASSERT_EQUAL(OUString("(SUM(|)/MEAN(|))"),
xEnumerationAccess4->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("5"),
xEnumerationAccess4->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("(SUM()/MEAN())"),
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("3"),
xEnumerationAccess3->getPresentation(false).trim());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle.odt")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b5a8f124c142..a482a3231551 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4272,6 +4272,10 @@ OUString DomainMapper_Impl::convertFieldFormula(const
OUString& input) {
icu::RegexMatcher
rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"),
status);
+/* Fix up COUNT(x) using SUM(x)/MEAN(x) (it supports only 1-level nesting)
*/
+icu::RegexMatcher
rmatch8("\\bCOUNT\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
+usInput = rmatch8.replaceAll(icu::UnicodeString("(SUM$1/MEAN$1)"), status);
+
return OUString(usInput.getTerminatedBuffer());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 11 +++
chart2/qa/extras/data/xlsx/tdf134118.xlsx |binary
oox/source/drawingml/chart/chartspaceconverter.cxx | 11 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 886c2e35fadc7813498da041fc4ea8a8ba2fb358
Author: Balazs Varga
AuthorDate: Wed Aug 12 08:34:42 2020 +0200
Commit: László Németh
CommitDate: Sun Aug 23 13:05:46 2020 +0200
tdf#134118 Chart OOXML import: fix gaps in month based data
Leave gaps instead of zeroes, like MSO does, if data ranges
contain empty cells at month based time resolution.
Change-Id: Ie934b56d9d5cb556bcca41e0e4ddce3ea65f7228
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100573
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 948aaec6700a..4be864c69ce4 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -157,6 +157,7 @@ public:
void testTdf121744();
void testTdf122031();
void testTdf115012();
+void testTdf134118();
void testTdf123206_customLabelText();
void testCustomLabelText();
void testDeletedLegendEntries();
@@ -295,6 +296,7 @@ public:
CPPUNIT_TEST(testTdf121744);
CPPUNIT_TEST(testTdf122031);
CPPUNIT_TEST(testTdf115012);
+CPPUNIT_TEST(testTdf134118);
CPPUNIT_TEST(testTdf123206_customLabelText);
CPPUNIT_TEST(testCustomLabelText);
CPPUNIT_TEST(testDeletedLegendEntries);
@@ -2571,6 +2573,15 @@ void Chart2ExportTest::testTdf115012()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val",
"zero");
}
+void Chart2ExportTest::testTdf134118()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
+xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open
XML");
+CPPUNIT_ASSERT(pXmlDoc);
+// workaround: use leave-gap instead of zero to show the original line
chart
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap");
+}
+
void Chart2ExportTest::testTdf123206_customLabelText()
{
load("/chart2/qa/extras/data/docx/", "tdf123206.docx");
diff --git a/chart2/qa/extras/data/xlsx/tdf134118.xlsx
b/chart2/qa/extras/data/xlsx/tdf134118.xlsx
new file mode 100644
index ..ca86fb8cf118
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf134118.xlsx differ
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 342b6190a67d..1f90c2e092eb 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -206,7 +206,16 @@ void ChartSpaceConverter::convertFromModel( const
Reference< XShapes >& rxExtern
{
using namespace ::com::sun::star::chart::MissingValueTreatment;
sal_Int32 nMissingValues = LEAVE_GAP;
-switch( mrModel.mnDispBlanksAs )
+
+// tdf#134118 leave gap if the time unit is month
+bool bIsMonthBasedTimeUnit = false;
+if( mrModel.mxPlotArea.is() && mrModel.mxPlotArea->maAxes.size() > 0 &&
+mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.has() )
+{
+bIsMonthBasedTimeUnit =
mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.get() == XML_months;
+}
+
+if (!bIsMonthBasedTimeUnit) switch( mrModel.mnDispBlanksAs )
{
case XML_gap: nMissingValues = LEAVE_GAP; break;
case XML_zero: nMissingValues = USE_ZERO; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 46911d142952a4bf01d5b82816ffd8ab3da7710e
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:28:29 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:49:11 2020 +0200
Fix typo in code
Change-Id: I7453c43aad73331c2c7d5a4ca0b36870a18b686a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101207
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index de77fa650ca8..8ca82678a206 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2957,8 +2957,8 @@ SwWW8StyInf *SwWW8ImplReader::GetStyle(sal_uInt16 nColl)
const
// contour and shadow
void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData,
short nLen )
{
-const int nContigiousWestern = 8;
-const int nWestern = nContigiousWestern + 1;
+const int nContiguousWestern = 8;
+const int nWestern = nContiguousWestern + 1;
const int nEastern = 2;
const int nCTL = 2;
const int nIds = nWestern + nEastern + nCTL;
@@ -2981,7 +2981,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const
sal_uInt8* pData, shor
sal_uInt8 nI;
// the attribute number for "double strike-through" breaks rank
if (NS_sprm::CFDStrike::val == nId)
-nI = nContigiousWestern; // The out of sequence western
id
+nI = nContiguousWestern; // The out of sequence western
id
else
{
// The contiguous western ids
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/tests
qadevOOo/tests/java/mod/_forms/GenericModelTest.java |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit cfefaafc1c988e964e06d15f9cdeada6cfbea32d
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:43:02 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:46:15 2020 +0200
Fix typo in code
Change-Id: I9a81d265a99aee896a71c14e3a3ee6ba863b4d5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101199
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index b24a951c30b3..c5ffe1ee55f8 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -133,7 +133,7 @@ public class GenericModelTest extends TestCase {
private static final String m_TestDB = "TestDB";
private DBTools m_dbTools = null;
-private boolean m_ConnectionColsed = false;
+private boolean m_ConnectionClosed = false;
/**
* describes the kind of the shape which should be created.
@@ -217,7 +217,7 @@ public class GenericModelTest extends TestCase {
protected void initialize(TestParameters tParam, PrintWriter log) throws
Exception {
log.println("creating a textdocument");
m_xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
-m_ConnectionColsed = false;
+m_ConnectionClosed = false;
debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE);
m_propertiesToSet.clear();
}
@@ -237,7 +237,7 @@ public class GenericModelTest extends TestCase {
// some interface tests call cleanup to reset the environment. If such
// a test is the last one cleanup was called twice. The second call
// causes then nasty exceptions...
-if (m_ConnectionColsed) return;
+if (m_ConnectionClosed) return;
try {
XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
@@ -329,7 +329,7 @@ public class GenericModelTest extends TestCase {
log.println("ERROR: Error while object test cleaning up: " +
e.toString());
}
-m_ConnectionColsed = true;
+m_ConnectionClosed = true;
}
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7bbe6e5c72178781cb798f7c8497619422372c13
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 23:04:25 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:45:26 2020 +0200
Fix typo in code
Change-Id: I762b2cfa3aafed4f68743c58c0b3eff556efe846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101214
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 67c1a1fb08b7..859641ddb328 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -653,7 +653,7 @@ uno::Any SAL_CALL
AccessibleDocumentViewBase::getExtendedAttributes()
{
::osl::MutexGuard aGuard (maMutex);
-uno::Any anyAtrribute;
+uno::Any anyAttribute;
OUStringBuffer sValue;
if (nullptr != dynamic_cast (mpViewShell))
{
@@ -760,8 +760,8 @@ uno::Any SAL_CALL
AccessibleDocumentViewBase::getExtendedAttributes()
}
}
if (sValue.getLength())
-anyAtrribute <<= sValue.makeStringAndClear();
-return anyAtrribute;
+anyAttribute <<= sValue.makeStringAndClear();
+return anyAttribute;
}
sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/ooxml-export-TODO.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dd3e57b1f803b7835fb9bfaa205cb24a167ad19d Author: Andrea Gelmini AuthorDate: Sat Aug 22 18:44:50 2020 +0200 Commit: Julien Nabet CommitDate: Sun Aug 23 12:40:41 2020 +0200 Fix typo Change-Id: I5a82bf8998294a8e275cb9db000196de68bbb254 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101220 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/source/filter/excel/ooxml-export-TODO.txt b/sc/source/filter/excel/ooxml-export-TODO.txt index c72b956623bb..d995598d2f2c 100644 --- a/sc/source/filter/excel/ooxml-export-TODO.txt +++ b/sc/source/filter/excel/ooxml-export-TODO.txt @@ -75,7 +75,7 @@ Elements: - firstHeader (§3.3.1.39) [ HeaderFooter 89Ch ] - formula (§3.3.1.40) [ CF 1B1h ] - iconSet (§3.3.1.46) [ CF12 87Ah ct=CFMultistate ] -- ignoredError (§3.3.1.47) [ Feat/FeatForumulaErr2/FFErrorCheck 868h ] +- ignoredError (§3.3.1.47) [ Feat/FeatFormulaErr2/FFErrorCheck 868h ] - ignoredErrors (§3.3.1.48) [ Feat 868h ] - legacyDrawing (§3.3.1.51) [ MsoDrawing ECh ] - legacyDrawingHF (§3.3.1.52) [ ??? ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdocirc.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 078fa7c00fc61e698a54898e25bec7e3ca447243
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 19:29:10 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:38:09 2020 +0200
Fix typo in code
Change-Id: I686feb0d40d7a426226ab9fd547b7ad7c9932e01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101209
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 897b557077f0..3b46192aec35 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -230,12 +230,12 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
return bNeed;
}
-basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrCircKind
eCicrleKind, const tools::Rectangle& rRect1, long nStart, long nEnd) const
+basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrCircKind
eCircleKind, const tools::Rectangle& rRect1, long nStart, long nEnd) const
{
const basegfx::B2DRange aRange =
vcl::unotools::b2DRectangleFromRectangle(rRect1);
basegfx::B2DPolygon aCircPolygon;
-if(SdrCircKind::Full == eCicrleKind)
+if(SdrCircKind::Full == eCircleKind)
{
// create full circle. Do not use createPolygonFromEllipse; it's
necessary
// to get the start point to the bottom of the circle to keep
compatible to
@@ -263,8 +263,8 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const
SdrCircKind eCicrleKind,
fStart, fEnd);
// check closing states
-const bool bCloseSegment(SdrCircKind::Arc != eCicrleKind);
-const bool bCloseUsingCenter(SdrCircKind::Section == eCicrleKind);
+const bool bCloseSegment(SdrCircKind::Arc != eCircleKind);
+const bool bCloseUsingCenter(SdrCircKind::Section == eCircleKind);
if(bCloseSegment)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |4 ++--
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b2db71558c9c8ff5227c28f866e2c1657d6d64fb
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 23:05:05 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:37:25 2020 +0200
Fix typo in code
Change-Id: Ib71904ffeffba9c2987fab204f37e088e0947be2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101216
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 324ebe8f8171..12fc841dc6a1 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -37,7 +37,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(
: PanelLayout(pParent,"NumberFormatPropertyPanel",
"modules/scalc/ui/sidebarnumberformat.ui", rxFrame)
, mxLbCategory(m_xBuilder->weld_combo_box("numberformatcombobox"))
, mxTBCategory(m_xBuilder->weld_toolbar("numberformat"))
-, mxCatagoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, *m_xBuilder,
rxFrame))
+, mxCategoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, *m_xBuilder,
rxFrame))
, mxFtDecimals(m_xBuilder->weld_label("decimalplaceslabel"))
, mxEdDecimals(m_xBuilder->weld_spin_button("decimalplaces"))
, mxFtDenominator(m_xBuilder->weld_label("denominatorplaceslabel"))
@@ -64,7 +64,7 @@ NumberFormatPropertyPanel::~NumberFormatPropertyPanel()
void NumberFormatPropertyPanel::dispose()
{
mxLbCategory.reset();
-mxCatagoryDispatch.reset();
+mxCategoryDispatch.reset();
mxTBCategory.reset();
mxFtDecimals.reset();
mxEdDecimals.reset();
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 4eb246dfc7ac..685a02ac23d2 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -67,7 +67,7 @@ private:
//ui controls
std::unique_ptr mxLbCategory;
std::unique_ptr mxTBCategory;
-std::unique_ptr mxCatagoryDispatch;
+std::unique_ptr mxCategoryDispatch;
std::unique_ptr mxFtDecimals;
std::unique_ptr mxEdDecimals;
std::unique_ptr mxFtDenominator;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/i18n/KParseTokens.idl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 93b36370dad34912cc5cd2d2949ae1c0da46be55 Author: Andrea Gelmini AuthorDate: Sat Aug 22 18:41:41 2020 +0200 Commit: Julien Nabet CommitDate: Sun Aug 23 12:36:14 2020 +0200 Fix typo Change-Id: Iae8064759c5f3c705dc12bf93b4398cf0f98fef9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101222 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/offapi/com/sun/star/i18n/KParseTokens.idl b/offapi/com/sun/star/i18n/KParseTokens.idl index bc0f92c42c83..accc425660a0 100644 --- a/offapi/com/sun/star/i18n/KParseTokens.idl +++ b/offapi/com/sun/star/i18n/KParseTokens.idl @@ -136,8 +136,8 @@ published constants KParseTokens const long UNI_OTHER= 0x2000; /** Only valid for nStartCharFlags parameter to -ChararacterClassification::parseAnyToken() and -ChararacterClassification::parsePredefinedToken(), +CharacterClassification::parseAnyToken() and +CharacterClassification::parsePredefinedToken(), ignored on nContCharFlags parameter. Not set in ParseResult. */ const long IGNORE_LEADING_WS= 0x4000; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 79e505e215156cbf3e18a8f80c79ded61d775f4d
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:38:08 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 12:35:22 2020 +0200
Fix typo
Change-Id: I6f4544cb5174970af28fa0451a1f62a51e7bb78e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101221
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 21098ccacdfb..c80c04594786 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -882,13 +882,13 @@ void ORowSetCache::moveWindow()
ORowSetMatrix::iterator aNewEnd (aEnd + nStartPosOffset);
// *m_pMatrix now looks like:
// [0; nOverlapSize) i.e. [begin(); aEnd): data kept
-// [nOverlapSize; nOverlapSize + nStartPosOffet) i.e. [aEnd,
aNewEnd): new data of positions < old m_nStartPos
-// [nOverlapSize + nStartPosOffet; size()) i.e. [aNewEnd,
end()): unused
-// Note that nOverlapSize + nStartPosOffet == m_nEndPos -
m_nStartPos (new values)
+// [nOverlapSize; nOverlapSize + nStartPosOffset) i.e. [aEnd,
aNewEnd): new data of positions < old m_nStartPos
+// [nOverlapSize + nStartPosOffset; size()) i.e. [aNewEnd,
end()): unused
+// Note that nOverlapSize + nStartPosOffset == m_nEndPos -
m_nStartPos (new values)
// When we are finished:
// [0; nStartPosOffset) i.e. [begin(); aEnd): new data of
positions < old m_nStartPos
-// [nStartPosOffset; nOverlapSize + nStartPosOffet) i.e. [aEnd,
aNewEnd): kept
-// [nOverlapSize + nStartPosOffet; size()) i.e. [aNewEnd,
end()): unused
+// [nStartPosOffset; nOverlapSize + nStartPosOffset) i.e. [aEnd,
aNewEnd): kept
+// [nOverlapSize + nStartPosOffset; size()) i.e. [aNewEnd,
end()): unused
if ( bCheck )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpdocdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d35413b97d609c1a14a1adfe6fa2a7cbdb5ade4 Author: Andrea Gelmini AuthorDate: Sat Aug 22 18:40:55 2020 +0200 Commit: Julien Nabet CommitDate: Sun Aug 23 12:34:45 2020 +0200 Fix typo Change-Id: I17407c534f95f20bb16b2d5545b92ae293e761ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101218 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx index 833a17db46d1..55eecfcbb006 100644 --- a/lotuswordpro/source/filter/lwpdocdata.cxx +++ b/lotuswordpro/source/filter/lwpdocdata.cxx @@ -79,7 +79,7 @@ void LwpDocData::Read() m_DocOptions.encrypt1password.Read(m_pObjStrm.get()); //cEncrypt2Password m_DocOptions.encrypt2password.Read(m_pObjStrm.get()); -//cCharecterSet +//cCharacterSet m_DocOptions.characterSet.Read(m_pObjStrm.get()); //cGrammerSet m_DocOptions.grammerSet.Read(m_pObjStrm.get()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/source
include/xmloff/XMLTextMasterPageContext.hxx |8 ++-
include/xmloff/XMLTextMasterStylesContext.hxx |5 --
sc/source/filter/xml/xmlstyli.cxx | 16 ++
sc/source/filter/xml/xmlstyli.hxx | 10 +---
xmloff/source/text/XMLTextMasterPageContext.cxx | 54 +-
xmloff/source/text/XMLTextMasterStylesContext.cxx | 12 ++--
6 files changed, 47 insertions(+), 58 deletions(-)
New commits:
commit fecf3807f0229450617f35b36e14db14c7c17c87
Author: Noel Grandin
AuthorDate: Fri Aug 21 15:52:21 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 23 12:14:28 2020 +0200
use fastparser in XMLTextMasterStylesContext
Change-Id: I2eaae244264ca9ab726d8e69a3e53a76481b5a36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101173
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx
b/include/xmloff/XMLTextMasterPageContext.hxx
index 53091947bf61..ad58d69eb269 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -52,12 +52,14 @@ protected:
public:
-XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
-const OUString& rLName,
-const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList,
+XMLTextMasterPageContext( SvXMLImport& rImport, sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList,
bool bOverwrite );
virtual ~XMLTextMasterPageContext() override;
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& )
override {}
+
virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx
b/include/xmloff/XMLTextMasterStylesContext.hxx
index 45b253759fde..423092f0cf17 100644
--- a/include/xmloff/XMLTextMasterStylesContext.hxx
+++ b/include/xmloff/XMLTextMasterStylesContext.hxx
@@ -28,9 +28,8 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public
SvXMLStylesContext
{
protected:
using SvXMLStylesContext::CreateStyleChildContext;
-virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
) override;
+virtual SvXMLStyleContext *CreateStyleChildContext( sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
virtual SvXMLStyleContext *CreateStyleStyleChildContext( XmlStyleFamily
nFamily,
sal_uInt16 nPrefix,
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index c000fc2ab0fd..d9dd0761e287 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -916,17 +916,15 @@ ScXMLMasterStylesContext::~ScXMLMasterStylesContext()
}
SvXMLStyleContext *ScXMLMasterStylesContext::CreateStyleChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< XAttributeList > & xAttrList )
+sal_Int32 nElement,
+const uno::Reference< XFastAttributeList > & xAttrList )
{
SvXMLStyleContext *pContext(nullptr);
-if( (XML_NAMESPACE_STYLE == nPrefix) &&
-IsXMLToken(rLocalName, XML_MASTER_PAGE) &&
+if( nElement == XML_ELEMENT(STYLE, XML_MASTER_PAGE) &&
InsertStyleFamily( XmlStyleFamily::MASTER_PAGE ) )
pContext = new ScMasterPageContext(
-GetImport(), nPrefix, rLocalName, xAttrList,
+GetImport(), nElement, xAttrList,
!GetImport().GetTextImport()->IsInsertMode() );
// any other style will be ignored here!
@@ -950,10 +948,10 @@ void ScXMLMasterStylesContext::endFastElement(sal_Int32 )
ScMasterPageContext::ScMasterPageContext( SvXMLImport& rImport,
-sal_uInt16 nPrfx, const OUString& rLName,
-const uno::Reference< XAttributeList > & xAttrList,
+sal_Int32 nElement,
+const uno::Reference< XFastAttributeList > & xAttrList,
bool bOverwrite ) :
-XMLTextMasterPageContext( rImport, nPrfx, rLName, xAttrList, bOverwrite ),
+XMLTextMasterPageContext( rImport, nElement, xAttrList, bOverwrite ),
bContainsRightHeader(false),
bContainsRightFooter(false)
{
diff --git a/sc/source/filter/xml/xmlstyli.hxx
b/sc/source/filter/xml/xmlstyli.hxx
index 221ef801a8e9..e9658cc7c614 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -170,9 +170,8 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext
{
protected:
using SvXMLStylesContext::CreateStyleChildContext;
-virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
-
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpbody.cxx |2 +-
xmloff/source/draw/ximpstyl.cxx |2 --
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 448128c8419e3ba6fbf55395a1d8da5b07ba3595
Author: Noel Grandin
AuthorDate: Sat Aug 22 22:43:03 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 23 12:14:49 2020 +0200
remove debugging asserts
accidentally left behind in
commit 7b83a28f1eb7d0687d07cfaaf8cfaaf9a8eea8c1
use fastparser in SdXMLHeaderFooterDeclContext
Change-Id: I53f7733fd186eb5ac8c4d143a9f847721d5ae81d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101192
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 7e7325018cba..ac2015982a19 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -339,7 +339,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
SdXMLBodyContext::crea
break;
}
default:
-assert(false);
+SAL_WARN("xmloff", "unknown element " <<
SvXMLImport::getPrefixAndNameFromToken(nElement));
}
return nullptr;
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 4e638adc1c5b..aafeade525b7 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1527,7 +1527,6 @@
SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport,
else
{
SAL_WARN("xmloff", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
-assert(false);
}
}
}
@@ -1556,7 +1555,6 @@ void
SdXMLHeaderFooterDeclContext::endFastElement(sal_Int32 nToken)
else
{
SAL_WARN("xmloff", "unknown element " <<
SvXMLImport::getPrefixAndNameFromToken(nToken));
-assert(false);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7b92924f8ffb591e70d6898491667ab5fd92e43
Author: Tor Lillqvist
AuthorDate: Tue Aug 18 13:46:44 2020 +0300
Commit: Andras Timar
CommitDate: Sun Aug 23 11:42:09 2020 +0200
Guard against TypeError: null is not an object
Change-Id: I9a7c708bf753891d54ce8da91b2e9aaeb352cd45
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100913
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 895af0561..d4737b021 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -485,7 +485,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (builder.wizard && data.enabled !== 'false') {
$(sectionTitle).click(function(event, data) {
builder.wizard.goLevelDown(contentDiv,
data);
- if (contentNode.onshow)
+ if (contentNode && contentNode.onshow)
contentNode.onshow();
});
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-6.4' - source/es
source/es/cui/messages.po |2 +- source/es/sd/messages.po |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 1f5c353bc78312bdc964271a8d5f3b988607a117 Author: Andras Timar AuthorDate: Thu Aug 20 15:23:58 2020 +0200 Commit: Andras Timar CommitDate: Sun Aug 23 11:37:23 2020 +0200 Spanish translation amendment requested by a customer 'Insertar tabla' Change-Id: I716e45cb7a23248ee3553816b001006a7c18aa2f diff --git a/source/es/cui/messages.po b/source/es/cui/messages.po index acbe9ae97be..e558e7455d3 100644 --- a/source/es/cui/messages.po +++ b/source/es/cui/messages.po @@ -9907,7 +9907,7 @@ msgstr "Cambiar nombre" #: cui/uiconfig/ui/newtabledialog.ui:22 msgctxt "newtabledialog|NewTableDialog" msgid "Insert Table" -msgstr "Insertar una tabla" +msgstr "Insertar tabla" #. CJfAC #: cui/uiconfig/ui/newtabledialog.ui:101 diff --git a/source/es/sd/messages.po b/source/es/sd/messages.po index 347836f9979..f3e29992a04 100644 --- a/source/es/sd/messages.po +++ b/source/es/sd/messages.po @@ -1842,7 +1842,7 @@ msgstr "Restablecer disposición de diapositiva" #: sd/inc/strings.hrc:270 msgctxt "STR_INSERT_TABLE" msgid "Insert Table" -msgstr "Insertar una tabla" +msgstr "Insertar tabla" #. koDfS #: sd/inc/strings.hrc:271 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6989818467cc9409ad3fe6f6fb8ab628e4f3ea1 Author: Andras Timar AuthorDate: Sun Aug 23 11:37:49 2020 +0200 Commit: Gerrit Code Review CommitDate: Sun Aug 23 11:37:49 2020 +0200 Update git submodules * Update translations from branch 'distro/collabora/cp-6.4' to 1f5c353bc78312bdc964271a8d5f3b988607a117 - Spanish translation amendment requested by a customer 'Insertar tabla' Change-Id: I716e45cb7a23248ee3553816b001006a7c18aa2f diff --git a/translations b/translations index 80fd00392cf4..1f5c353bc783 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 80fd00392cf42b43802f213b6d26006b66c51b7d +Subproject commit 1f5c353bc78312bdc964271a8d5f3b988607a117 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/unowriter/unowriter.cxx |2 +-
sw/source/uibase/config/prtopt.cxx |4 ++--
sw/source/uibase/config/usrpref.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e670c7a12d6121795dd70025843ced130dfd8d16
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:57:01 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 11:10:13 2020 +0200
Fix typos
Change-Id: I305ec375c0aed8832290fe872edd050e53262a90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101217
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index 77cf1bf7788b..1322c89a3214 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -882,7 +882,7 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testMultiSelect)
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xSelection->getCount());
css::uno::Reference
xTextRange(xSelection->getByIndex(0),
css::uno::UNO_QUERY_THROW);
-// For #0, result was empty (cursor was put before the last occurence
without selection)
+// For #0, result was empty (cursor was put before the last occurrence
without selection)
CPPUNIT_ASSERT_EQUAL(OUString("abC"), xTextRange->getString());
xTextRange.set(xSelection->getByIndex(1), css::uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(OUString("aBc"), xTextRange->getString());
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index 13831df970f4..68764fab1ad8 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -114,7 +114,7 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
// currently there is just one checkbox for print drawings and print
graphics
// In the UI. (File/Print dialog and Tools/Options/.../Print)
-// And since print graphics is the only available in Writer and WrtierWeb
...
+// And since print graphics is the only available in Writer and
WriterWeb...
m_bPrintDraw = m_bPrintGraphic;
}
@@ -159,7 +159,7 @@ void SwPrintOptions::ImplCommit()
// currently there is just one checkbox for print drawings and print
graphics
// In the UI. (File/Print dialog and Tools/Options/.../Print)
-// And since print graphics is the only available in Writer and WrtierWeb
...
+// And since print graphics is the only available in Writer and
WriterWeb...
m_bPrintDraw = m_bPrintGraphic;
PutProperties(aNames, aValues);
diff --git a/sw/source/uibase/config/usrpref.cxx
b/sw/source/uibase/config/usrpref.cxx
index 22ca1fd44bd2..6d1394daed76 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -172,7 +172,7 @@ void SwContentViewConfig::ImplCommit()
case 19: bVal = rParent.IsUpdateCharts(); break;// "Update/Chart"
case 20: bVal = rParent.IsShowInlineTooltips(); break;//
"Display/ShowInlineTooltips"
case 21: bVal = rParent.IsUseHeaderFooterMenu(); break;//
"Display/UseHeaderFooterMenu"
-case 22: bVal = rParent.IsShowOutlineContentVisibilityButton();
break;// "Display/ShowOutlineContnetVisibilityButton"
+case 22: bVal = rParent.IsShowOutlineContentVisibilityButton();
break;// "Display/ShowOutlineContentVisibilityButton"
}
if (nProp != g_UpdateLinkIndex)
pValues[nProp] <<= bVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com xmloff/source
wizards/com/sun/star/wizards/query/QueryWizard.java |2 +-
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2ddf7c865d78f421417a27f3266188461ee8db0d
Author: Andrea Gelmini
AuthorDate: Sat Aug 22 18:52:32 2020 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 23 11:10:57 2020 +0200
Fix typos
Change-Id: I6e3e5df63adc7acdac7f41adc1988a734580b084
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101219
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 6c6683a6dffb..8f460e55ef07 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -92,7 +92,7 @@ public class QueryWizard extends DatabaseObjectWizard
if (m_DBMetaData.getConnection(m_wizardContext))
{
reslblFields = m_oResource.getResText("RID_QUERY_4");
-reslblFieldHeader = m_oResource.getResText("RID_QUERY_19");
//Fielnames in AliasComponent
+reslblFieldHeader = m_oResource.getResText("RID_QUERY_19");
//Fieldnames in AliasComponent
reslblAliasHeader = m_oResource.getResText("RID_QUERY_20");
//Fieldtitles header in AliasComponent
reslblSelFields = m_oResource.getResText("RID_QUERY_50");
reslblTables = m_oResource.getResText("RID_QUERY_3");
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index ce54fe971d44..4884d0ba5823 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -87,7 +87,7 @@ bool UnoInterfaceToUniqueIdentifierMapper::registerReference(
const OUString& rI
while(nLength--)
{
if( (*p < '0') || (*p > '9') )
-return true; // a custom id, that will never conflict with
genereated id's
+return true; // a custom id, that will never conflict with
generated id's
p++;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
