[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
|3 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
|4 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
|7 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
| 24 ++
4 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit ffef53274b44bfe77128ba400845f4c4ce70893e
Author: Todor Balabanov
AuthorDate: Fri Jun 18 10:46:33 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Sun Jun 20 03:59:07 2021 +0200
It is a good practice single source of random numbers to be used.
Change-Id: If76e247461288a9ed938b4f6cb592c814b8bbe2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117406
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
index b9784c8a2ab3..58250089b02f 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
@@ -35,6 +35,7 @@ package net.adaptivebox.deps;
import net.adaptivebox.deps.behavior.AbsGTBehavior;
import net.adaptivebox.deps.behavior.DEGTBehavior;
import net.adaptivebox.deps.behavior.PSGTBehavior;
+import net.adaptivebox.global.RandomGenerator;
import net.adaptivebox.goodness.IGoodnessCompareEngine;
import net.adaptivebox.knowledge.ILibEngine;
import net.adaptivebox.knowledge.Library;
@@ -91,7 +92,7 @@ public class DEPSAgent implements ILibEngine {
}
private AbsGTBehavior getGTBehavior() {
-if (Math.random() < switchP) {
+if (RandomGenerator.doubleZeroOneRandom() < switchP) {
return deGTBehavior;
} else {
return psGTBehavior;
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index 5dedc8052ec7..df7ff571065d 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -88,7 +88,7 @@ public class DEGTBehavior extends AbsGTBehavior implements
ILibEngine {
/* Handle first part of the trial vector. */
for (int index = 0; index < guaranteeIndex; index++) {
- if (CR <= Math.random()) {
+ if (CR <= RandomGenerator.doubleZeroOneRandom()) {
trailVector[index] = locaclVector[index];
continue;
}
@@ -101,7 +101,7 @@ public class DEGTBehavior extends AbsGTBehavior implements
ILibEngine {
/* Handle second part of the trial vector. */
for (int index = guaranteeIndex + 1; index < DIMENSION; index++) {
- if (CR <= Math.random()) {
+ if (CR <= RandomGenerator.doubleZeroOneRandom()) {
trailVector[index] = locaclVector[index];
continue;
}
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
index dd61355f86fd..3c7523209138 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
@@ -55,6 +55,7 @@
package net.adaptivebox.deps.behavior;
+import net.adaptivebox.global.RandomGenerator;
import net.adaptivebox.goodness.IGoodnessCompareEngine;
import net.adaptivebox.knowledge.Library;
import net.adaptivebox.knowledge.SearchPoint;
@@ -102,14 +103,14 @@ public class PSGTBehavior extends AbsGTBehavior {
int DIMENSION = designSpace.getDimension();
for (int b = 0; b < DIMENSION; b++) {
- if (Math.random() < CL) {
+ if (RandomGenerator.doubleZeroOneRandom() < CL) {
designSpace.mutationAt(trailPointLocation, b);
continue;
}
double deltaxb = weight * (pcurrent_t_location[b] - pold_t_location[b])
-+ c1 * Math.random() * (pbest_t_location[b] -
pcurrent_t_location[b])
-+ c2 * Math.random() * (gbest_t_location[b] -
pcurrent_t_location[b]);
++ c1 * RandomGenerator.doubleZeroOneRandom() *
(pbest_t_location[b] - pcurrent_t_location[b])
++ c2 * RandomGenerator.doubleZeroOneRandom() *
(gbest_t_location[b] - pcurrent_t_location[b]);
// limitation for delta_x
double deltaxbm = 0.5 * designSpace.getMagnitudeIn(b);
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerato
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/oox oox/source
include/oox/helper/graphichelper.hxx |5 ++-
oox/source/helper/graphichelper.cxx | 54 ++-
2 files changed, 26 insertions(+), 33 deletions(-)
New commits:
commit 03a389478c34c06e48f534dcea151cfbd8499187
Author: Noel Grandin
AuthorDate: Fri Jun 18 16:24:11 2021 +0200
Commit: Andras Timar
CommitDate: Sat Jun 19 23:33:25 2021 +0200
fix loading calc files with embedded form macros
GraphicHelper was trying to use the current frame/
window to convert values, but during initial load
there is no current window.
Change-Id: I8a79501df1d2e83a13d3cfb64ae8e66152c60561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117470
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 8fa14ac550ddc43790b65858f18d23f522aff1f2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117426
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/oox/helper/graphichelper.hxx
b/include/oox/helper/graphichelper.hxx
index 50c54175db93..6e6a255d9bd6 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
struct WmfExternal;
@@ -46,6 +47,7 @@ namespace com::sun::star {
namespace graphic { class XGraphicProvider; }
namespace uno { class XComponentContext; }
}
+class OutputDevice;
namespace oox {
@@ -105,6 +107,7 @@ public:
/** Converts the passed size from 1/100 mm to AppFont units. */
css::awt::Size convertHmmToAppFont( const css::awt::Size& rHmm ) const;
+
// Graphics and graphic objects --
/** Imports a graphic from the passed input stream. */
@@ -134,7 +137,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::graphic::XGraphicProvider2 > mxGraphicProvider;
-css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion;
+VclPtr mxDefaultOutputDevice;
css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
::std::map< sal_Int32, ::Color > maSystemPalette; ///< Maps system
colors (XML tokens) to RGB color values.
StorageRef mxStorage; ///< Storage containing
embedded graphics.
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index 82978a76451e..85f19259cc41 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,7 +61,7 @@ sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double
fPixelPerHmm )
} // namespace
-GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
+GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& /*rxTargetFrame*/, const StorageRef& rxStorage ) :
mxContext( rxContext ),
mxStorage( rxStorage )
{
@@ -100,35 +101,15 @@ GraphicHelper::GraphicHelper( const Reference<
XComponentContext >& rxContext, c
maSystemPalette[ XML_windowFrame ] = Color(0x00);
maSystemPalette[ XML_windowText ] = Color(0x00);
-// if no target frame has been passed (e.g. OLE objects), try to fallback
to the active frame
-// TODO: we need some mechanism to keep and pass the parent frame
-Reference< XFrame > xFrame = rxTargetFrame;
-if( !xFrame.is() && mxContext.is() ) try
-{
-Reference< XDesktop2 > xFramesSupp = Desktop::create( mxContext );
-xFrame = xFramesSupp->getActiveFrame();
-}
-catch( Exception& )
-{
-}
-
-// get the metric of the output device
-OSL_ENSURE( xFrame.is(), "GraphicHelper::GraphicHelper - cannot get target
frame" );
-// some default just in case, 100 000 is 1 meter in MM100
-Size aDefault = Application::GetDefaultDevice()->LogicToPixel(Size(10,
10), MapMode(MapUnit::Map100thMM));
+// Note that we cannot try to get DeviceInfo from the current frame here,
+// because there might not be a current frame yet
+mxDefaultOutputDevice = Application::GetDefaultDevice();
+maDeviceInfo = mxDefaultOutputDevice->GetDeviceInfo();
+// 100 000 is 1 meter in MM100.
+// various unit tests rely on these values being exactly this and not the
"true" values
+Size aDefault = mxDefaultOutputDevice->LogicToPixel(Size(10, 10),
MapMode(MapUnit::Map100thMM));
maDeviceInfo.PixelPerMeterX = aDefault.Width();
maDeviceInfo.PixelPerMeterY = aDefault.Height();
-if( xFrame.is() ) try
-{
-Reference< awt::XDevice > xDevice( xFrame->getContainerWindow(),
UNO_QUERY_THROW );
-mxUnitConversion.set( xDevice, UNO_QUERY );
-OSL_ENSURE( mxUnitConversion.is(), "Grap
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/vcl toolkit/source vcl/source
include/vcl/outdev.hxx|8 ++
include/vcl/print.hxx |2 +
include/vcl/window.hxx|2 +
toolkit/source/awt/vclxdevice.cxx | 45 +-
vcl/source/gdi/print.cxx | 15
vcl/source/outdev/outdev.cxx | 32 +++
vcl/source/window/window.cxx |7 +
7 files changed, 68 insertions(+), 43 deletions(-)
New commits:
commit 2dac72b24085ac938784a68e01fbd27773084cc3
Author: Chris Sherlock
AuthorDate: Tue Dec 22 10:54:27 2020 +1100
Commit: Andras Timar
CommitDate: Sat Jun 19 23:32:52 2021 +0200
tdf#74702 - vcl: introduce OutputDevice::GetDeviceInfo()
Change-Id: I02c9cc83fea330ed0ba1539b2682f75d33ba80fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108132
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117502
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1b29dddf532b..ec40d6f46294 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -48,6 +48,7 @@
#include
#include
+#include
#include
#include
@@ -2013,6 +2014,13 @@ public:
const Point& rPt, const Size& rSz,
const GfxLink& rGfxLink, GDIMetaFile*
pSubst = nullptr );
///@}
+
+public:
+virtual css::awt::DeviceInfo GetDeviceInfo() const;
+
+protected:
+css::awt::DeviceInfo GetCommonDeviceInfo(Size const& aDevSize) const;
+
};
#endif // INCLUDED_VCL_OUTDEV_HXX
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 631b2f5b83fe..ed339266256a 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -221,6 +221,8 @@ public:
DrawRect(aBorderRect);
}
+css::awt::DeviceInfo GetDeviceInfo() const override;
+
protected:
virtual voidDrawDeviceMask( const Bitmap& rMask, const
Color& rMaskColor,
const Point& rDestPt, const Size&
rDestSize,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae5886b9b07d..41b35a24063d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1545,6 +1545,8 @@ public:
void SetMnemonicActivateHdl(const Link& rLink);
void SetModalHierarchyHdl(const Link& rLink);
void SetDumpAsPropertyTreeHdl(const Link& rLink);
+
+css::awt::DeviceInfo GetDeviceInfo() const override;
};
}
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index 84e54e630453..ba382248c0fd 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-
#include
#include
@@ -87,47 +85,8 @@ css::awt::DeviceInfo VCLXDevice::getInfo()
css::awt::DeviceInfo aInfo;
-if( mpOutputDevice )
-{
-Size aDevSz;
-OutDevType eDevType = mpOutputDevice->GetOutDevType();
-if ( eDevType == OUTDEV_WINDOW )
-{
-aDevSz =
static_cast(mpOutputDevice.get())->GetSizePixel();
-static_cast(mpOutputDevice.get())->GetBorder(
aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset );
-}
-else if ( eDevType == OUTDEV_PRINTER )
-{
-aDevSz =
static_cast(mpOutputDevice.get())->GetPaperSizePixel();
-Size aOutSz = mpOutputDevice->GetOutputSizePixel();
-Point aOffset =
static_cast(mpOutputDevice.get())->GetPageOffset();
-aInfo.LeftInset = aOffset.X();
-aInfo.TopInset = aOffset.Y();
-aInfo.RightInset = aDevSz.Width() - aOutSz.Width() - aOffset.X();
-aInfo.BottomInset = aDevSz.Height() - aOutSz.Height() -
aOffset.Y();
-}
-else // VirtualDevice
-{
-aDevSz = mpOutputDevice->GetOutputSizePixel();
-aInfo.LeftInset = 0;
-aInfo.TopInset = 0;
-aInfo.RightInset = 0;
-aInfo.BottomInset = 0;
-}
-
-aInfo.Width = aDevSz.Width();
-aInfo.Height = aDevSz.Height();
-
-Size aTmpSz = mpOutputDevice->LogicToPixel( Size( 1000, 1000 ),
MapMode( MapUnit::MapCM ) );
-aInfo.PixelPerMeterX = aTmpSz.Width()/10;
-aInfo.PixelPerMeterY = aTmpSz.Height()/10;
-
-aInfo.BitsPerPixel = mpOutputDevice->GetBitCount();
-
-aInfo.Capabilities = 0;
-if ( mpOutputDevice->GetOutDevType() != OUTDEV_PRINTER )
-aInfo.Capabilities =
css::awt::DeviceCapability::RASTEROPERATIONS|css::awt::DeviceCapability::GETBITS;
-}
+if (mpOutputDevice)
+aInfo = mpOutputDevice->GetDeviceInfo();
return aInfo;
}
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 48338a879ea5..e2dba7e1ff53 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vc
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source
sw/source/uibase/docvw/edtwin.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit f3adb19b4e4f4e26aee50ce1d7cbc7a916253c04
Author: Caolán McNamara
AuthorDate: Fri Jun 18 15:46:20 2021 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 19 22:18:11 2021 +0200
tdf#142852 forward surrounding-text requests to an active drawing editengine
when present.
As we do for related CommandEventId::[StartExtTextInput/EndExtTextInput]
Change-Id: Ie5b57c8a8a1a258efc2be079a2674b1ca620dc9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117421
Tested-by: Jenkins
Tested-by: Justin Luth
Reviewed-by: Justin Luth
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index bb0e735ec66f..b5e8ec1a6099 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6434,8 +6434,12 @@ void SwEditWin::SetUseInputLanguage( bool bNew )
OUString SwEditWin::GetSurroundingText() const
{
-OUString sReturn;
SwWrtShell& rSh = m_rView.GetWrtShell();
+
+if (rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit())
+return
rSh.GetDrawView()->GetTextEditOutlinerView()->GetSurroundingText();
+
+OUString sReturn;
if( rSh.HasSelection() && !rSh.IsMultiSelection() && rSh.IsSelOnePara() )
rSh.GetSelectedText( sReturn, ParaBreakType::ToOnlyCR );
else if( !rSh.HasSelection() )
@@ -6467,6 +6471,10 @@ OUString SwEditWin::GetSurroundingText() const
Selection SwEditWin::GetSurroundingTextSelection() const
{
SwWrtShell& rSh = m_rView.GetWrtShell();
+
+if (rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit())
+return
rSh.GetDrawView()->GetTextEditOutlinerView()->GetSurroundingTextSelection();
+
if( rSh.HasSelection() )
{
OUString sReturn;
@@ -6502,6 +6510,9 @@ bool SwEditWin::DeleteSurroundingText(const Selection&
rSelection)
{
SwWrtShell& rSh = m_rView.GetWrtShell();
+if (rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit())
+return
rSh.GetDrawView()->GetTextEditOutlinerView()->DeleteSurroundingText(rSelection);
+
if (rSh.HasSelection())
return false;
___
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/wrtw8esh.cxx | 16 +++
sw/source/filter/ww8/wrtww8.cxx | 40 +++---
sw/source/filter/ww8/wrtww8.hxx | 14 ++---
3 files changed, 31 insertions(+), 39 deletions(-)
New commits:
commit 4668e7e7a6322cfda854ab07eabd4322c86de980
Author: Noel Grandin
AuthorDate: Sat Jun 19 14:09:06 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 21:24:35 2021 +0200
use more unique_ptr in WW8Export
Change-Id: I4fb6f4d42be350df5c1ccc0c87b779224000325d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117498
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index e65161558edb..29058a3cd691 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -974,9 +974,9 @@ void WW8Export::AppendFlyInFlys(const ww8::Frame&
rFrameFormat,
return ;
PlcDrawObj *pDrwO;
if (TXT_HDFT == m_nTextTyp)
-pDrwO = m_pHFSdrObjs;
+pDrwO = m_pHFSdrObjs.get();
else
-pDrwO = m_pSdrObjs;
+pDrwO = m_pSdrObjs.get();
if (rFrameFormat.IsInline())
{
@@ -2212,18 +2212,18 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
CloseContainer(); // ESCHER_DggContainer
sal_uInt8 i = 2; // for header/footer and the other
-PlcDrawObj *pSdrObjs = rWrt.m_pHFSdrObjs;
-pTextBxs = rWrt.m_pHFTextBxs;
+PlcDrawObj *pSdrObjs = rWrt.m_pHFSdrObjs.get();
+pTextBxs = rWrt.m_pHFTextBxs.get();
// if no header/footer -> skip over
if (!pSdrObjs->size())
{
--i;
-pSdrObjs = rWrt.m_pSdrObjs;
-pTextBxs = rWrt.m_pTextBxs;
+pSdrObjs = rWrt.m_pSdrObjs.get();
+pTextBxs = rWrt.m_pTextBxs.get();
}
-for( ; i--; pSdrObjs = rWrt.m_pSdrObjs, pTextBxs = rWrt.m_pTextBxs )
+for( ; i--; pSdrObjs = rWrt.m_pSdrObjs.get(), pTextBxs =
rWrt.m_pTextBxs.get() )
{
// "dummy char" (or any Count ?) - why? Only Microsoft knows it.
GetStream().WriteChar( i );
@@ -2232,7 +2232,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
EnterGroup();
-sal_uLong nSecondShapeId = pSdrObjs == rWrt.m_pSdrObjs ?
GenerateShapeId() : 0;
+sal_uLong nSecondShapeId = pSdrObjs == rWrt.m_pSdrObjs.get() ?
GenerateShapeId() : 0;
// write now all Writer-/DrawObjects
DrawObjPointerVector aSorted;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index bd6a633bb670..9f2daa129d53 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1657,7 +1657,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( std::size_t nId )
{
if( !m_pRedlAuthors )
{
-m_pRedlAuthors = new WW8_WrtRedlineAuthor;
+m_pRedlAuthors.reset(new WW8_WrtRedlineAuthor);
m_pRedlAuthors->AddName("Unknown");
}
return m_pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
@@ -3500,15 +3500,15 @@ ErrCode WW8Export::ExportDocument_Impl()
pFootnote.reset(new WW8_WrPlcFootnoteEdn( TXT_FTN ));
// Footnotes
pEdn.reset(new WW8_WrPlcFootnoteEdn( TXT_EDN )); //
Endnotes
-m_pAtn = new WW8_WrPlcAnnotations; //
PostIts
+m_pAtn.reset(new WW8_WrPlcAnnotations); //
PostIts
m_pFactoids.reset(new WW8_WrtFactoids); // Smart tags.
-m_pTextBxs = new WW8_WrPlcTextBoxes( TXT_TXTBOX );
-m_pHFTextBxs = new WW8_WrPlcTextBoxes( TXT_HFTXTBOX );
+m_pTextBxs.reset(new WW8_WrPlcTextBoxes( TXT_TXTBOX ));
+m_pHFTextBxs.reset(new WW8_WrPlcTextBoxes( TXT_HFTXTBOX ));
-m_pSdrObjs = new MainTextPlcDrawObj; // Draw-/Fly-Objects for main text
-m_pHFSdrObjs = new HdFtPlcDrawObj;// Draw-/Fly-Objects for
header/footer
+m_pSdrObjs.reset(new MainTextPlcDrawObj); // Draw-/Fly-Objects for main
text
+m_pHFSdrObjs.reset(new HdFtPlcDrawObj);// Draw-/Fly-Objects for
header/footer
-m_pBkmks = new WW8_WrtBookmarks; // Bookmarks
+m_pBkmks.reset(new WW8_WrtBookmarks); // Bookmarks
GetWriter().CreateBookmarkTable();
m_pPapPlc.reset(new WW8_WrPlcPn( *this, PAP, pFib->m_fcMin ));
@@ -3526,7 +3526,7 @@ ErrCode WW8Export::ExportDocument_Impl()
m_pMagicTable.reset(new WW8_WrMagicTable);
m_pGrf.reset(new SwWW8WrGrf( *this ));
-m_pPiece = new WW8_WrPct( pFib->m_fcMin );
+m_pPiece.reset(new WW8_WrPct( pFib->m_fcMin ));
pDop.reset(new WW8Dop);
pDop->fRevMarking = bool( RedlineFlags::On & m_nOrigRedlineFlags );
@@ -3613,16 +3613,16 @@ ErrCode WW8Export::ExportDocument_Impl()
m_pPapPlc.reset();
pSepx.reset();
-delete m_pRedlAuthors;
-delete m_pSdrObjs;
-delete m_pHFSdrObjs;
-delete m_pTextBxs;
-delete m_pHFTextBxs;
-delete
[Libreoffice-commits] core.git: include/tools tools/source
include/tools/stream.hxx |2 +-
tools/source/stream/stream.cxx |9 -
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 5c59e061c6271cfe2f8ec12ba21de50e71bd9ef4
Author: Noel Grandin
AuthorDate: Sat Jun 19 15:45:27 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 21:24:00 2021 +0200
SvMemoryStream::GetSize can be more efficient
Change-Id: I6d60d6549089e049d730c1000ab7ec592924c685
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117499
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index b55a45ff3022..f99b09955368 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -658,7 +658,7 @@ public:
virtual voidResetError() override;
-sal_uInt64 GetSize();
+sal_uInt64 GetSize() { return TellEnd(); }
std::size_t GetEndOfData() const { return nEndOfData; }
const void* GetData() { Flush(); return pBuf; }
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 04ddd2cba111..515f3a1657ab 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1673,15 +1673,6 @@ SvMemoryStream::~SvMemoryStream()
}
}
-sal_uInt64 SvMemoryStream::GetSize()
-{
-Flush();
-sal_uInt64 const nTemp = Tell();
-sal_uInt64 const nLength = Seek( STREAM_SEEK_TO_END );
-Seek( nTemp );
-return nLength;
-}
-
void SvMemoryStream::SetBuffer( void* pNewBuf, std::size_t nCount,
std::size_t nEOF )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx |6 ++
sw/source/core/text/txttab.cxx | 23 +++
2 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit b85491e40ccb83ff78c7c4b2c0d535eafa5d23ed
Author: Justin Luth
AuthorDate: Fri Jun 11 16:19:12 2021 +0200
Commit: Justin Luth
CommitDate: Sat Jun 19 20:13:49 2021 +0200
tdf#142404 DOCX c15: handle remaining TabOverSpacing tabs
The previous commit handled the case where a non-first
LEFT tab was beyond the text area. But the remaining
cases were still being (mis)treated as automatic tabs.
We won't worry about the impact where compatibilityMode
is less than 15/2013+ since Word is absolutely goofy,
and LO doesn't even come close to matching it.
But in compat15 mode, the end result of having a
non-LEFT tab over the margin effecively means that
the text will flow backwards from the right margin,
just as if it was a RIGHT tabstop. So treat all of
the remaining tabs as a right-tab at the end of
the paragraph-area.
Change-Id: I43a38516c0639c56341bdba0213ffb4a7d5cbf3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117340
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 408f0e608da0..5d567543bcec 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -254,6 +254,12 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142404_tabOverSpacingC15, "tdf142404_
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Big tab: full paragraph area used",
737, nLineWidth, 100);
// Pages 2/3 are TabOverMargin - in this particular case tabs should not
go over margin.
+CPPUNIT_ASSERT_EQUAL(OUString("A right tab positioned at"),
parseDump("//page[2]/body/txt[6]/Text[1]", "Portion"));
+sal_Int32 nParaWidth = parseDump("//page[2]/body/txt[6]/infos/prtBounds",
"width").toInt32();
+// the clearest non-first-line visual example is this second tab in the
right-tab paragraph.
+nLineWidth = parseDump("//page[2]/body/txt[6]/LineBreak[4]",
"nWidth").toInt32();
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Full paragraph area used", nLineWidth,
nParaWidth);
+
CPPUNIT_ASSERT_EQUAL(OUString("TabOverflow does what?"),
parseDump("//page[3]/body/txt[2]/Text[1]", "Portion"));
// Not 1 line high (Word 2010 DOCX and ODT), or 4 lines high (prev LO
DOCX),
// but 8 lines high.
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 4039509dd4ae..d3319dea4a7a 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -131,6 +131,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion(
SwTextFormatInfo &rInf, bool bAuto
}
SwTwips nNextPos = 0;
+bool bAbsoluteNextPos = false;
// #i24363# tab stops relative to indent
// nSearchPos: The current position relative to the tabs origin
@@ -149,8 +150,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion(
SwTextFormatInfo &rInf, bool bAuto
const SvxTabStop* pTabStop = m_aLineInf.GetTabStop( nSearchPos,
nMyRight );
if (!nMyRight)
nMyRight = nOldRight;
-if (pTabStop &&
-(pTabStop->GetTabPos() <= nMyRight || pTabStop->GetAdjustment() ==
SvxTabAdjust::Left))
+if (pTabStop)
{
cFill = ' ' != pTabStop->GetFill() ? pTabStop->GetFill() : 0;
cDec = pTabStop->GetDecimal();
@@ -161,6 +161,21 @@ SwTabPortion *SwTextFormatter::NewTabPortion(
SwTextFormatInfo &rInf, bool bAuto
//calculate default tab position of default tabs in negative
indent
nNextPos = ( nSearchPos / nNextPos ) * nNextPos;
}
+else if (pTabStop->GetTabPos() > nMyRight
+ && pTabStop->GetAdjustment() != SvxTabAdjust::Left)
+{
+// A rather special situation. The tabstop found is:
+// 1.) in a document compatible with MS formats
+// 2.) not a left tabstop.
+// 3.) not the first tabstop (in that case nMyRight was
adjusted to match tabPos).
+// 4.) beyond the end of the text area
+// Therefore, they act like right-tabstops at the edge of the
para area.
+// This benefits DOCX 2013+, and doesn't hurt the earlier
formats,
+// since up till now these were just treated as automatic
tabstops.
+eAdj = SvxTabAdjust::Right;
+bAbsoluteNextPos = true;
+nNextPos = rInf.Width();
+}
bAutoTabStop = false;
}
else
@@ -196,7 +211,6 @@ SwTabPortion *SwTextFormatter::NewTabPortion(
SwTextFormatInfo &rInf, bool bAuto
}
cFill = 0;
eAdj = SvxTabAdjust::Left;
-pTabStop =
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumbering.doc |binary
sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumberingB.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx | 20
+++-
sw/source/filter/ww8/ww8par.cxx| 23
+-
4 files changed, 40 insertions(+), 3 deletions(-)
New commits:
commit ce762a7ab170aa1115cfb0dd68f1c50abf5a86f3
Author: Justin Luth
AuthorDate: Tue Apr 20 19:47:09 2021 +0200
Commit: Justin Luth
CommitDate: Sat Jun 19 19:58:35 2021 +0200
tdf#106541 doc import: inherit style numbering from parent
This patch depends on FOLLOWUP patches.
I thought the best way forward is to break
the existing unit tests, and then fix
them with followup patches. That best proves
the validity of each follow-up patch.
This patch is especially needed for Chapter Numbering.
In LO, Chapter Numbering is treated uniquely with its
own special rules that run counter to all other
conventions. So special handling is needed to
import styles that in MS Word would inherit,
but which don't in this special case.
Change-Id: I06b737ad96ff73dbd09bef252d09aa42adf2dc76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114401
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumbering.doc
b/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumbering.doc
new file mode 100644
index ..f56b9d6b6e6a
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumbering.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumberingB.doc
b/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumberingB.doc
new file mode 100644
index ..0ff47ca3e642
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf106541_inheritChapterNumberingB.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 2b87f12974ca..67b4993bc9b1 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -783,13 +783,29 @@ DECLARE_WW8EXPORT_TEST(testTdf106541_cancelOutline,
"tdf106541_cancelOutline.doc
{
// The ability to cancel numbering must not be lost.
uno::Reference xPara(getParagraph(1, "Cancelled by
style"), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
+//TEMPORARY CPPUNIT_ASSERT_EQUAL(OUString(""),
getProperty(xPara, "ListLabelString"));
xPara.set(getParagraph(2, "Cancelled by inherited style"), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
+//TEMPORARY CPPUNIT_ASSERT_EQUAL(OUString(""),
getProperty(xPara, "ListLabelString"));
xPara.set(getParagraph(4, "Cancelled by direct paragraph formatting"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
}
+DECLARE_WW8EXPORT_TEST(testTdf106541_inheritChapterNumbering,
"tdf106541_inheritChapterNumbering.doc")
+{
+// The level and numbering are inherited from Heading 1.
+uno::Reference xPara(getParagraph(3, "Letter A"),
uno::UNO_QUERY);
+//TEMPORARY CPPUNIT_ASSERT_EQUAL(OUString("a."),
getProperty(xPara, "ListLabelString"));
+}
+
+DECLARE_WW8EXPORT_TEST(testTdf106541_inheritChapterNumberingB,
"tdf106541_inheritChapterNumberingB.doc")
+{
+// The level and numbering are inherited from Heading 1.
+uno::Reference xPara(getParagraph(1, "Chapter 1,
level 1"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(2, "Chapter 1, level 2"), uno::UNO_QUERY);
+//TEMPORARY CPPUNIT_ASSERT_EQUAL(OUString("1.1"),
getProperty(xPara, "ListLabelString"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf120394, "tdf120394.doc")
{
CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 93b2027b30bf..ec316678e96b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5914,9 +5914,30 @@ void SwWW8ImplReader::SetOutlineStyles()
// iteration
std::vector aWW8BuiltInHeadingStyles;
{
+sal_uInt16 nStyle = 0;
std::map aWW8ListStyleCounts;
-for (SwWW8StyInf & rSI : m_vColl)
+for (SwWW8StyInf& rSI : m_vColl)
{
+// Copy inherited numbering info since LO drops inheritance after
ChapterNumbering
+// and only applies listLevel via style with the selected
ChapterNumbering LFO.
+bool bReRegister = false;
+if (rSI.m_nBase && rSI.m_nBase < 10 && rSI.m_nBase < m_vColl.size()
+&& m_vColl[rSI.m_nBase].HasWW8OutlineLevel())
+{
+if (rSI.m_nLFOIndex == USHRT_MAX)
+rSI.m_nLFOIndex = m_vColl[rSI.m_nBase].m
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx |4
sw/source/core/text/txttab.cxx |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d7a7ac3581290f9d4820d01d0a64269fc47d00f6
Author: Justin Luth
AuthorDate: Wed Jun 16 15:33:06 2021 +0200
Commit: Justin Luth
CommitDate: Sat Jun 19 19:56:15 2021 +0200
tdf#142404 DOCX c15: fix centering when TabOverSpacing
I didn't notice the need for making the same
exclusion that TabOverMargin made for centering
when 7.2 got the new TabOverSpacing compat flag.
But now I see it is still needed.
Change-Id: Ia8069b5566eaf6dcdac6ff10ee0c60b849c5fa2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117339
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117446
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 5899bd703ccc..5666c3f1b1d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -242,6 +242,10 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf142404_tabOverSpacingC15, "tdf142404_
sal_Int32 nHeight = parseDump("//page[1]/body/txt[2]/infos/bounds",
"height").toInt32();
CPPUNIT_ASSERT_MESSAGE("4 lines high", 1100 < nHeight);
CPPUNIT_ASSERT_MESSAGE("4 lines high", nHeight < 1300);
+
+CPPUNIT_ASSERT_EQUAL(OUString("A centered tab positioned at"),
parseDump("//page[1]/body/txt[3]/Text[1]", "Portion"));
+sal_Int32 nLineWidth = parseDump("//page[1]/body/txt[3]/Text[2]",
"nWidth").toInt32();
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Big tab: full paragraph area used",
737, nLineWidth, 100);
}
DECLARE_OOXMLEXPORT_TEST(testTdf139580, "tdf139580.odt")
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index e12d31c64251..66136b0c9fce 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -499,7 +499,7 @@ bool SwTabPortion::PostFormat( SwTextFormatInfo &rInf )
// centered tabs are problematic:
// We have to detect how much fits into the line.
sal_uInt16 nNewWidth = nPorWidth /2;
-if( !bTabOverMargin && nNewWidth > rInf.Width() - nRight )
+if (!bTabOverMargin && !bTabOverSpacing && nNewWidth > rInf.Width() -
nRight)
nNewWidth = nPorWidth - (rInf.Width() - nRight);
nPorWidth = nNewWidth;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_Exception.xba| 95 +++--
wizards/source/scriptforge/SF_PythonHelper.xba | 14 ++-
wizards/source/scriptforge/SF_Root.xba |7 +
wizards/source/scriptforge/po/ScriptForge.pot |6 -
wizards/source/scriptforge/po/en.po|6 -
5 files changed, 111 insertions(+), 17 deletions(-)
New commits:
commit 8be08b6d1f53136d899a8aac3ccd401eb18990e9
Author: Jean-Pierre Ledure
AuthorDate: Sat Jun 19 17:24:54 2021 +0200
Commit: Jean-Pierre Ledure
CommitDate: Sat Jun 19 18:30:34 2021 +0200
ScriptForge - (SF_Exception) Fix signature in error messages
Basic use ProperCased arguments, Python lowercased ones.
The error messages always displayed the ProperCase notation.
Example:
BEFORE: called both from Basic or Python:
Library : ScriptForge
Service : FileSystem
Method :OpenTextFile
Arguments: FileName, [IOMode=1], [Create=False], [Encoding="UTF-8"]
A serious error has been detected in your code on argument : FileName
The given file could not be found on your system.
FileName = /...
AFTER: called from Basic, as above, and from Python:
Library : ScriptForge
Service : FileSystem
Method :OpenTextFile
Arguments: filename, [iomode=1], [create=False], [encoding="UTF-8"]
A serious error has been detected in your code on argument : filename
The given file could not be found on your system.
filename = /...
Minor user visibility. No need to cherry-pick to 7.2 branch.
Change-Id: I6938c3149fe883ded97051897c19aca23eadcc58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117501
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/SF_Exception.xba
b/wizards/source/scriptforge/SF_Exception.xba
index 9b26466aa818..fd108e14f9ac 100644
--- a/wizards/source/scriptforge/SF_Exception.xba
+++ b/wizards/source/scriptforge/SF_Exception.xba
@@ -716,7 +716,7 @@ Try:
vLocation = Split(_SF_.MainFunction, ".")
If UBound(vLocation) < 2 Then vLocation =
SF_Array.Prepend(vLocation, "ScriptForge")
sLocation = L10N.GetText("VALIDATESOURCE",
vLocation(0), vLocation(1), vLocation(2)) _
- & "\n" &
L10N.GetText("VALIDATEARGS", _SF_.MainFunctionArgs)
+ & "\n" &
L10N.GetText("VALIDATEARGS", _RightCaseArgs(_SF_.MainFunctionArgs))
Else
sLocation = ""
End If
@@ -724,10 +724,12 @@ Try:
With L10N
Select Case UCase(ErrorCode)
Case MISSINGARGERROR' SF_Utils._Validate(Name)
+ pvArgs(0) = _RightCase(pvArgs(0))
sMessage = sLocation _
& "\n" &
"\n" & "\n" & .GetText("VALIDATEERROR",
pvArgs(0)) _
& "\n" &
"\n" & .GetText("VALIDATEMISSING", pvArgs(0))
Case ARGUMENTERROR '
SF_Utils._Validate(Value, Name, Types, Values, Regex, Class)
+ pvArgs(1) = _RightCase(pvArgs(1))
sMessage = sLocation _
& "\n" &
"\n" & "\n" & .GetText("VALIDATEERROR",
pvArgs(1)) _
& "\n" &
"\n" & .GetText("VALIDATIONRULES")
@@ -737,6 +739,7 @@ Try:
If Len(pvArgs(5)) > 0 Then sMessage =
sMessage & "\n" & .GetText("VALIDATECLASS",
pvArgs(1), pvArgs(5))
sMessage = sMessage & "\n" &
"\n" & .GetText("VALIDATEACTUAL", pvArgs(1), pvArgs(0))
Case ARRAYERROR ' SF_Utils._ValidateArray(Value,
Name, Dimensions, Types, NotNull)
+ pvArgs(1) = _RightCase(pvArgs(1))
sMessage = sLocation _
& "\n" &
"\n" & "\n" & .GetText("VALIDATEERROR",
pvArgs(1)) _
& "\n" &
"\n" & .GetText("VALIDATIONRULES") _
@@ -746,6 +749,7 @@ Try:
If pvArgs(4) Then sMessage = sMessage &
"\n" & .GetText("VALIDATENOTNULL", pvArgs(1))
sMessage = sMessage & "\n" &
"\n" & .GetText("VALIDATEACTUAL", pvArgs(1), pvArgs(0))
Case FILEERROR '
SF_Utils._ValidateFile(Value, Name, WildCards)
+ pvArgs(1) = _RightCase(pvArgs(1))
sMessage = sLocation _
& "\n" &
"\n" & "\n" & .GetText("VALIDATEERROR",
pvArgs(1)) _
& "\n" &
"\n" & .GetText("VALIDATIONRULES") _
@@ -782,57 +786,70 @@ Try:
& "\n" &
"\n
[Libreoffice-commits] core.git: extensions/source filter/source sc/qa sc/source sfx2/source sw/source tools/source vcl/source
extensions/source/scanner/sanedlg.cxx|3 +--
filter/source/msfilter/svdfppt.cxx |3 +--
sc/qa/extras/scpdfexport.cxx |3 +--
sc/source/filter/xcl97/XclImpChangeTrack.cxx |3 +--
sfx2/source/doc/oleprops.cxx |3 +--
sw/source/filter/ww8/ww8par4.cxx |6 ++
tools/source/stream/stream.cxx |6 +-
vcl/source/treelist/transfer.cxx |6 +++---
8 files changed, 11 insertions(+), 22 deletions(-)
New commits:
commit 7af0f1514407660a43cde90320bbe00c36c3be28
Author: Noel Grandin
AuthorDate: Sat Jun 19 13:52:40 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 18:13:52 2021 +0200
use more TellEnd()
which has the potential to be more efficient than STREAM_SEEK_TO_END
Change-Id: I64d84632bc4751e07309332c9dff7a02bcd507fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117496
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/extensions/source/scanner/sanedlg.cxx
b/extensions/source/scanner/sanedlg.cxx
index d13ebcc53da9..87c17e56fe78 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -871,8 +871,7 @@ void SaneDlg::AcquirePreview()
else
{
#if OSL_DEBUG_LEVEL > 0
-xTransporter->getStream().Seek( STREAM_SEEK_TO_END );
-SAL_INFO("extensions.scanner", "Previewbitmapstream contains " <<
xTransporter->getStream().Tell() << "bytes");
+SAL_INFO("extensions.scanner", "Previewbitmapstream contains " <<
xTransporter->getStream().TellEnd() << "bytes");
#endif
xTransporter->getStream().Seek( STREAM_SEEK_TO_BEGIN );
mxPreview->SetBitmap(xTransporter->getStream());
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index bcf243b3f920..df873c2bf122 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1318,8 +1318,7 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam& rParam, const O
{
if ( m_bOk )
{
-rStCtrl.Seek( STREAM_SEEK_TO_END );
-nStreamLen = rStCtrl.Tell();
+nStreamLen = rStCtrl.TellEnd();
// try to allocate the UserEditAtom via CurrentUserAtom
sal_uInt32 nCurrentUserEdit = rParam.aCurrentUserAtom.nCurrentUserEdit;
diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx
index b98ee774b7ee..6dfa426fddc0 100644
--- a/sc/qa/extras/scpdfexport.cxx
+++ b/sc/qa/extras/scpdfexport.cxx
@@ -138,8 +138,7 @@ bool ScPDFExportTest::hasTextInPdf(const
std::shared_ptr& pPDFFil
CPPUNIT_ASSERT(pStream);
// get file size
-pStream->Seek(STREAM_SEEK_TO_END);
-const std::size_t nFileSize = pStream->Tell();
+const std::size_t nFileSize = pStream->TellEnd();
if (nFileSize == 0)
return false;
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index e3451aca4001..74b60da2208b 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -52,8 +52,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot&
rRoot, const XclImpStrea
if( !xInStrm.is() )
return;
-xInStrm->Seek( STREAM_SEEK_TO_END );
-sal_uInt64 const nStreamLen = xInStrm->Tell();
+sal_uInt64 const nStreamLen = xInStrm->TellEnd();
if( (xInStrm->GetErrorCode() == ERRCODE_NONE) && (nStreamLen !=
STREAM_SEEK_TO_END) )
{
xInStrm->Seek( STREAM_SEEK_TO_BEGIN );
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index ee1927522e05..6de4aace5c99 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -1018,8 +1018,7 @@ void SfxOleSection::ImplSave( SvStream& rStrm )
SaveProperty( rStrm, *prop.second, nPropPosPos );
// write section size (first field in section header)
-rStrm.Seek( STREAM_SEEK_TO_END );
-sal_uInt32 nSectSize = static_cast< sal_uInt32 >( rStrm.Tell() -
mnStartPos );
+sal_uInt32 nSectSize = static_cast< sal_uInt32 >( rStrm.TellEnd() -
mnStartPos );
rStrm.Seek( mnStartPos );
rStrm.WriteUInt32( nSectSize );
}
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 6c72ed5321eb..e7e559d586a4 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -84,9 +84,8 @@ static bool SwWw8ReadScaling(tools::Long& rX, tools::Long&
rY, tools::SvRefSetEndian( SvStreamEndian::LITTLE );
-pS->Seek( STREAM_SEEK_TO_END );
-OSL_ENSURE( pS->Tell() >= 76, "+OLE-PIC-Stream is shorter than 76 Byte" );
+OSL_ENSURE( pS->TellEnd() >= 76, "+OLE-PIC-Stream is shorter than 76
Byte" );
sal_Int32 nOrgWidth,
nOrgHeight,
@@ -406,9 +405,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
if (bOleOk)
{
sal_uLong nOldPos = m_pDataStream->Tell();
-m
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/helper/graphichelper.hxx |5 ++-
oox/source/helper/graphichelper.cxx | 54 ++-
2 files changed, 26 insertions(+), 33 deletions(-)
New commits:
commit 8fa14ac550ddc43790b65858f18d23f522aff1f2
Author: Noel Grandin
AuthorDate: Fri Jun 18 16:24:11 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 18:08:51 2021 +0200
fix loading calc files with embedded form macros
GraphicHelper was trying to use the current frame/
window to convert values, but during initial load
there is no current window.
Change-Id: I8a79501df1d2e83a13d3cfb64ae8e66152c60561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117470
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/helper/graphichelper.hxx
b/include/oox/helper/graphichelper.hxx
index 50c54175db93..6e6a255d9bd6 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
struct WmfExternal;
@@ -46,6 +47,7 @@ namespace com::sun::star {
namespace graphic { class XGraphicProvider; }
namespace uno { class XComponentContext; }
}
+class OutputDevice;
namespace oox {
@@ -105,6 +107,7 @@ public:
/** Converts the passed size from 1/100 mm to AppFont units. */
css::awt::Size convertHmmToAppFont( const css::awt::Size& rHmm ) const;
+
// Graphics and graphic objects --
/** Imports a graphic from the passed input stream. */
@@ -134,7 +137,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::graphic::XGraphicProvider2 > mxGraphicProvider;
-css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion;
+VclPtr mxDefaultOutputDevice;
css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
::std::map< sal_Int32, ::Color > maSystemPalette; ///< Maps system
colors (XML tokens) to RGB color values.
StorageRef mxStorage; ///< Storage containing
embedded graphics.
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index 52273f6f..7bc3178173e3 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,7 +61,7 @@ sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double
fPixelPerHmm )
} // namespace
-GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
+GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& /*rxTargetFrame*/, const StorageRef& rxStorage ) :
mxContext( rxContext ),
mxStorage( rxStorage )
{
@@ -100,35 +101,15 @@ GraphicHelper::GraphicHelper( const Reference<
XComponentContext >& rxContext, c
maSystemPalette[ XML_windowFrame ] = Color(0x00);
maSystemPalette[ XML_windowText ] = Color(0x00);
-// if no target frame has been passed (e.g. OLE objects), try to fallback
to the active frame
-// TODO: we need some mechanism to keep and pass the parent frame
-Reference< XFrame > xFrame = rxTargetFrame;
-if( !xFrame.is() && mxContext.is() ) try
-{
-Reference< XDesktop2 > xFramesSupp = Desktop::create( mxContext );
-xFrame = xFramesSupp->getActiveFrame();
-}
-catch( Exception& )
-{
-}
-
-// get the metric of the output device
-OSL_ENSURE( xFrame.is(), "GraphicHelper::GraphicHelper - cannot get target
frame" );
-// some default just in case, 100 000 is 1 meter in MM100
-Size aDefault = Application::GetDefaultDevice()->LogicToPixel(Size(10,
10), MapMode(MapUnit::Map100thMM));
+// Note that we cannot try to get DeviceInfo from the current frame here,
+// because there might not be a current frame yet
+mxDefaultOutputDevice = Application::GetDefaultDevice();
+maDeviceInfo = mxDefaultOutputDevice->GetDeviceInfo();
+// 100 000 is 1 meter in MM100.
+// various unit tests rely on these values being exactly this and not the
"true" values
+Size aDefault = mxDefaultOutputDevice->LogicToPixel(Size(10, 10),
MapMode(MapUnit::Map100thMM));
maDeviceInfo.PixelPerMeterX = aDefault.Width();
maDeviceInfo.PixelPerMeterY = aDefault.Height();
-if( xFrame.is() ) try
-{
-Reference< awt::XDevice > xDevice( xFrame->getContainerWindow(),
UNO_QUERY_THROW );
-mxUnitConversion.set( xDevice, UNO_QUERY );
-OSL_ENSURE( mxUnitConversion.is(), "GraphicHelper::GraphicHelper -
cannot get unit converter" );
-maDeviceInfo = xDevice->getInfo();
-}
-catch( Exception& )
-{
-OSL_FAIL( "GraphicHelper::GraphicHelper - cannot get outpu
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 521e3e93047cc3622a19266a3d8b70fdcfe4aef8 Author: Martin Srebotnjak AuthorDate: Sat Jun 19 18:01:01 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 18:01:01 2021 +0200 Update git submodules * Update translations from branch 'libreoffice-7-2' to 3aad43a1496ac07c7907227455ad25915491600f - Update Slovenian translation Change-Id: I9a0b233be4827fcbe8dc80d7bb02765b420cd496 diff --git a/translations b/translations index fb919b1eeaa4..3aad43a1496a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit fb919b1eeaa44af85ca5ae2dd7e0ced1003d36a9 +Subproject commit 3aad43a1496ac07c7907227455ad25915491600f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2' - source/sl
source/sl/cui/messages.po | 176 + source/sl/framework/messages.po |4 source/sl/helpcontent2/source/auxiliary.po| 14 source/sl/helpcontent2/source/text/sbasic/python.po |4 source/sl/helpcontent2/source/text/sbasic/shared.po |4 source/sl/helpcontent2/source/text/sbasic/shared/03.po| 728 ++ source/sl/helpcontent2/source/text/scalc/01.po|4 source/sl/helpcontent2/source/text/sdatabase.po |4 source/sl/helpcontent2/source/text/sdraw/01.po| 144 + source/sl/helpcontent2/source/text/shared/00.po |4 source/sl/helpcontent2/source/text/shared/01.po |4 source/sl/helpcontent2/source/text/shared/guide.po| 10 source/sl/helpcontent2/source/text/shared/optionen.po |4 source/sl/helpcontent2/source/text/simpress/01.po | 10 source/sl/helpcontent2/source/text/swriter/01.po | 220 - source/sl/helpcontent2/source/text/swriter/02.po |4 source/sl/helpcontent2/source/text/swriter/guide.po |4 source/sl/helpcontent2/source/text/swriter/librelogo.po |4 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/sl/sc/messages.po | 113 - source/sl/svtools/messages.po |4 source/sl/svx/messages.po |4 source/sl/sw/messages.po | 1103 -- source/sl/uui/messages.po |4 24 files changed, 1673 insertions(+), 905 deletions(-) New commits: commit 3aad43a1496ac07c7907227455ad25915491600f Author: Martin Srebotnjak AuthorDate: Sat Jun 19 18:00:54 2021 +0200 Commit: Andras Timar CommitDate: Sat Jun 19 18:00:54 2021 +0200 Update Slovenian translation Change-Id: I9a0b233be4827fcbe8dc80d7bb02765b420cd496 diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index d6b3e9f72fc..23153768c08 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 7.2\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2021-06-11 13:43+0200\n" -"PO-Revision-Date: 2021-06-12 08:56+0200\n" +"POT-Creation-Date: 2021-06-18 10:44+0200\n" +"PO-Revision-Date: 2021-06-19 08:50+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -3923,22 +3923,22 @@ msgstr "Razvrsti po" #: cui/uiconfig/ui/additionsdialog.ui:34 msgctxt "menuassignpage|gear_textOnly" msgid "Voting" -msgstr "Glasovanje" +msgstr "ocenah" #: cui/uiconfig/ui/additionsdialog.ui:43 msgctxt "menuassignpage|gear_textOnly" msgid "Downloads" -msgstr "Prenosi" +msgstr "prenosih" #: cui/uiconfig/ui/additionsdialog.ui:52 msgctxt "menuassignpage|gear_textOnly" msgid "Comments" -msgstr "Komentarji" +msgstr "komentarjih" #: cui/uiconfig/ui/additionsdialog.ui:71 msgctxt "menuassignpage|gear_iconAndText" msgid "Detail view" -msgstr "Podrobni pogled" +msgstr "Podroben pogled" #: cui/uiconfig/ui/additionsdialog.ui:82 msgctxt "menuassignpage|gear_iconAndText" @@ -3953,7 +3953,7 @@ msgstr "Dodatki" #: cui/uiconfig/ui/additionsdialog.ui:123 msgctxt "additionsdialog|ProgressLabel" msgid "Progress Label" -msgstr "Pokazatelj napredka" +msgstr "Napredek operacij" #: cui/uiconfig/ui/additionsdialog.ui:126 msgctxt "additionsdialog|ProgressLabel" @@ -3999,7 +3999,7 @@ msgstr "S tem gumbom pokažete več razširitev." #: cui/uiconfig/ui/additionsfragment.ui:68 msgctxt "additionsEntry|votingLabel" msgid "Voting:" -msgstr "Glasovanje:" +msgstr "Ocene:" #: cui/uiconfig/ui/additionsfragment.ui:88 msgctxt "additionsEntry|labelLicense" @@ -4931,152 +4931,252 @@ msgctxt "bulletandposition|DrawPRTLDialog" msgid "Bullets and Numbering" msgstr "Označevanje in oštevilčevanje" -#: cui/uiconfig/ui/bulletandposition.ui:223 +#: cui/uiconfig/ui/bulletandposition.ui:220 msgctxt "bulletandposition|label1" msgid "Level" msgstr "Raven" -#: cui/uiconfig/ui/bulletandposition.ui:266 +#: cui/uiconfig/ui/bulletandposition.ui:263 msgctxt "bulletandposition|label4" msgid "Type:" msgstr "Vrsta:" -#: cui/uiconfig/ui/bulletandposition.ui:290 +#: cui/uiconfig/ui/bulletandposition.ui:279 +msgctxt "bulletandposition|extended_tip|numfmtlb" +msgid "Select the level(s) that you want to modify. To apply the options to all the levels, select “1-10”." +msgstr "Izberite raven oz. ravni, ki jih želite spremeniti. Če želite uporabiti možnosti oštevilčevanja za vse ravni, izberite »1-10«." + +#: cui/uiconfig/ui/bulletandposition.ui:292 msgctxt "bulletandposition|startatft" msgid "Start at:" msgstr "Zač
[Libreoffice-commits] core.git: compilerplugins/clang include/basic include/comphelper include/connectivity include/drawinglayer include/editeng include/filter include/oox include/registry include/sfx
compilerplugins/clang/finalclasses.cxx|4 +- compilerplugins/clang/finalclasses.py |2 - include/basic/basmgr.hxx |4 -- include/basic/sbmeth.hxx |2 - include/basic/sbmod.hxx |2 - include/basic/sbstar.hxx |7 --- include/basic/sbx.hxx |3 - include/comphelper/SelectionMultiplex.hxx |4 +- include/comphelper/accessiblewrapper.hxx |8 +--- include/comphelper/configurationlistener.hxx |5 +- include/comphelper/containermultiplexer.hxx |2 - include/comphelper/propmultiplex.hxx |4 +- include/connectivity/PColumn.hxx |6 +-- include/connectivity/dbcharset.hxx|1 include/connectivity/sqlscan.hxx |2 - include/drawinglayer/primitive2d/Primitive2DContainer.hxx |2 - include/editeng/colritem.hxx |2 - include/editeng/unotext.hxx |4 +- include/filter/msfilter/mstoolbar.hxx |4 +- include/oox/ole/axbinaryreader.hxx| 12 +++--- include/oox/ole/axbinarywriter.hxx|6 +-- include/registry/registry.hxx | 12 +++--- include/sfx2/bindings.hxx |2 - include/sfx2/linkmgr.hxx |2 - include/sfx2/objsh.hxx|1 include/sfx2/sidebar/SidebarController.hxx|2 - include/sfx2/viewfrm.hxx |6 --- include/sfx2/zoomitem.hxx |2 - include/sot/stg.hxx |6 +-- include/sot/storage.hxx |3 - include/svl/itemset.hxx |4 +- include/svtools/brwbox.hxx|4 +- include/svtools/editbrowsebox.hxx | 19 - include/svx/EnhancedCustomShape2d.hxx |2 - include/svx/bmpmask.hxx |2 - include/svx/float3d.hxx |6 +-- include/svx/fmsrcimp.hxx |4 +- include/svx/fmtools.hxx |2 - include/svx/gallerybinaryengine.hxx |2 - include/svx/gallerybinaryengineentry.hxx |2 - include/svx/gallerybinarystoragelocations.hxx |2 - include/svx/galtheme.hxx |2 - include/svx/graphctl.hxx |4 -- include/svx/hlnkitem.hxx |2 - include/svx/imapdlg.hxx |2 - include/svx/nbdtmg.hxx|4 +- include/svx/rubydialog.hxx|2 - include/svx/scene3d.hxx |5 +- include/svx/sdasitm.hxx |2 - include/svx/sdgcpitm.hxx |2 - include/svx/sdggaitm.hxx |2 - include/svx/sdgluitm.hxx |4 +- include/svx/sdgmoitm.hxx |2 - include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx |5 +- include/svx/sdtaditm.hxx |2 - include/svx/sdtaitm.hxx |4 +- include/svx/sdtakitm.hxx |2 - include/svx/sdtfsitm.hxx |2 - include/svx/srchdlg.hxx |2 - include/svx/svdhdl.hxx|4 -- include/svx/svdlayer.hxx |2 - include/svx/svdoedge.hxx |5 +- include/svx/svdograf.hxx |3 - include/svx/svdomeas.hxx |5 -- include/svx/svdpage.hxx |2 - include/svx/svx3ditems.hxx| 22 +-- include/svx/sxcecitm.hxx |8 ++-- include/svx/sxcllitm.hxx |4 +- include/svx/sxctitm.hxx |2 - include/svx/sxekitm.hxx |2 - include/svx/sxelditm.hxx |2 - include/svx/sxenditm.hxx | 12 +++--- include/svx/sxmbritm.hxx
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_PythonHelper.xba | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit e48dd86341fff8a010f514bbcd818468f3a92815 Author: Jean-Pierre Ledure AuthorDate: Sat Jun 19 10:08:46 2021 +0200 Commit: Jean-Pierre Ledure CommitDate: Sat Jun 19 13:58:49 2021 +0200 ScriptForge - (SF_PythonHelper.xba) fix signature of PyInputBox() The last 2 arguments have resp. XPosTwips and YPosTwips as names. The signature in Python is correct. The signature in Basic still used the XPos and YPos names. No visibility towards users. No need to cherry-pick to the 7.2 branch. Change-Id: Id93de702cbcb0f3ae72a1f95247189299cb7cf30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117482 Tested-by: Jean-Pierre Ledure Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/scriptforge/SF_PythonHelper.xba b/wizards/source/scriptforge/SF_PythonHelper.xba index 71cdab87a7cb..931a37adb3c4 100644 --- a/wizards/source/scriptforge/SF_PythonHelper.xba +++ b/wizards/source/scriptforge/SF_PythonHelper.xba @@ -472,17 +472,17 @@ REM Public Function PyInputBox(ByVal Msg As Variant _ , ByVal Title As Variant _ , ByVal Default As Variant _ - , Optional ByVal XPos As Variant _ - , Optional ByVal YPos As Variant _ + , Optional ByVal XPosTwips As Variant _ + , Optional ByVal YPosTwips As Variant _ ) As String ''' Convenient function to replicate InputBox() in Python scripts ''' Args: ''' Msg: String expression displayed as the message in the dialog box ''' Title: String expression displayed in the title bar of the dialog box ''' Default: String expression displayed in the text box as default if no other input is given -''' XPos: Integer expression that specifies the horizontal position of the dialog -''' YPos: Integer expression that specifies the vertical position of the dialog -''' If XPos and YPos are omitted, the dialog is centered on the screen +''' XPosTwips: Integer expression that specifies the horizontal position of the dialog +''' YPosTwips: Integer expression that specifies the vertical position of the dialog +''' If XPosTwips and YPosTwips are omitted, the dialog is centered on the screen ''' The position is specified in twips. ''' Returns: ''' The entered value or "" if the user pressed the Cancel button @@ -491,20 +491,20 @@ Public Function PyInputBox(ByVal Msg As Variant _ Dim sInput As String ' Return value Const cstThisSub = "Basic.InputBox" -Const cstSubArgs = "msg, [title=''], [default=''], [xpos], [ypos]" +Const cstSubArgs = "msg, [title=''], [default=''], [xpostwips], [ypostwips]" If SF_Utils._ErrorHandling() Then On Local Error GoTo Catch sInput = "" Check: - If IsMissing(YPos) Then YPos = 1 + If IsMissing(YPosTwips) Then YPosTwips = 1 SF_Utils._EnterFunction(cstThisSub, cstSubArgs) Try: - If IsMissing(XPos) Then + If IsMissing(XPosTwips) Then sInput = InputBox(Msg, Title, Default) Else - sInput = InputBox(Msg, Title, Default, XPos, YPos) + sInput = InputBox(Msg, Title, Default, XPosTwips, YPosTwips) End If Finally: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 289 commits - accessibility/inc accessibility/source android/source avmedia/source basctl/inc basctl/source basegfx/CppunitTest_bas
Rebased ref, commits from common ancestor:
commit c241f48d6fc70579faa6ff65bb2e100b48f56b7f
Author: Tomaž Vajngerl
AuthorDate: Mon May 10 15:45:13 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 20:52:30 2021 +0900
vcl: add more methods to the PDFium
Change-Id: I74ef0f713125c7069620d1abc9534a636c1707d9
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index c5f1766f60c0..46988cf3c946 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -111,6 +111,13 @@ public:
virtual PDFSegmentType getType() const = 0;
};
+struct PDFImageMetadata
+{
+sal_uInt32 mnWidth;
+sal_uInt32 mnHeight;
+sal_uInt32 mnBitsPerPixel;
+};
+
class VCL_DLLPUBLIC PDFiumPageObject
{
public:
@@ -127,15 +134,20 @@ public:
virtual double getFontSize() = 0;
virtual OUString getFontName() = 0;
virtual PDFTextRenderMode getTextRenderMode() = 0;
+virtual bool hasTransparency() = 0;
virtual Color getFillColor() = 0;
virtual Color getStrokeColor() = 0;
virtual double getStrokeWidth() = 0;
// Path
virtual int getPathSegmentCount() = 0;
virtual std::unique_ptr getPathSegment(int index) = 0;
+virtual bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) = 0;
+// Image
virtual Size getImageSize(PDFiumPage& rPage) = 0;
+virtual PDFImageMetadata getImageMetadata(PDFiumPage& rPage) = 0;
+
virtual std::unique_ptr getImageBitmap() = 0;
-virtual bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) = 0;
+virtual bool getDecodedImageData(std::vector& rData) = 0;
};
class VCL_DLLPUBLIC PDFiumSearchHandle
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index adfa4db4fa45..f0fa8a8c2ce0 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -254,15 +254,19 @@ public:
double getFontSize() override;
OUString getFontName() override;
PDFTextRenderMode getTextRenderMode() override;
+bool hasTransparency() override;
Color getFillColor() override;
Color getStrokeColor() override;
double getStrokeWidth() override;
// Path
int getPathSegmentCount() override;
std::unique_ptr getPathSegment(int index) override;
+bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) override;
+// Image
Size getImageSize(PDFiumPage& rPage) override;
+PDFImageMetadata getImageMetadata(PDFiumPage& rPage) override;
std::unique_ptr getImageBitmap() override;
-bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) override;
+bool getDecodedImageData(std::vector& rData) override;
};
class PDFiumSearchHandleImpl final : public PDFiumSearchHandle
@@ -835,6 +839,8 @@ Color PDFiumPageObjectImpl::getFillColor()
return aColor;
}
+bool PDFiumPageObjectImpl::hasTransparency() { return
FPDFPageObj_HasTransparency(mpPageObject); }
+
Color PDFiumPageObjectImpl::getStrokeColor()
{
Color aColor = COL_TRANSPARENT;
@@ -874,6 +880,28 @@ Size PDFiumPageObjectImpl::getImageSize(PDFiumPage& rPage)
return Size(aMeta.width, aMeta.height);
}
+PDFImageMetadata PDFiumPageObjectImpl::getImageMetadata(PDFiumPage& rPage)
+{
+FPDF_IMAGEOBJ_METADATA aMeta;
+auto& rPageImpl = static_cast(rPage);
+FPDFImageObj_GetImageMetadata(mpPageObject, rPageImpl.getPointer(),
&aMeta);
+return { aMeta.width, aMeta.height, aMeta.bits_per_pixel };
+}
+
+bool PDFiumPageObjectImpl::getDecodedImageData(std::vector& rData)
+{
+unsigned long nLength = FPDFImageObj_GetImageDataDecoded(mpPageObject,
nullptr, 0);
+if (nLength > 0)
+{
+rData.resize(nLength);
+unsigned long nReadLength
+= FPDFImageObj_GetImageDataDecoded(mpPageObject, rData.data(),
nLength);
+if (nReadLength == nLength)
+return true;
+}
+return false;
+}
+
std::unique_ptr PDFiumPageObjectImpl::getImageBitmap()
{
std::unique_ptr pPDFiumBitmap;
commit 4815ab456f3e273cc5b5fa43525743ae8759d19b
Author: Tomaž Vajngerl
AuthorDate: Mon May 3 16:42:22 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 20:52:30 2021 +0900
Add PDF importer to read a PDF into drawinglayer primitives
Change-Id: I8d2e28a39515dfef8a1b4c6b06df095dd3a4eaec
diff --git a/Repository.mk b/Repository.mk
index 2e49a7a6c8be..80bfd6b1bbcd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -400,6 +400,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
passwordcontainer \
pcr \
pdffilter \
+ pdfimporter \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
sax \
sb \
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 9ed0e796fb01..947b135db268 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -156,
[Libreoffice-commits] core.git: Branch 'feature/themesupport2' - 9 commits - editeng/source include/editeng offapi/com svx/sdi svx/source sw/qa sw/source writerfilter/source
Rebased ref, commits from common ancestor:
commit 18da302474cc58314649a3bc6700651ed2d44c15
Author: Jan Holesovsky
AuthorDate: Fri Apr 2 00:21:34 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Jun 17 13:15:19 2021 +0900
Unit test (with the content disabled so far) for the theming.
Change-Id: Ie9e003df38e1bc766fb5323936138d3e0e664321
diff --git a/sw/qa/extras/ooxmlexport/data/themeOrange.docx
b/sw/qa/extras/ooxmlexport/data/themeOrange.docx
new file mode 100644
index ..e350c2676d41
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/themeOrange.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index b550e62ef6a2..7af07caa58d8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -518,6 +518,12 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(Test_ShadowDirection,
"tdf142361ShadowDirect
"rotWithShape", "0");
}
+DECLARE_OOXMLEXPORT_TEST(testThemeOrange, "themeOrange.docx")
+{
+// Assert that the theme color of the 1st paragraph is "accent1"
+//CPPUNIT_ASSERT_EQUAL(getProperty(getParagraph(1),
"CharColorTheme"), static_cast(4));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit afcbc832cae0cd825e5c69748f8a7df2516bb689
Author: Tomaž Vajngerl
AuthorDate: Thu Sep 24 12:32:14 2015 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Jun 17 13:15:19 2021 +0900
Improve preview of theme color sets - add color set name
Change-Id: I1f7b3668ba9dfbab1da283741e99754de2d6be47
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx
b/sw/source/uibase/sidebar/ThemePanel.cxx
index 09a7665950c9..d41db8ffd659 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -371,17 +372,39 @@ BitmapEx GenerateColorPreview(const svx::ColorSet&
rColorSet)
{
ScopedVclPtrInstance
pVirtualDev(*Application::GetDefaultDevice());
float fScaleFactor = pVirtualDev->GetDPIScaleFactor();
-tools::Long BORDER = 2 * fScaleFactor;
-tools::Long SIZE = 12 * fScaleFactor;
+long BORDER = 3 * fScaleFactor;
+long SIZE = 14 * fScaleFactor;
+long LABEL_HEIGHT = 16 * fScaleFactor;
+long LABEL_TEXT_HEIGHT = 14 * fScaleFactor;
-Size aSize(BORDER * 7 + SIZE * 6, BORDER * 3 + SIZE * 2);
+Size aSize(BORDER * 7 + SIZE * 6 + BORDER * 2, BORDER * 3 + SIZE * 2 +
LABEL_HEIGHT);
pVirtualDev->SetOutputSizePixel(aSize);
+
pVirtualDev->SetBackground(Wallpaper(Application::GetSettings().GetStyleSettings().GetFaceColor()));
+pVirtualDev->Erase();
tools::Long x = BORDER;
-tools::Long y1 = BORDER;
+tools::Long y1 = BORDER + LABEL_HEIGHT;
tools::Long y2 = y1 + SIZE + BORDER;
pVirtualDev->SetLineColor(COL_LIGHTGRAY);
+pVirtualDev->SetFillColor(COL_LIGHTGRAY);
+tools::Rectangle aNameRect(Point(0, 0), Size(aSize.Width(), LABEL_HEIGHT));
+pVirtualDev->DrawRect(aNameRect);
+
+vcl::Font aFont;
+OUString aName = rColorSet.getName();
+aFont.SetFontHeight(LABEL_TEXT_HEIGHT);
+pVirtualDev->SetFont(aFont);
+
+Size aTextSize(pVirtualDev->GetTextWidth(aName),
pVirtualDev->GetTextHeight());
+
+Point aPoint((aNameRect.GetWidth() / 2.0) - (aTextSize.Width() / 2.0),
+ (aNameRect.GetHeight() / 2.0) - (aTextSize.Height() / 2.0));
+
+pVirtualDev->DrawText(aPoint, aName);
+
+pVirtualDev->SetLineColor(COL_LIGHTGRAY);
+pVirtualDev->SetFillColor();
for (sal_uInt32 i = 0; i < 12; i += 2)
{
@@ -392,6 +415,8 @@ BitmapEx GenerateColorPreview(const svx::ColorSet&
rColorSet)
pVirtualDev->DrawRect(tools::Rectangle(x, y2, x + SIZE, y2 + SIZE));
x += SIZE + BORDER;
+if (i == 2 || i == 8)
+x += BORDER;
}
return pVirtualDev->GetBitmapEx(Point(), aSize);
@@ -419,6 +444,7 @@ ThemePanel::ThemePanel(weld::Widget* pParent)
{
mxValueSetColors->SetColCount(2);
mxValueSetColors->SetLineCount(3);
+
mxValueSetColors->SetColor(Application::GetSettings().GetStyleSettings().GetFaceColor());
mxApplyButton->connect_clicked(LINK(this, ThemePanel, ClickHdl));
mxListBoxFonts->connect_row_activated(LINK(this, ThemePanel,
DoubleClickHdl));
commit bc94559bc118da7957799f36cf721cc2e7335eb7
Author: Tomaž Vajngerl
AuthorDate: Thu Sep 24 12:30:10 2015 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Jun 17 13:15:19 2021 +0900
StylePresets: set bacground color for ValueSet
Change-Id: Ifbaab139235dbe2fdcebf278bce2c91c2b744aa6
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 79b1b93ed34c..981f26b3e839 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -13,8 +13,9 @@
#i
[Libreoffice-commits] core.git: sfx2/classification sfx2/Package_classification.mk
sfx2/Package_classification.mk|1 sfx2/classification/example_zh-CN.xml | 89 ++ 2 files changed, 90 insertions(+) New commits: commit 5d4b54a7e1b78598501ad86c855d662652be7c8e Author: Kevin Suo AuthorDate: Wed Jun 16 15:55:57 2021 +0800 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:55:26 2021 +0200 Update of TSCP example file for Simplified Chinese (zh-CN) See l10n discussion in: https://listarchives.libreoffice.org/global/l10n/2021/msg00193.html Change-Id: I8ced7f4128b6e633d35770759fa4b82e03356084 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117285 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk index 71684f4b1800..c76e07d17fd0 100644 --- a/sfx2/Package_classification.mk +++ b/sfx2/Package_classification.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/clas classification/example_nl-NL.xml \ classification/example_pt-BR.xml \ classification/example_sl-SI.xml \ + classification/example_zh-CN.xml \ )) # vim: set noet sw=4 ts=4: diff --git a/sfx2/classification/example_zh-CN.xml b/sfx2/classification/example_zh-CN.xml new file mode 100644 index ..43acce556ca1 --- /dev/null +++ b/sfx2/classification/example_zh-CN.xml @@ -0,0 +1,89 @@ + + + +TSCP 示例策略授权 + +TSCP 示例策略 + +urn:example:tscp:1 + + + + + + +UK-Cabinet +0 + + + + + + +Document: Header + +保密等级：一般性商务 + + + +UK-Cabinet +1 + + + + + + +Document: Header + +保密等级：保密 + + +Document: Footer + +此处的内容被标记为“保密”。未经许可，请勿对外披露。 + + +Document: Watermark + +保密 + + + +UK-Cabinet +2 + + + + + + +Document: Header + +保密等级：内部专用 + + +Document: Footer + +此处的内容被标记为“内部专用”。未经许可，请勿对外披露。 + + +Document: Watermark + +内部专用 + + + +UK-Cabinet +3 + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99f86f684668e58288a309ea4c19194a45ea7f8f Author: Johnny_M AuthorDate: Sat Jun 19 12:51:01 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:51:01 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6d1742d64d55f6c17d534736d2a3a246a8cb586b - tdf#132643 Translate German section IDs Change-Id: Ib0b47a24b5a00817c362a00c2d012e2f016c48a9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117494 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a266b7f4792c..6d1742d64d55 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a266b7f4792c4e9d1395a42dd21de65a7da126ef +Subproject commit 6d1742d64d55f6c17d534736d2a3a246a8cb586b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060110.xhp |4 ++-- source/text/shared/00/0005.xhp |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 6d1742d64d55f6c17d534736d2a3a246a8cb586b Author: Johnny_M AuthorDate: Sat Jun 19 12:19:16 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:51:01 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ib0b47a24b5a00817c362a00c2d012e2f016c48a9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117494 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp index 274dc2d6d..892c0d6c1 100644 --- a/source/text/scalc/01/04060110.xhp +++ b/source/text/scalc/01/04060110.xhp @@ -104,7 +104,7 @@ BASE -Converts a positive integer to a specified base into a text from the numbering system. The digits 0-9 and the letters A-Z are used. +Converts a positive integer to a specified base into a text from the numbering system. The digits 0-9 and the letters A-Z are used. BASE(Number; Radix [; MinimumLength]) @@ -211,7 +211,7 @@ DECIMAL -Converts text with characters from a number system to a positive integer in the base radix given. The radix must be in the range 2 to 36. Spaces and tabs are ignored. The Text field is not case-sensitive. +Converts text with characters from a number system to a positive integer in the base radix given. The radix must be in the range 2 to 36. Spaces and tabs are ignored. The Text field is not case-sensitive. If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, is disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the number system generate an error. diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index 90c9d250c..6e10b8d0f 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -168,7 +168,7 @@ Use Edit - Links to External Files to see which files are inserted as links. The links can be removed if required. This will break the link and insert the object directly. - + Number System A number system is determined by the number of characters available for representing numbers. The decimal system, for instance is based on the ten numbers (0..9), the binary system is based on the two numbers 0 and 1, the hexadecimal system is based on 16 characters (0...9 and A...F). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cc85b8dd0a5c4ebf66260c109263aed88e688960 Author: Johnny_M AuthorDate: Sat Jun 19 12:50:09 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:50:09 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to a266b7f4792c4e9d1395a42dd21de65a7da126ef - tdf#132643 Translate German section IDs Change-Id: I9e7c85119e976ca50c0eba0222da7b59decaf95b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117493 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2c1e086cb2c4..a266b7f4792c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2c1e086cb2c4826b6c467aa47764558252b0f201 +Subproject commit a266b7f4792c4e9d1395a42dd21de65a7da126ef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0005.xhp |2 +- source/text/simpress/01/0211.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a266b7f4792c4e9d1395a42dd21de65a7da126ef Author: Johnny_M AuthorDate: Sat Jun 19 12:14:52 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:50:09 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I9e7c85119e976ca50c0eba0222da7b59decaf95b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117493 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index da548e025..90c9d250c 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -157,7 +157,7 @@ The kerning tables contain information on which pairs of letters require more spacing. These tables are generally a component of a font. - + links; definition diff --git a/source/text/simpress/01/0211.xhp b/source/text/simpress/01/0211.xhp index ffd1db91a..48e2c9927 100644 --- a/source/text/simpress/01/0211.xhp +++ b/source/text/simpress/01/0211.xhp @@ -154,7 +154,7 @@ Insert as hyperlink Inserts slides as a hyperlink (URL) into the active slide. Insert as link -Inserts slides as a link into the active slide. +Inserts slides as a link into the active slide. Insert as copy Inserts a copy of a slide or named object into the active slide. Show Shapes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfa8ead3a6fdd705708391b9ad4e815ddf4a8c84 Author: Johnny_M AuthorDate: Sat Jun 19 12:49:34 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:49:34 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 2c1e086cb2c4826b6c467aa47764558252b0f201 - tdf#132643 Translate German section IDs Change-Id: Ifc33de45cbafddc888b6b110faca31ed4bb4973f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117492 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6766947a3c63..2c1e086cb2c4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6766947a3c6364d28f6869d33e5d64575572591c +Subproject commit 2c1e086cb2c4826b6c467aa47764558252b0f201 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0005.xhp |2 +- source/text/swriter/01/05130004.xhp |2 +- source/text/swriter/01/0514.xhp |2 +- source/text/swriter/main0213.xhp|2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 2c1e086cb2c4826b6c467aa47764558252b0f201 Author: Johnny_M AuthorDate: Sat Jun 19 12:12:17 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:49:34 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ifc33de45cbafddc888b6b110faca31ed4bb4973f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117492 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index 8e8efe851..da548e025 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -113,7 +113,7 @@ - + formatting; definition Formatting diff --git a/source/text/swriter/01/05130004.xhp b/source/text/swriter/01/05130004.xhp index 444a50db4..16ae38f4e 100644 --- a/source/text/swriter/01/05130004.xhp +++ b/source/text/swriter/01/05130004.xhp @@ -34,7 +34,7 @@ When a List Style is created, a name is assigned to the style. The list style can be applied to paragraphs or assigned to a paragraph style in the Apply List Style section of the Outline & List tab. -Ordered lists and unordered lists created in the Bullets and Numbering dialog or with the Toggle Ordered List and Toggle Unordered List icons of the Formatting bar use direct formatting. They are not list styles. +Ordered lists and unordered lists created in the Bullets and Numbering dialog or with the Toggle Ordered List and Toggle Unordered List icons of the Formatting bar use direct formatting. They are not list styles. diff --git a/source/text/swriter/01/0514.xhp b/source/text/swriter/01/0514.xhp index 6c23af049..8b3f6173c 100644 --- a/source/text/swriter/01/0514.xhp +++ b/source/text/swriter/01/0514.xhp @@ -60,7 +60,7 @@ Paragraph Styles - Displays formatting styles for paragraphs. Use paragraph styles to apply the same formatting, such as font, numbering, and layout to the paragraphs in your document. + Displays formatting styles for paragraphs. Use paragraph styles to apply the same formatting, such as font, numbering, and layout to the paragraphs in your document. diff --git a/source/text/swriter/main0213.xhp b/source/text/swriter/main0213.xhp index cbb45a18e..540487ce8 100644 --- a/source/text/swriter/main0213.xhp +++ b/source/text/swriter/main0213.xhp @@ -36,7 +36,7 @@ Rulers Rulers display the dimensions of the page, and the position of tabs, indents, borders and columns. You can modify all of these on the rulers using the mouse. - By double-clicking on the ruler, you can open the Paragraph dialog and assign direct paragraph formatting for the current paragraph or all selected paragraphs. + By double-clicking on the ruler, you can open the Paragraph dialog and assign direct paragraph formatting for the current paragraph or all selected paragraphs. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 067733420616368c94ee0a648d766ccd33f8d8d8 Author: Johnny_M AuthorDate: Sat Jun 19 12:48:44 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:48:44 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6766947a3c6364d28f6869d33e5d64575572591c - tdf#132643 Translate German section IDs Change-Id: I334f06af676139fbee080dd069d06b42405e127b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117491 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8357e8f9d823..6766947a3c63 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8357e8f9d823baeb287b333e711aa184c4a794dc +Subproject commit 6766947a3c6364d28f6869d33e5d64575572591c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0211.xhp|2 +- source/text/scalc/01/0408.xhp|2 +- source/text/scalc/01/0510.xhp|2 +- source/text/shared/00/0005.xhp |4 ++-- source/text/shared/00/0100.xhp |2 +- source/text/simpress/01/0211.xhp |2 +- source/text/swriter/01/0211.xhp |2 +- source/text/swriter/01/0514.xhp |2 +- 8 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6766947a3c6364d28f6869d33e5d64575572591c Author: Johnny_M AuthorDate: Sat Jun 19 12:09:24 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:48:44 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I334f06af676139fbee080dd069d06b42405e127b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117491 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0211.xhp b/source/text/scalc/01/0211.xhp index fa84b1a03..10775b432 100644 --- a/source/text/scalc/01/0211.xhp +++ b/source/text/scalc/01/0211.xhp @@ -36,7 +36,7 @@ Navigator -Activates and deactivates the Navigator. The Navigator is a dockable window. +Activates and deactivates the Navigator. The Navigator is a dockable window. diff --git a/source/text/scalc/01/0408.xhp b/source/text/scalc/01/0408.xhp index a02175863..13f941cf9 100644 --- a/source/text/scalc/01/0408.xhp +++ b/source/text/scalc/01/0408.xhp @@ -42,7 +42,7 @@ -The Function List window is a resizable dockable window. Use it to quickly enter functions in the spreadsheet. By double-clicking an entry in the functions list, the respective function is directly inserted with all parameters. +The Function List window is a resizable dockable window. Use it to quickly enter functions in the spreadsheet. By double-clicking an entry in the functions list, the respective function is directly inserted with all parameters. Category List diff --git a/source/text/scalc/01/0510.xhp b/source/text/scalc/01/0510.xhp index 0a2afb20e..c99bafcbe 100644 --- a/source/text/scalc/01/0510.xhp +++ b/source/text/scalc/01/0510.xhp @@ -41,7 +41,7 @@ Styles Use the Styles deck of the Sidebar to assign styles to cells and pages. You can apply, update, and modify existing styles or create new styles. -The Styles dockable window can remain open while editing the document. +The Styles dockable window can remain open while editing the document. diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index cb417b486..8e8efe851 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -88,7 +88,7 @@ When you do not use styles, and apply formatting attributes to parts of text directly, this is called Direct formatting (also called manual formatting). The formatting is applied only to the selected area of the document. If the document has several paragraphs, frames, or any other object, you apply direct formatting on each object. Direct formatting is available with the Format menu and with the Formatting toolbar. A direct formatting attribute applied on a object overrides the corresponding attribute of the style applied to the object. - + windows; docking definition docking; definition @@ -99,7 +99,7 @@ - + Docking (AutoHide) On any window edge where another window is docked you will see a button which allows you to show or hide the window.UFI: fix button removed, see spec "Window Splitter" diff --git a/source/text/shared/00/0100.xhp b/source/text/shared/00/0100.xhp index 00bbb91c3..510f1270e 100644 --- a/source/text/shared/00/0100.xhp +++ b/source/text/shared/00/0100.xhp @@ -31,7 +31,7 @@ Showing and Hiding Docked Windows -Every docked window has an icon to control the display properties of the window. +Every docked window has an icon to control the display properties of the window. To show or hide a docked window, click the icon. diff --git a/source/text/simpress/01/0211.xhp b/source/text/simpress/01/0211.xhp index fba514458..ffd1db91a 100644 --- a/source/text/simpress/01/0211.xhp +++ b/source/text/simpress/01/0211.xhp @@ -39,7 +39,7 @@ Navigator Opens the Navigator, where you can quickly jump to other slides or move between open files. -You can dock the Navigator to the edge of your workspace. +You can dock the Navigator to the edge of your workspace. diff --git a/source/text/swriter/01/0211.xhp b/source/text/swriter/01/0211.xhp index 6ae95c7b8..0cc884faf 100644 --- a/source/text/swriter/01/0211.xhp +++ b/source/text/swriter/01/0211.xhp @@ -33,7 +33,7 @@ Navigator -Shows or hides the Navigator window, where you can quickly jump to different parts of your document. Navigator is also available as a deck of the Sidebar. You can also use the Navigator to insert elements from the current document or oth
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d52d6dd8cd9df456a1ff29ba929a08b39728324 Author: Johnny_M AuthorDate: Sat Jun 19 12:46:40 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:46:40 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 8357e8f9d823baeb287b333e711aa184c4a794dc - tdf#132643 Translate German section IDs Change-Id: Ic9dc645c15d57e99a8eb737b89631f570124eefb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117490 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 664d9f3313c8..8357e8f9d823 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 664d9f3313c80b50b33a2e4b40d8ddc117156e99 +Subproject commit 8357e8f9d823baeb287b333e711aa184c4a794dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0005.xhp |2 +- source/text/shared/optionen/01070100.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8357e8f9d823baeb287b333e711aa184c4a794dc Author: Johnny_M AuthorDate: Sat Jun 19 12:02:23 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:46:40 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ic9dc645c15d57e99a8eb737b89631f570124eefb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117490 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index 35ecd1373..cb417b486 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -46,7 +46,7 @@ In HTML pages, only characters from the 7 Bit ASCII character set should appear. Other characters, such as German umlauts, are distinguished by way of a separate code. You can input extended ASCII code characters: the $[officename] export filter performs the necessary conversion. - + Bézier Object Developed by the French mathematician Pierre Bézier, a Bézier curve is a mathematically defined curve used in two-dimensional graphic applications. The curve is defined by four points: the initial position and the terminating position, and two separate middle points. Bézier objects can be modified by moving these points with the mouse. diff --git a/source/text/shared/optionen/01070100.xhp b/source/text/shared/optionen/01070100.xhp index 571b82cee..b20196029 100644 --- a/source/text/shared/optionen/01070100.xhp +++ b/source/text/shared/optionen/01070100.xhp @@ -51,7 +51,7 @@ icon icon with the same name in the Options bar if a presentation or a drawing document is opened. All control points in Bézier editor -Displays the control points of all Bézier points if you have previously selected a Bézier curve. If the All control points in Bézier editor option is not marked, only the control points of the selected Bézier points will be visible. +Displays the control points of all Bézier points if you have previously selected a Bézier curve. If the All control points in Bézier editor option is not marked, only the control points of the selected Bézier points will be visible. Contour of each individual object %PRODUCTNAME displays the contour line of each individual object when moving this object. The Contour of each individual object option enables you to see if single objects conflict with other objects in the target position. If you do not mark the Contour of each individual object option, %PRODUCTNAME only displays a square contour that includes all selected objects. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8642530da07ce9624f6d082dbedfcad1a3722dc6 Author: Johnny_M AuthorDate: Sat Jun 19 12:46:01 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:46:01 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 664d9f3313c80b50b33a2e4b40d8ddc117156e99 - tdf#132643 Translate German section IDs Change-Id: I98bb4c457b8436e76f2acb17dceb9b3906c37e9e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117489 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 10cb0bf55cac..664d9f3313c8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10cb0bf55cacce740d62a5c6786b1e3b11f4f865 +Subproject commit 664d9f3313c80b50b33a2e4b40d8ddc117156e99 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0002.xhp |2 +- source/text/shared/00/0005.xhp |2 +- source/text/shared/main0500.xhp|4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 664d9f3313c80b50b33a2e4b40d8ddc117156e99 Author: Johnny_M AuthorDate: Sat Jun 19 11:59:53 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:46:01 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I98bb4c457b8436e76f2acb17dceb9b3906c37e9e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117489 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0002.xhp b/source/text/shared/00/0002.xhp index c1d0cc3fa..9c0f7c275 100644 --- a/source/text/shared/00/0002.xhp +++ b/source/text/shared/00/0002.xhp @@ -27,7 +27,7 @@ - + Internet glossary common terms;Internet glossary diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index a587fe331..35ecd1373 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -25,7 +25,7 @@ - + common terms;glossaries glossaries;common terms terminology;general glossary diff --git a/source/text/shared/main0500.xhp b/source/text/shared/main0500.xhp index dc6daf593..f2f7c9488 100644 --- a/source/text/shared/main0500.xhp +++ b/source/text/shared/main0500.xhp @@ -31,7 +31,7 @@ Glossaries This section provides a general glossary of technical terms used in $[officename], along with a list of Internet terms. - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c94d3a5b2110abd1ff13b9f19f3c56c0e3260b5 Author: Johnny_M AuthorDate: Sat Jun 19 12:45:21 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:45:21 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 10cb0bf55cacce740d62a5c6786b1e3b11f4f865 - tdf#132643 Translate German section IDs Change-Id: Ifd14ec7f7efc1dcacd5f8c266f33823521fcb7c6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117488 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6c9762d21f1e..10cb0bf55cac 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6c9762d21f1e509da34ad98cd02d8d541ce9ef9b +Subproject commit 10cb0bf55cacce740d62a5c6786b1e3b11f4f865 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdatabase/0501.xhp |2 +- source/text/shared/00/0010.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 10cb0bf55cacce740d62a5c6786b1e3b11f4f865 Author: Johnny_M AuthorDate: Sat Jun 19 11:50:11 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:45:21 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ifd14ec7f7efc1dcacd5f8c266f33823521fcb7c6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117488 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdatabase/0501.xhp b/source/text/sdatabase/0501.xhp index 130e25358..491c98ff2 100644 --- a/source/text/sdatabase/0501.xhp +++ b/source/text/sdatabase/0501.xhp @@ -39,6 +39,6 @@ If a table is open, there are several functions available to edit the data. - + diff --git a/source/text/shared/00/0010.xhp b/source/text/shared/00/0010.xhp index 6792ff897..a4ae9ee79 100644 --- a/source/text/shared/00/0010.xhp +++ b/source/text/shared/00/0010.xhp @@ -75,7 +75,7 @@ Preview The element selected is displayed in the Gallery at maximum size. Double-click the preview to switch back to the normal Gallery view. - + Create Link This command can be activated if an object is selected. A link named "Link to xxx" (xxx represents the name of the object) will be created directly in the same directory as that of the selected object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f8b5194a5546a532f2c7e969146b99624f332071 Author: Johnny_M AuthorDate: Sat Jun 19 12:44:42 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:44:42 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6c9762d21f1e509da34ad98cd02d8d541ce9ef9b - tdf#132643 Translate German section IDs Change-Id: Ie3c785d133cc23d5300134923c53ea9905e0dc8e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117487 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ffac115a4460..6c9762d21f1e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ffac115a446056f3df4ab44694052ba050e9d8f3 +Subproject commit 6c9762d21f1e509da34ad98cd02d8d541ce9ef9b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0010.xhp |2 +- source/text/shared/01/gallery.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6c9762d21f1e509da34ad98cd02d8d541ce9ef9b Author: Johnny_M AuthorDate: Sat Jun 19 11:47:08 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:44:42 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ie3c785d133cc23d5300134923c53ea9905e0dc8e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117487 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0010.xhp b/source/text/shared/00/0010.xhp index 8527b9a27..6792ff897 100644 --- a/source/text/shared/00/0010.xhp +++ b/source/text/shared/00/0010.xhp @@ -54,7 +54,7 @@ Deletes the current selection. If multiple objects are selected, all will be deleted. In most cases, a confirmation question appears before objects are deleted. The object is either physically deleted from the data carrier or the object display is removed, depending on context. - + If you choose Delete while in the Gallery, the entry will be deleted from the Gallery, but the file itself will remain untouched. diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp index 4b3943529..430d3dada 100644 --- a/source/text/shared/01/gallery.xhp +++ b/source/text/shared/01/gallery.xhp @@ -63,7 +63,7 @@ Adds a new theme to the Gallery and lets you choose the files to include in the theme. To access the following commands, right-click a theme in the Gallery: - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d982592c29316f76e6d581a3038e13385e01d814 Author: Johnny_M AuthorDate: Sat Jun 19 12:44:14 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:44:14 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ffac115a446056f3df4ab44694052ba050e9d8f3 - tdf#132643 Translate German section IDs Change-Id: I5e90b17cb74fe61b62296ba6cba946d6cf921cae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117486 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 28f2b50aabb1..ffac115a4460 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 28f2b50aabb1dc3407db1208c4c60b8d9102d789 +Subproject commit ffac115a446056f3df4ab44694052ba050e9d8f3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/1209.xhp |2 +- source/text/scalc/01/12090300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ffac115a446056f3df4ab44694052ba050e9d8f3 Author: Johnny_M AuthorDate: Sat Jun 19 11:44:28 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:44:14 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I5e90b17cb74fe61b62296ba6cba946d6cf921cae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117486 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/1209.xhp b/source/text/scalc/01/1209.xhp index 1641328a8..7b89cd217 100644 --- a/source/text/scalc/01/1209.xhp +++ b/source/text/scalc/01/1209.xhp @@ -35,7 +35,7 @@ Create - + Pivot table dialog diff --git a/source/text/scalc/01/12090300.xhp b/source/text/scalc/01/12090300.xhp index 771f49d31..6b030209e 100644 --- a/source/text/scalc/01/12090300.xhp +++ b/source/text/scalc/01/12090300.xhp @@ -27,7 +27,7 @@ - + Delete Deletes the selected pivot table. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ce0e7f44475904e0617b1c794073b0f8d058bcb Author: Johnny_M AuthorDate: Sat Jun 19 12:43:39 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:43:39 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 28f2b50aabb1dc3407db1208c4c60b8d9102d789 - tdf#132643 Translate German section IDs Change-Id: I7a0f5d39d3440d84bffb8a734d6868fcf39656fd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117485 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e3bf73d11f3c..28f2b50aabb1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e3bf73d11f3cf22f2529daa4daf2f7b0412fe478 +Subproject commit 28f2b50aabb1dc3407db1208c4c60b8d9102d789 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0010.xhp |2 +- source/text/shared/01/gallery.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 28f2b50aabb1dc3407db1208c4c60b8d9102d789 Author: Johnny_M AuthorDate: Sat Jun 19 11:42:23 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:43:39 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I7a0f5d39d3440d84bffb8a734d6868fcf39656fd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117485 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0010.xhp b/source/text/shared/00/0010.xhp index e0c08d2db..8527b9a27 100644 --- a/source/text/shared/00/0010.xhp +++ b/source/text/shared/00/0010.xhp @@ -38,7 +38,7 @@ Paste Inserts the element that you moved to the clipboard into the document. This command can only be called if the contents of the clipboard can be inserted at the current cursor position. - + Insert Opens a submenu in the Gallery where you can choose between Copy and Link. The selected Gallery object is either copied into the current document or a link is created. If you have selected an object in your document, then a new insertion will replace the selected object. diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp index 28a62c99a..4b3943529 100644 --- a/source/text/shared/01/gallery.xhp +++ b/source/text/shared/01/gallery.xhp @@ -73,7 +73,7 @@ Files - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 770726b7c8dc3b5c751ee7e319edea33f398ad7b Author: Johnny_M AuthorDate: Sat Jun 19 12:42:57 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:42:57 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to e3bf73d11f3cf22f2529daa4daf2f7b0412fe478 - tdf#132643 Translate German section IDs Change-Id: I1774f47b3e2e64ff9dc86279368be4606e820a52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117483 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14865d1d877e..e3bf73d11f3c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14865d1d877ecd5c15dcf68ff9312d7321714d89 +Subproject commit e3bf73d11f3cf22f2529daa4daf2f7b0412fe478 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040502.xhp |4 ++-- source/text/shared/01/05290400.xhp |2 +- source/text/shared/main0226.xhp|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e3bf73d11f3cf22f2529daa4daf2f7b0412fe478 Author: Johnny_M AuthorDate: Sat Jun 19 11:37:33 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:42:57 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I1774f47b3e2e64ff9dc86279368be4606e820a52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117483 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index dbab2a254..236ee11f8 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -458,7 +458,7 @@ - + Choose Shape - Group - Exit Group. @@ -468,7 +468,7 @@ Open context menu - choose Exit Group. - + diff --git a/source/text/shared/01/05290400.xhp b/source/text/shared/01/05290400.xhp index 4c22298a1..0cc00af87 100644 --- a/source/text/shared/01/05290400.xhp +++ b/source/text/shared/01/05290400.xhp @@ -36,7 +36,7 @@ Exit Group Exits the group, so that you can no longer edit the individual objects in the group. If you are in a nested group, only the nested group is closed. - + Groups diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp index ecc072acd..98dddeb9f 100644 --- a/source/text/shared/main0226.xhp +++ b/source/text/shared/main0226.xhp @@ -66,7 +66,7 @@ Exit Group - + Display Grid ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 685cd3b2a2a372d637fa7e9ac30011a4cdcc456f Author: Johnny_M AuthorDate: Sat Jun 19 12:42:18 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 19 12:42:18 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 14865d1d877ecd5c15dcf68ff9312d7321714d89 - tdf#132643 Translate German section IDs Change-Id: I0e0c3c23cb70b01cbf6dd0bc6dd46a12fd721d3f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117484 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8123db33c808..14865d1d877e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8123db33c8086173ff601019b26cab5881d435d7 +Subproject commit 14865d1d877ecd5c15dcf68ff9312d7321714d89 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040502.xhp |4 ++-- source/text/shared/01/05290300.xhp |2 +- source/text/shared/main0226.xhp|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 14865d1d877ecd5c15dcf68ff9312d7321714d89 Author: Johnny_M AuthorDate: Sat Jun 19 11:40:19 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jun 19 12:42:18 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I0e0c3c23cb70b01cbf6dd0bc6dd46a12fd721d3f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117484 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index 8b629c851..dbab2a254 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -481,7 +481,7 @@ - + Choose Shape - Group - Enter Group. @@ -491,7 +491,7 @@ Open context menu - choose Enter Group. - + diff --git a/source/text/shared/01/05290300.xhp b/source/text/shared/01/05290300.xhp index fa140e890..c819247d0 100644 --- a/source/text/shared/01/05290300.xhp +++ b/source/text/shared/01/05290300.xhp @@ -32,7 +32,7 @@ Enter Group Opens the selected group, so that you can edit the individual objects. If the selected group contains nested group, you can repeat this command on the subgroups. This command does not permanently ungroup the objects. - + To select an individual object in a group, hold down CommandCtrl, and then click the object. diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp index 292f8bbb2..ecc072acd 100644 --- a/source/text/shared/main0226.xhp +++ b/source/text/shared/main0226.xhp @@ -63,7 +63,7 @@ Enter Group - + Exit Group ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
5 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 5 of 5 defect(s)
** CID 1486008: Null pointer dereferences (FORWARD_NULL)
/sccomp/source/solver/SwarmSolver.cxx: 254 in
::SwarmSolver::getPropertyDescription(const rtl::OUString &)()
*** CID 1486008: Null pointer dereferences (FORWARD_NULL)
/sccomp/source/solver/SwarmSolver.cxx: 254 in
::SwarmSolver::getPropertyDescription(const rtl::OUString &)()
248 case PROP_ALGORITHM:
249 pResId = RID_PROPERTY_ALGORITHM;
250 break;
251 default:
252 break;
253 }
>>> CID 1486008: Null pointer dereferences (FORWARD_NULL)
>>> Passing null pointer "pResId" to "basic_string_view", which
>>> dereferences it. (The dereference is assumed on the basis of the "nonnull"
>>> parameter attribute.)
254 return SwarmSolver::getResourceString(pResId);
255 }
256
257 // XServiceInfo
258 virtual OUString SAL_CALL getImplementationName() override
259 {
** CID 1486007: Memory - illegal accesses (USE_AFTER_FREE)
*** CID 1486007: Memory - illegal accesses (USE_AFTER_FREE)
/sw/source/core/layout/ftnfrm.cxx: 1979 in
SwFootnoteBossFrame::MoveFootnotes_(std::vector> &, bool)()
1973 const sal_uInt16 nRefCol = lcl_ColumnNum( this );
1974 if( nRefNum < nMyNum || ( nRefNum == nMyNum && nRefCol <=
nMyCol ) )
1975 pRefBoss = this;
1976 }
1977 pRefBoss->InsertFootnote( pFootnote );
1978
>>> CID 1486007: Memory - illegal accesses (USE_AFTER_FREE)
>>> Calling "GetUpper" dereferences freed pointer "pFootnote".
1979 if ( pFootnote->GetUpper() ) // robust, e.g. with duplicates
1980 {
1981 // First condense the content so that footnote frames that
do not fit on the page
1982 // do not do too much harm (Loop 66312). So, the footnote
content first grows as
1983 // soon as the content gets formatted and it is sure that
it fits on the page.
1984 SwFrame *pCnt = pFootnote->ContainsAny();
** CID 1486006: Null pointer dereferences (FORWARD_NULL)
*** CID 1486006: Null pointer dereferences (FORWARD_NULL)
/sw/source/uibase/uno/unoatxt.cxx: 500 in SwXAutoTextGroup::getByIndex(int)()
494 std::unique_ptr pGlosGroup(pGlossaries ?
pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
495 if (!pGlosGroup || pGlosGroup->GetError())
496 throw uno::RuntimeException();
497 const sal_uInt16 nCount = pGlosGroup->GetCount();
498 if (nIndex < 0 || nIndex >= static_cast(nCount))
499 throw lang::IndexOutOfBoundsException();
>>> CID 1486006: Null pointer dereferences (FORWARD_NULL)
>>> "getByName" dereferences null "this->pGlossaries".
500 return
getByName(pGlosGroup->GetShortName(o3tl::narrowing(nIndex)));
501 }
502
503 uno::Type SwXAutoTextGroup::getElementType()
504 {
505 return cppu::UnoType::get();
** CID 1486005: Uninitialized members (UNINIT_CTOR)
/oox/source/drawingml/textliststyle.cxx: 41 in
oox::drawingml::TextListStyle::TextListStyle(const
oox::drawingml::TextListStyle&)()
*** CID 1486005: Uninitialized members (UNINIT_CTOR)
/oox/source/drawingml/textliststyle.cxx: 41 in
oox::drawingml::TextListStyle::TextListStyle(const
oox::drawingml::TextListStyle&)()
35 {
36 for ( size_t i = 0; i < NUM_TEXT_LIST_STYLE_ENTRIES; i++ )
37 {
38 maListStyle[i] = rStyle.maListStyle[i];
39 maAggregationListStyle[i] = rStyle.maAggregationListStyle[i];
40 }
>>> CID 1486005: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "mbHasListStyleOnImport" is not initialized in
>>> this constructor nor in any functions that it calls.
41 }
42
43 TextListStyle& TextListStyle::operator=(const TextListStyle& rStyle)
44 {
45 if(this != &rStyle)
46 {
** CID 1486004: Error handling issues (UNCAUGHT_EXCEPT)
/usr/include/c++/9/ext/new_allocator.h: 151 in
__gnu_cxx::new_allocator::destroy(T1
*)()
*** CID 1486004: Error handling issues (UNCAUGHT_EXCEPT)
/usr/include/c++/9/ext/new_allocator.h:
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/indexing/IndexingExportTest.cxx | 31 +
sw/qa/extras/indexing/data/IndexingExport_Sections.odt |binary
sw/source/filter/indexing/IndexingExport.cxx | 16 +++-
3 files changed, 45 insertions(+), 2 deletions(-)
New commits:
commit 2ce10eedfb1de8beef8ddfa457f1e19545846f86
Author: Tomaž Vajngerl
AuthorDate: Fri Jun 18 21:36:29 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:15:30 2021 +0200
indexing: indexing sections for the IndexingExport
Adds handling of sections to the IndexingExport. SectionNode also
derives from StartNode, so we handle it similar as the tables.
Change-Id: I5eb8d599bdf680144b161aa93295ea3d360eb5c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117452
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index fbc2c9d0ece2..f714b50f042a 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -31,6 +31,7 @@ public:
void testIndexingExport_OLE();
void testIndexingExport_Shapes();
void testIndexingExport_Tables();
+void testIndexingExport_Sections();
CPPUNIT_TEST_SUITE(IndexingExportTest);
CPPUNIT_TEST(testIndexingExport_Paragraphs);
@@ -38,6 +39,7 @@ public:
CPPUNIT_TEST(testIndexingExport_OLE);
CPPUNIT_TEST(testIndexingExport_Shapes);
CPPUNIT_TEST(testIndexingExport_Tables);
+CPPUNIT_TEST(testIndexingExport_Sections);
CPPUNIT_TEST_SUITE_END();
};
@@ -214,6 +216,35 @@ void IndexingExportTest::testIndexingExport_Tables()
assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[21]", "D5");
}
+void IndexingExportTest::testIndexingExport_Sections()
+{
+SwDoc* pDoc = createDoc("IndexingExport_Sections.odt");
+CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+
+assertXPath(pXmlDoc, "/indexing/section[1]", "name", "Section1");
+assertXPathContent(pXmlDoc, "/indexing/section[1]/paragraph[1]",
+ "This is a paragraph in a Section1");
+assertXPathContent(pXmlDoc, "/indexing/section[1]/paragraph[2]", "Section1
- Paragraph 2");
+assertXPathContent(pXmlDoc, "/indexing/section[1]/paragraph[3]", "Section1
- Paragraph 3");
+
+assertXPath(pXmlDoc, "/indexing/section[2]", "name", "Section2");
+assertXPathContent(pXmlDoc, "/indexing/section[2]/paragraph[1]", "Section2
- Paragraph 1");
+assertXPathContent(pXmlDoc, "/indexing/section[2]/paragraph[2]", "Section2
- Paragraph 2");
+
+assertXPathContent(pXmlDoc, "/indexing/paragraph[1]", "This is a paragraph
outside sections");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[2]", "This is a paragraph
outside sections");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(IndexingExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/indexing/data/IndexingExport_Sections.odt
b/sw/qa/extras/indexing/data/IndexingExport_Sections.odt
new file mode 100644
index ..ef92c83efd25
Binary files /dev/null and
b/sw/qa/extras/indexing/data/IndexingExport_Sections.odt differ
diff --git a/sw/source/filter/indexing/IndexingExport.cxx
b/sw/source/filter/indexing/IndexingExport.cxx
index b02bef0c9fe2..17a1670bd73c 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -56,8 +56,11 @@ public:
{
handleTableNode(pNode->GetTableNode());
}
-
-if (pNode->IsEndNode())
+else if (pNode->IsSectionNode())
+{
+handleSectionNode(pNode->GetSectionNode());
+}
+else if (pNode->IsEndNode())
{
handleEndNode(pNode->GetEndNode());
}
@@ -138,6 +141,15 @@ public:
maNodeStack.push_back(pTableNode);
}
+void handleSectionNode(SwSectionNode* pSectionNode)
+{
+m_rXmlWriter.startElement("section");
+m_rXmlWriter.attribute("index", pSectionNode->GetIndex());
+m_rXmlWriter.attribute("name",
pSectionNode->GetSection().GetSectionName());
+
+maNodeStack.push_back(pSectionNode);
+}
+
void handleEndNode(SwEndNode* pEndNode)
{
if (!maNodeStack.empty() && pEndNode->StartOfSectionNode() ==
maNodeStack.back())
___
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/indexing/IndexingExport.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 705fe1c44b41cd11518069e0627d0f48a65a7dfc
Author: Tomaž Vajngerl
AuthorDate: Fri Jun 18 21:13:38 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:15:12 2021 +0200
indexing: write parent index to paragraphs if possible
When writing paragraphs from a table we want to associate the
parent table to the paragraphs so we also write the parent index.
Change-Id: Idf9c285f08481ed0556700e92adda27027b91408
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117451
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/source/filter/indexing/IndexingExport.cxx
b/sw/source/filter/indexing/IndexingExport.cxx
index 83bac26fc51d..b02bef0c9fe2 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -83,10 +83,17 @@ public:
void handleTextNode(SwTextNode* pTextNode)
{
+sal_Int64 nParentIndex = -1;
+if (!maNodeStack.empty() && maNodeStack.back())
+{
+nParentIndex = maNodeStack.back()->GetIndex();
+}
const OUString& rString
=
pTextNode->GetText().replaceAll(OUStringChar(CH_TXTATR_BREAKWORD), "");
m_rXmlWriter.startElement("paragraph");
m_rXmlWriter.attribute("index", pTextNode->GetIndex());
+if (nParentIndex >= 0)
+m_rXmlWriter.attribute("parent", nParentIndex);
m_rXmlWriter.content(rString);
m_rXmlWriter.endElement();
}
___
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/indexing/IndexingExportTest.cxx | 64 +++
sw/qa/extras/indexing/data/IndexingExport_Tables.odt |binary
sw/source/filter/indexing/IndexingExport.cxx | 34 ++
3 files changed, 98 insertions(+)
New commits:
commit b3a62ab0a43510cf43c88aa4d6e145e46db7e7e5
Author: Tomaž Vajngerl
AuthorDate: Fri Jun 18 20:21:20 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:14:31 2021 +0200
indexing: indexing tables for the IndexingExport
Adds handling of tables to the IndexingExport and also handling
of the end node (as table node is also a start node), so we know
which paragraphs belong to a table.
Change-Id: I624ce12a3e810797a37ae2efe5baa552828f75dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117450
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index 350e75c3d49f..fbc2c9d0ece2 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -30,12 +30,14 @@ public:
void testIndexingExport_Images();
void testIndexingExport_OLE();
void testIndexingExport_Shapes();
+void testIndexingExport_Tables();
CPPUNIT_TEST_SUITE(IndexingExportTest);
CPPUNIT_TEST(testIndexingExport_Paragraphs);
CPPUNIT_TEST(testIndexingExport_Images);
CPPUNIT_TEST(testIndexingExport_OLE);
CPPUNIT_TEST(testIndexingExport_Shapes);
+CPPUNIT_TEST(testIndexingExport_Tables);
CPPUNIT_TEST_SUITE_END();
};
@@ -150,6 +152,68 @@ void IndexingExportTest::testIndexingExport_Shapes()
assertXPathContent(pXmlDoc, "/indexing/shape[3]/paragraph[3]", "Para3");
}
+void IndexingExportTest::testIndexingExport_Tables()
+{
+SwDoc* pDoc = createDoc("IndexingExport_Tables.odt");
+CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+
+assertXPath(pXmlDoc, "/indexing/table[1]", "name", "Table1");
+assertXPathContent(pXmlDoc, "/indexing/table[1]/paragraph[1]", "A");
+assertXPathContent(pXmlDoc, "/indexing/table[1]/paragraph[2]", "B");
+assertXPathContent(pXmlDoc, "/indexing/table[1]/paragraph[3]", "1");
+assertXPathContent(pXmlDoc, "/indexing/table[1]/paragraph[4]", "2");
+
+assertXPath(pXmlDoc, "/indexing/table[2]", "name", "Table2");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[1]", "A");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[2]", "B");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[3]", "C");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[4]", "1");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[5]", "10");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[6]", "100");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[7]", "2");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[8]", "20");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[9]", "200");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[10]", "3");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[11]", "30");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[12]", "300");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[13]", "4");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[14]", "40");
+assertXPathContent(pXmlDoc, "/indexing/table[2]/paragraph[15]", "400");
+
+assertXPath(pXmlDoc, "/indexing/table[3]", "name", "WeirdTable");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[1]", "A1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[2]", "B1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[3]", "C1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[4]", "D1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[5]", "A2B2");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[6]", "C2D2");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[7]", "A3B3C3D3");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[8]", "A4-1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[9]", "A4-2");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[10]", "B4-1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[11]", "C4-1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[12]", "D4-1");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[13]", "D4-2");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[14]", "");
+assertXPathContent(pXmlDoc, "/indexing/table[3]/paragraph[15]", "");
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/indexing/IndexingExportTest.cxx | 30 +
sw/qa/extras/indexing/data/IndexingExport_Shapes.odt |binary
sw/source/core/inc/ModelTraverser.hxx|2 +
sw/source/core/model/ModelTraverser.cxx | 21
sw/source/filter/indexing/IndexingExport.cxx | 33 ++-
5 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit c23408aeafc1f2ce3f7dde685d0b519d8e2daff7
Author: Tomaž Vajngerl
AuthorDate: Thu Jun 17 15:31:11 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:14:01 2021 +0200
indexing: indexing shapes/text boxes for the IndexingExport
Adds handling of shapes and text boxes to the IndexingExport with
exporting the the name, alt text, description and paragraphs of
the inner shape text to the indexing xml.
Change-Id: I3db68078b7e793cab552b4f7f8e8ddf9bfd1a6f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117359
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index 807f84ab6934..350e75c3d49f 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -29,11 +29,13 @@ public:
void testIndexingExport_Paragraphs();
void testIndexingExport_Images();
void testIndexingExport_OLE();
+void testIndexingExport_Shapes();
CPPUNIT_TEST_SUITE(IndexingExportTest);
CPPUNIT_TEST(testIndexingExport_Paragraphs);
CPPUNIT_TEST(testIndexingExport_Images);
CPPUNIT_TEST(testIndexingExport_OLE);
+CPPUNIT_TEST(testIndexingExport_Shapes);
CPPUNIT_TEST_SUITE_END();
};
@@ -120,6 +122,34 @@ void IndexingExportTest::testIndexingExport_OLE()
assertXPath(pXmlDoc, "/indexing/ole[1]", "alt", "Alt Text");
}
+void IndexingExportTest::testIndexingExport_Shapes()
+{
+SwDoc* pDoc = createDoc("IndexingExport_Shapes.odt");
+CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+
+assertXPath(pXmlDoc, "/indexing/shape[1]", "name", "Circle");
+assertXPathContent(pXmlDoc, "/indexing/shape[1]/paragraph[1]", "This is a
circle");
+assertXPathContent(pXmlDoc, "/indexing/shape[1]/paragraph[2]", "This is a
second paragraph");
+
+assertXPath(pXmlDoc, "/indexing/shape[2]", "name", "Diamond");
+assertXPathContent(pXmlDoc, "/indexing/shape[2]/paragraph[1]", "This is a
diamond");
+
+assertXPath(pXmlDoc, "/indexing/shape[3]", "name", "Text Frame 1");
+assertXPathContent(pXmlDoc, "/indexing/shape[3]/paragraph[1]", "This is a
TextBox - Para1");
+assertXPathContent(pXmlDoc, "/indexing/shape[3]/paragraph[2]", "Para2");
+assertXPathContent(pXmlDoc, "/indexing/shape[3]/paragraph[3]", "Para3");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(IndexingExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/indexing/data/IndexingExport_Shapes.odt
b/sw/qa/extras/indexing/data/IndexingExport_Shapes.odt
new file mode 100644
index ..8d37145ea30a
Binary files /dev/null and
b/sw/qa/extras/indexing/data/IndexingExport_Shapes.odt differ
diff --git a/sw/source/core/inc/ModelTraverser.hxx
b/sw/source/core/inc/ModelTraverser.hxx
index ab38032773df..e6aab62c998f 100644
--- a/sw/source/core/inc/ModelTraverser.hxx
+++ b/sw/source/core/inc/ModelTraverser.hxx
@@ -13,6 +13,7 @@
#include
class SwNode;
+class SdrObject;
namespace sw
{
@@ -22,6 +23,7 @@ public:
virtual ~ModelTraverseHandler() {}
virtual void handleNode(SwNode* pNode) = 0;
+virtual void handleSdrObject(SdrObject* pObject) = 0;
};
class SW_DLLPUBLIC ModelTraverser
diff --git a/sw/source/core/model/ModelTraverser.cxx
b/sw/source/core/model/ModelTraverser.cxx
index f46e173eca9f..0a01f5cd97c5 100644
--- a/sw/source/core/model/ModelTraverser.cxx
+++ b/sw/source/core/model/ModelTraverser.cxx
@@ -11,6 +11,9 @@
#include
#include
#include
+#include
+#include
+#include
namespace sw
{
@@ -32,6 +35,24 @@ void ModelTraverser::traverse()
}
}
}
+
+IDocumentDrawModelAccess& rDrawModelAccess =
m_pDoc->getIDocumentDrawModelAccess();
+auto* pModel = rDrawModelAccess.GetDrawModel();
+for (sal_uInt16 nPage = 0; nPage < pModel->GetPageCount(); ++nPage)
+{
+SdrPage* pPage = pModel->GetPage(nPage);
+for (size_t nObject = 0; nObject < pPage->GetObjCount(); ++nObject)
+{
+SdrObject* pObject = pPage->GetObj(nObject);
+if (pObject)
+{
+for (auto& pNodeHandler : mpNodeHandler)
+{
+pNodeHandler->handleSdrObject(pObject);
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/indexing/IndexingExportTest.cxx | 20
sw/qa/extras/indexing/data/IndexingExport_OLE.odt |binary
sw/source/filter/indexing/IndexingExport.cxx | 17 -
3 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit 37cd5bd4fdf2317709882c933844c4cc67e4cee4
Author: Tomaž Vajngerl
AuthorDate: Tue Jun 15 14:12:26 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:13:32 2021 +0200
indexing: indexing OLE objects for the IndexingExport
Adds handling of OLE objects to the IndexingExport with exporting
the alt text and the name to the indexing xml.
Change-Id: Ie357f55195cda864ee12d6b120babd106eff6179
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117358
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index f76850c1a803..807f84ab6934 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -28,10 +28,12 @@ private:
public:
void testIndexingExport_Paragraphs();
void testIndexingExport_Images();
+void testIndexingExport_OLE();
CPPUNIT_TEST_SUITE(IndexingExportTest);
CPPUNIT_TEST(testIndexingExport_Paragraphs);
CPPUNIT_TEST(testIndexingExport_Images);
+CPPUNIT_TEST(testIndexingExport_OLE);
CPPUNIT_TEST_SUITE_END();
};
@@ -100,6 +102,24 @@ void IndexingExportTest::testIndexingExport_Images()
assertXPath(pXmlDoc, "/indexing/graphic[2]", "name", "Image_InCaption");
}
+void IndexingExportTest::testIndexingExport_OLE()
+{
+SwDoc* pDoc = createDoc("IndexingExport_OLE.odt");
+CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+assertXPath(pXmlDoc, "/indexing/ole[1]", "name", "Object - Chart");
+assertXPath(pXmlDoc, "/indexing/ole[1]", "alt", "Alt Text");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(IndexingExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/indexing/data/IndexingExport_OLE.odt
b/sw/qa/extras/indexing/data/IndexingExport_OLE.odt
new file mode 100644
index ..3da225368bd4
Binary files /dev/null and b/sw/qa/extras/indexing/data/IndexingExport_OLE.odt
differ
diff --git a/sw/source/filter/indexing/IndexingExport.cxx
b/sw/source/filter/indexing/IndexingExport.cxx
index 8d6e96fd262c..601d67ed1b21 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -12,6 +12,8 @@
#include
#include
+#include
+#include
#include
namespace sw
@@ -31,7 +33,11 @@ public:
void handleNode(SwNode* pNode) override
{
-if (pNode->IsGrfNode())
+if (pNode->IsOLENode())
+{
+handleOLENode(pNode->GetOLENode());
+}
+else if (pNode->IsGrfNode())
{
handleGraphicNode(pNode->GetGrfNode());
}
@@ -41,6 +47,15 @@ public:
}
}
+void handleOLENode(SwOLENode* pOleNode)
+{
+auto pFrameFormat = pOleNode->GetFlyFormat();
+m_rXmlWriter.startElement("ole");
+m_rXmlWriter.attribute("alt", pOleNode->GetTitle());
+m_rXmlWriter.attribute("name", pFrameFormat->GetName());
+m_rXmlWriter.endElement();
+}
+
void handleGraphicNode(SwGrfNode* pGraphicNode)
{
auto pFrameFormat = pGraphicNode->GetFlyFormat();
___
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/indexing/IndexingExportTest.cxx | 28 ---
sw/qa/extras/indexing/data/IndexingExport_Images.odt |binary
sw/source/filter/indexing/IndexingExport.cxx | 25 ++--
3 files changed, 47 insertions(+), 6 deletions(-)
New commits:
commit f81115740bac985cad3cd15348f75c2c78b8843a
Author: Tomaž Vajngerl
AuthorDate: Tue Jun 15 13:57:15 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:13:11 2021 +0200
indexing: indexing graphics for the IndexingExport
Adds handling of graphics to the IndexingExport with exporting
the alt text and the name to the indexing xml.
Change-Id: I20344dd04c5da4668c8eafbf1f863a26357ad616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117357
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index 9d943e3b9593..f76850c1a803 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -26,10 +26,12 @@ private:
SwDoc* createDoc(const char* pName = nullptr);
public:
-void testIndexingExport();
+void testIndexingExport_Paragraphs();
+void testIndexingExport_Images();
CPPUNIT_TEST_SUITE(IndexingExportTest);
-CPPUNIT_TEST(testIndexingExport);
+CPPUNIT_TEST(testIndexingExport_Paragraphs);
+CPPUNIT_TEST(testIndexingExport_Images);
CPPUNIT_TEST_SUITE_END();
};
@@ -45,7 +47,7 @@ SwDoc* IndexingExportTest::createDoc(const char* pName)
return pTextDoc->GetDocShell()->GetDoc();
}
-void IndexingExportTest::testIndexingExport()
+void IndexingExportTest::testIndexingExport_Paragraphs()
{
SwDoc* pDoc = createDoc("IndexingExport_VariousParagraphs.odt");
CPPUNIT_ASSERT(pDoc);
@@ -78,6 +80,26 @@ void IndexingExportTest::testIndexingExport()
assertXPathContent(pXmlDoc, "/indexing/paragraph[17]", "Bold Italic
Underline Strikeout");
}
+void IndexingExportTest::testIndexingExport_Images()
+{
+SwDoc* pDoc = createDoc("IndexingExport_Images.odt");
+CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+assertXPath(pXmlDoc, "/indexing/graphic[1]", "alt", "Image_NonCaption -
Alternative text");
+assertXPath(pXmlDoc, "/indexing/graphic[1]", "name", "Image_NonCaption");
+assertXPath(pXmlDoc, "/indexing/graphic[2]", "alt", "Image_InCaption -
Alternative text");
+assertXPath(pXmlDoc, "/indexing/graphic[2]", "name", "Image_InCaption");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(IndexingExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/indexing/data/IndexingExport_Images.odt
b/sw/qa/extras/indexing/data/IndexingExport_Images.odt
new file mode 100644
index ..3bf4120e27b4
Binary files /dev/null and
b/sw/qa/extras/indexing/data/IndexingExport_Images.odt differ
diff --git a/sw/source/filter/indexing/IndexingExport.cxx
b/sw/source/filter/indexing/IndexingExport.cxx
index 8df7d56f7ff6..8d6e96fd262c 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -10,7 +10,9 @@
#include
+#include
#include
+#include
namespace sw
{
@@ -29,10 +31,27 @@ public:
void handleNode(SwNode* pNode) override
{
-if (!pNode->IsTextNode())
-return;
+if (pNode->IsGrfNode())
+{
+handleGraphicNode(pNode->GetGrfNode());
+}
+else if (pNode->IsTextNode())
+{
+handleTextNode(pNode->GetTextNode());
+}
+}
+
+void handleGraphicNode(SwGrfNode* pGraphicNode)
+{
+auto pFrameFormat = pGraphicNode->GetFlyFormat();
+m_rXmlWriter.startElement("graphic");
+m_rXmlWriter.attribute("alt", pGraphicNode->GetTitle());
+m_rXmlWriter.attribute("name", pFrameFormat->GetName());
+m_rXmlWriter.endElement();
+}
-SwTextNode* pTextNode = pNode->GetTextNode();
+void handleTextNode(SwTextNode* pTextNode)
+{
const OUString& rString
=
pTextNode->GetText().replaceAll(OUStringChar(CH_TXTATR_BREAKWORD), "");
m_rXmlWriter.startElement("paragraph");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_indexingexport.mk sw/Library_sw.mk sw/qa sw/source
sw/CppunitTest_sw_indexingexport.mk |1
sw/Library_sw.mk |2
sw/qa/extras/indexing/IndexingExportTest.cxx | 29 +++
sw/source/core/inc/ModelTraverser.hxx| 49 ++
sw/source/core/model/ModelTraverser.cxx | 39 ++
sw/source/filter/inc/IndexingExport.hxx | 32
sw/source/filter/indexing/IndexingExport.cxx | 71 +++
7 files changed, 223 insertions(+)
New commits:
commit 686c35a3c37674d08c1f8585a621143c959b3f29
Author: Tomaž Vajngerl
AuthorDate: Fri Jun 11 12:23:45 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:12:44 2021 +0200
indexing: indexing paragraph text with the ModelTraverser
This adds the basic paragraph text export for indexing, which uses
the new ModelTraverser, which is inspired by AccessibilityCheck
(and in the future it will be changed to use the ModelTraverser
too, when it matures). ModelTraverser implements traversing through
the model and executes a handler for a element of a model (which
can be various things).
IndexingExport class implements indexing export that uses the
ModelTraverser to write into the indexing xml document, that uses
the tools::XmlWriter.
Change-Id: I7a6a5de332534270fe894a881131e5eb5ea9d881
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117356
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/CppunitTest_sw_indexingexport.mk
b/sw/CppunitTest_sw_indexingexport.mk
index 06b2b448f32a..a3884fee8fb6 100644
--- a/sw/CppunitTest_sw_indexingexport.mk
+++ b/sw/CppunitTest_sw_indexingexport.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_indexingexport,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/qa/inc \
$$(INCLUDE) \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 3ba73c8ae9af..d85a2f563ba7 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -352,6 +352,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/layout/unusedf \
sw/source/core/layout/virtoutp \
sw/source/core/layout/wsfrm \
+sw/source/core/model/ModelTraverser \
sw/source/core/objectpositioning/anchoredobjectposition \
sw/source/core/objectpositioning/ascharanchoredobjectposition \
sw/source/core/objectpositioning/environmentofanchoredobject \
@@ -569,6 +570,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/filter/xml/xmltext \
sw/source/filter/xml/xmltexte \
sw/source/filter/xml/xmltexti \
+sw/source/filter/indexing/IndexingExport \
sw/source/uibase/app/appenv \
sw/source/uibase/app/apphdl \
sw/source/uibase/app/applab \
diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index eed303c3e97b..9d943e3b9593 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -13,6 +13,8 @@
#include
#include
+#include
+
namespace
{
constexpr OUStringLiteral DATA_DIRECTORY = u"sw/qa/extras/indexing/data/";
@@ -47,6 +49,33 @@ void IndexingExportTest::testIndexingExport()
{
SwDoc* pDoc = createDoc("IndexingExport_VariousParagraphs.odt");
CPPUNIT_ASSERT(pDoc);
+
+SvMemoryStream aMemoryStream;
+sw::IndexingExport aIndexingExport(aMemoryStream, pDoc);
+aIndexingExport.runExport();
+aMemoryStream.Seek(0);
+
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aMemoryStream);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/indexing");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[1]", "Title");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[2]", "Heading 1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[3]", "Heading 2");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[4]", "Paragraph 1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[5]", "Paragraph 2");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[6]", "Bullet 1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[7]", "Bullet 2");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[8]", "Bullet 3");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[9]", "Paragraph 3");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[10]", "Paragraph 4");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[11]", "List 1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[12]", "List 2");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[13]", "List 3");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[14]", "Left");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[15]", "Center");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[16]", "Right");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[17]", "Bold Italic
Underline Strikeout");
}
CPPUNIT_T
[Libreoffice-commits] core.git: include/svx sc/source svx/source
include/svx/svdotable.hxx |2
include/svx/svdotext.hxx| 108 -
sc/source/filter/html/htmlexp2.cxx |2
svx/source/sdr/properties/customshapeproperties.cxx |6
svx/source/svdraw/svdoashp.cxx | 84 +++
svx/source/svdraw/svdocirc.cxx | 85 ---
svx/source/svdraw/svdograf.cxx | 20 -
svx/source/svdraw/svdomeas.cxx | 18 -
svx/source/svdraw/svdopath.cxx | 44 +--
svx/source/svdraw/svdorect.cxx | 59 ++---
svx/source/svdraw/svdotext.cxx | 222 ++--
svx/source/svdraw/svdotxat.cxx | 24 +-
svx/source/svdraw/svdotxdr.cxx | 20 -
svx/source/svdraw/svdotxed.cxx | 30 +-
svx/source/svdraw/svdotxln.cxx | 56 ++---
svx/source/svdraw/svdotxtr.cxx | 78 +++
svx/source/svdraw/svdouno.cxx | 14 -
svx/source/svdraw/textchainflow.cxx |4
svx/source/table/svdotable.cxx | 32 +-
svx/source/unodraw/unoshap2.cxx |2
20 files changed, 456 insertions(+), 454 deletions(-)
New commits:
commit e6cb7f9ab25bca32dc85aef8ff127e070cd109b6
Author: Tomaž Vajngerl
AuthorDate: Tue Jun 15 23:57:58 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:12:03 2021 +0200
svx: prefix member variables for SdrTextObj and others
All classes in svdotext.hxx
Change-Id: Ib15deca2a625d8352a2572d9fc3e15188b4e718a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117478
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index a85bfa6e507a..5d006fe6c3f7 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -177,7 +177,7 @@ public:
// #i121917#
virtual bool HasText() const override;
-bool IsTextEditActive() const { return (pEdtOutl != nullptr); }
+bool IsTextEditActive() const { return mpEdtOutl != nullptr; }
bool IsTextEditActive( const sdr::table::CellPos& rPos );
/** Returns true only if we are in edit mode and the user actually changed
anything */
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index d5c981d632db..210839c179e4 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -37,7 +37,6 @@
// forward declarations
-
class OutlinerParaObject;
class OverflowingText;
class SdrOutliner;
@@ -82,36 +81,29 @@ namespace sdr::table {
// Defines
-
-
constexpr const sal_uInt16 SDRUSERDATA_OBJTEXTLINK = 1;
// helper class SdrTextObjGeoData
-
-
class SdrTextObjGeoData : public SdrObjGeoData
{
public:
-tools::Rectangle aRect;
-GeoStat aGeo;
+tools::Rectangle maRect;
+GeoStat maGeo;
};
// helper class ImpSdrObjTextLinkUserData
-
-
class ImpSdrObjTextLinkUserData final : public SdrObjUserData
{
-friend classSdrTextObj;
-friend classImpSdrObjTextLink;
+friend class SdrTextObj;
+friend class ImpSdrObjTextLink;
-OUStringaFileName; // name of the referenced document
-OUStringaFilterName; // a filter, if need be
-DateTimeaFileDate0; // avoiding unnecessary reload
-tools::SvRef
-pLink;
-rtl_TextEncodingeCharSet;
+OUString maFileName; // name of the referenced document
+OUString maFilterName; // a filter, if need be
+DateTime maFileDate0; // avoiding unnecessary reload
+tools::SvRef mpLink;
+rtl_TextEncoding meCharSet;
public:
ImpSdrObjTextLinkUserData();
@@ -134,12 +126,12 @@ class SVXCORE_DLLPUBLIC SdrTextObj : public SdrAttrObj,
public svx::ITextProvide
{
private:
// Cell needs access to ImpGetDrawOutliner();
-friend classsdr::table::Cell;
-friend classsdr::table::SdrTableRtfExporter;
-friend classsdr::table::SdrTableRTFParser;
-friend classTextChain;
-friend classTextChainFlow;
-friend classEditingTextChainFlow;
+friend class sdr::table::Cell;
+friend class sdr::table::SdrTableRtfExporter;
+friend class sdr::table::SdrTableRTFParser;
+friend class TextChain;
+friend class TextChainFlow;
+friend class EditingTextChainFlow;
// CustomShapeproperties need to access the "bTextFrame" member:
friend class sdr::properties::CustomShapeProperties;
@@ -152,7 +144,7 @@ private:
// This method is only allowed for sdr::properties::TextProperties
SVX_DLLPRIVATE SdrOutliner* GetTextEditOutliner() const
{
-return pEdtOutl;
+return mpEdtOutl;
}
[Libreoffice-commits] core.git: include/svx
include/svx/svdotext.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 39a3c0bd8007917d42a58d9337b4d06590bcf306
Author: Tomaž Vajngerl
AuthorDate: Tue Jun 15 23:01:48 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:11:39 2021 +0200
svx: use constexpr instead of a define for a constant
Change-Id: Ie2fdd0dbe2c6d8e5c9ff406af5d2be20383fe62b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117477
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index b0fe22fe1b22..d5c981d632db 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -84,7 +84,7 @@ namespace sdr::table {
// Defines
-#define SDRUSERDATA_OBJTEXTLINK (1)
+constexpr const sal_uInt16 SDRUSERDATA_OBJTEXTLINK = 1;
// helper class SdrTextObjGeoData
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdcrtv.hxx | 44 +-
svx/source/svdraw/svdcrtv.cxx | 184 +-
svx/source/svdraw/svdview.cxx | 14 +--
3 files changed, 123 insertions(+), 119 deletions(-)
New commits:
commit ffe4538fe4e59e31994511b1117dcd5967f2e2b0
Author: Tomaž Vajngerl
AuthorDate: Tue Jun 15 22:58:51 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jun 19 11:11:27 2021 +0200
svx: prefix member variables for SdrCreateView
Change-Id: I4fb067201d3285b8aad8877bba2f018aab41c026
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117476
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 253d1060aba9..b7f7a5938f97 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -37,23 +37,23 @@ class SVXCORE_DLLPUBLIC SdrCreateView : public SdrDragView
friend classSdrPageView;
protected:
-SdrObject* pCurrentCreate; // The currently being
created object
-SdrPageView*pCreatePV;// Here, the creation is started
+SdrObject* mpCurrentCreate; // The currently being created object
+SdrPageView* mpCreatePV; // Here, the creation is started
std::unique_ptr mpCoMaOverlay;
// for migrating stuff from XOR, use ImpSdrCreateViewExtraData ATM to not
need to
// compile the apps all the time
std::unique_ptr mpCreateViewExtraData;
-PointerStyleaCurrentCreatePointer;
+PointerStyle maCurrentCreatePointer;
-sal_Int32 nAutoCloseDistPix;
-sal_Int32 nFreeHandMinDistPix;
-SdrInventor nCurrentInvent; // set the current ones
-SdrObjKind nCurrentIdent; // Obj for re-creating
+sal_Int32 mnAutoCloseDistPix;
+sal_Int32 mnFreeHandMinDistPix;
+SdrInventor mnCurrentInvent; // set the current ones
+SdrObjKind mnCurrentIdent; // Obj for re-creating
-boolb1stPointAsCenter : 1;
-boolbUseIncompatiblePathCreateInterface : 1;
+bool mb1stPointAsCenter : 1;
+bool mbUseIncompatiblePathCreateInterface : 1;
void ImpClearConnectMarker();
@@ -101,9 +101,13 @@ public:
bool IsMeasureTool() const;
void SetCurrentObj(SdrObjKind nIdent, SdrInventor
nInvent=SdrInventor::Default);
-void TakeCurrentObj(SdrObjKind& nIdent, SdrInventor& nInvent) const {
nInvent=nCurrentInvent; nIdent=nCurrentIdent; }
-SdrInventor GetCurrentObjInventor() const { return nCurrentInvent; }
-SdrObjKind GetCurrentObjIdentifier() const { return nCurrentIdent; }
+void TakeCurrentObj(SdrObjKind& nIdent, SdrInventor& nInvent) const
+{
+nInvent = mnCurrentInvent;
+nIdent = mnCurrentIdent;
+}
+SdrInventor GetCurrentObjInventor() const { return mnCurrentInvent; }
+SdrObjKind GetCurrentObjIdentifier() const { return mnCurrentIdent; }
// Beginning the regular Create
bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short
nMinMov=-3);
@@ -112,8 +116,8 @@ public:
bool EndCreateObj(SdrCreateCmd eCmd);
void BckCreateObj(); // go back one polygon point
void BrkCreateObj();
-bool IsCreateObj() const { return pCurrentCreate!=nullptr; }
-SdrObject* GetCreateObj() const { return pCurrentCreate; }
+bool IsCreateObj() const { return mpCurrentCreate != nullptr; }
+SdrObject* GetCreateObj() const { return mpCurrentCreate; }
/// Setup layer (eg. foreground / background) of the given object.
static void SetupObjLayer(const SdrPageView* pPageView, const OUString&
aActiveLayer, SdrObject* pObj);
@@ -126,16 +130,16 @@ public:
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
// Persistent flag. Default = FALSE.
-bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
-void SetCreate1stPointAsCenter(bool bOn) { b1stPointAsCenter = bOn; }
+bool IsCreate1stPointAsCenter() const { return mb1stPointAsCenter; }
+void SetCreate1stPointAsCenter(bool bOn) { mb1stPointAsCenter = bOn; }
// Default = 5 Pixel
-sal_uInt16 GetAutoCloseDistPix() const { return
sal_uInt16(nAutoCloseDistPix); }
+sal_uInt16 GetAutoCloseDistPix() const { return
sal_uInt16(mnAutoCloseDistPix); }
// Setting for the minimum distance in pixels between 2 bezier points when
// creating a freehand line.
// Default = 10 Pixel
-sal_uInt16 GetFreeHandMinDistPix() const { return
sal_uInt16(nFreeHandMinDistPix); }
+sal_uInt16 GetFreeHandMinDistPix() const { return
sal_uInt16(mnFreeHandMinDistPix); }
// FIXME: Whoever wants to keep the Create Interface for the PathObj which
is
// incompatible with the rest of the Create functionality of SvDraw, needs
@@ -145,8 +149,8 @@ public:
// This flag should
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_UI.xba |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 6de7707236ea918d94f321587cb1a728a42e0892 Author: Jean-Pierre Ledure AuthorDate: Fri Jun 18 12:48:17 2021 +0200 Commit: Jean-Pierre Ledure CommitDate: Sat Jun 19 10:02:19 2021 +0200 ScriptForge - (SF_UI) GetDocument() accepts component object SF_UI.GetDocument() has 1 argument. Before, must be a string designating an open window Now, also a UNO object of types com.sun.star.lang.XComponent or com.sun.star.comp.dba.ODatabaseDocument Typical usage: pass ThisComponent or ThisDatabaseDocument as argument to create a new SFDocuments.Document/Base/Calc service. Change-Id: Id9e0a40425dc3ce5e83953af5da4fb7ef8dd6f63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117442 Tested-by: Jean-Pierre Ledure Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/scriptforge/SF_UI.xba b/wizards/source/scriptforge/SF_UI.xba index 9b98053a85c9..122dd218da93 100644 --- a/wizards/source/scriptforge/SF_UI.xba +++ b/wizards/source/scriptforge/SF_UI.xba @@ -402,12 +402,14 @@ REM Public Function GetDocument(Optional ByVal WindowName As Variant) As Variant ''' Returns a SFDocuments.Document object referring to the active window or the given window ''' Args: -''' WindowName: see definitions. If absent the active window is considered +''' WindowName: when a string, see definitions. If absent the active window is considered. +''' when an object, must be a UNO object of types +''' com.sun.star.lang.XComponent or com.sun.star.comp.dba.ODatabaseDocument ''' Exceptions: ''' DOCUMENTERROR The targeted window could not be found ''' Examples: ''' Dim oDoc As Object -''' Set oDoc = ui.GetDocument +''' Set oDoc = ui.GetDocument ' or Set oDoc = ui.GetDcument(ThisComponent) ''' oDoc.Save() Dim oDocument As Object' Return value @@ -420,7 +422,10 @@ Const cstSubArgs = "[WindowName]" Check: If IsMissing(WindowName) Or IsEmpty(WindowName) Then WindowName = "" If SF_Utils._EnterFunction(cstThisSub, cstSubArgs) Then + If Not SF_Utils._Validate(WindowName, "WindowName", Array(V_STRING, V_OBJECT)) Then GoTo Finally + If VarType(WindowName) = V_STRING Then If Not SF_Utils._ValidateFile(WindowName, "WindowName", , True) Then GoTo Finally + End If End If Try: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sd/qa sw/qa
sc/qa/unit/tiledrendering/tiledrendering.cxx | 16
sd/qa/unit/tiledrendering/tiledrendering.cxx |8
sw/qa/extras/tiledrendering/tiledrendering.cxx |8
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 947bbe2ae33724f445968f50acf186305fb361e3
Author: Rene Engelhard
AuthorDate: Fri Jun 18 06:14:09 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 09:23:04 2021 +0200
fix 32bit build of tiledrendering tests
Squash of commits
49849a09e2823ac6edb42693daf7eac5312f2eb9
d7b9b9e8e02aefd61669e07543fc370b0c58207f
Change-Id: I2f10b7bb37b05961f73fad9ee2e716ed8177d8ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117474
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 07ebef6086d9..aed61f58a6cf 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -460,13 +460,13 @@ struct EditCursorMessage final {
std::string aVal =
aTree.get_child("refpoint").get_value();
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
-CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
aVal = aTree.get_child("relrect").get_value();
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
-CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
m_aRelRect.setX(aSeq[0].toInt32());
m_aRelRect.setY(aSeq[1].toInt32());
m_aRelRect.setWidth(aSeq[2].toInt32());
@@ -512,7 +512,7 @@ struct TextSelectionMessage
std::string("0, 0") :
aStr.substr(nRefDelimStart + 2, aStr.length() - 2 -
nRefDelimStart);
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRefPointString.c_str()));
-CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
@@ -525,7 +525,7 @@ struct TextSelectionMessage
std::string aRectString = aRectListString.substr(nStart, nEnd -
nStart);
{
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRectString.c_str()));
-CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
tools::Rectangle aRect;
aRect.setX(aSeq[0].toInt32());
aRect.setY(aSeq[1].toInt32());
@@ -818,7 +818,7 @@ void ScTiledRenderingTest::testViewLock()
CPPUNIT_ASSERT(!aView1.m_bViewLock);
}
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id,
sal_uInt32& x, sal_uInt32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -847,10 +847,10 @@ void ScTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_uInt32 id, x, y;
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_uInt32 oldX = x;
+sal_uInt32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", uno::makeAny(id)},
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 02f1968a8232..02856dd0043e 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2627,7 +2627,7 @@ void SdTiledRenderingTest::testSlideDuplicateUndo()
namespace
{
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id,
sal_uInt32& x, sal_uInt32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -2660,10 +2660,10 @@ void SdTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_uInt32 id, x, y;
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_uInt32 oldX = x;
+sal_uInt32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", u
