[Libreoffice-commits] core.git: include/svx svx/source
include/svx/dialog/ThemeDialog.hxx |3 ++-
svx/source/dialog/ThemeDialog.cxx | 19 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 5733cdba90b099637805648b193510268def74be
Author: Szymon Kłos
AuthorDate: Tue Aug 15 12:31:22 2023 +0200
Commit: Szymon Kłos
CommitDate: Mon Aug 28 08:47:55 2023 +0200
Theme dialog: fix crash when closing parent first
When we have 'Add' subdialog opened and we close parent
by clicking 'cancel' - subdialog wasn't closed and we had
a crash on next interaction with 'Add' subdialog
Change-Id: I5865a725e93d7c11aa933b7566a7c584018740ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155715
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gülşah Köse
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156157
Tested-by: Jenkins
diff --git a/include/svx/dialog/ThemeDialog.hxx
b/include/svx/dialog/ThemeDialog.hxx
index 7003fdebf168..9536bdb38d84 100644
--- a/include/svx/dialog/ThemeDialog.hxx
+++ b/include/svx/dialog/ThemeDialog.hxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
@@ -30,7 +31,7 @@ class SVX_DLLPUBLIC ThemeDialog final : public
weld::GenericDialogController
private:
weld::Window* mpWindow;
model::Theme* mpTheme;
-bool mxSubDialog;
+std::shared_ptr mxSubDialog;
std::vector maColorSets;
std::unique_ptr mxValueSetThemeColors;
diff --git a/svx/source/dialog/ThemeDialog.cxx
b/svx/source/dialog/ThemeDialog.cxx
index 99e7c3ad466e..e3a206be6cab 100644
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@@ -8,7 +8,6 @@
*/
#include
-#include
#include
#include
#include
@@ -22,7 +21,6 @@ ThemeDialog::ThemeDialog(weld::Window* pParent, model::Theme*
pTheme)
: GenericDialogController(pParent, "svx/ui/themedialog.ui", "ThemeDialog")
, mpWindow(pParent)
, mpTheme(pTheme)
-, mxSubDialog(false)
, mxValueSetThemeColors(new svx::ThemeColorValueSet)
, mxValueSetThemeColorsWindow(
new weld::CustomWeld(*m_xBuilder, "valueset_theme_colors",
*mxValueSetThemeColors))
@@ -45,7 +43,11 @@ ThemeDialog::ThemeDialog(weld::Window* pParent,
model::Theme* pTheme)
}
}
-ThemeDialog::~ThemeDialog() = default;
+ThemeDialog::~ThemeDialog()
+{
+if (mxSubDialog)
+mxSubDialog->response(RET_CANCEL);
+}
void ThemeDialog::initColorSets()
{
@@ -89,17 +91,16 @@ void ThemeDialog::runThemeColorEditDialog()
if (mxSubDialog)
return;
-auto pDialog = std::make_shared(mpWindow,
*mpCurrentColorSet);
-std::shared_ptr xKeepAlive(shared_from_this());
+mxSubDialog = std::make_shared(mpWindow,
*mpCurrentColorSet);
-mxSubDialog = weld::DialogController::runAsync(pDialog, [this,
pDialog](sal_uInt32 nResult) {
+weld::DialogController::runAsync(mxSubDialog, [this](sal_uInt32 nResult) {
if (nResult != RET_OK)
{
mxAdd->set_sensitive(true);
-mxSubDialog = false;
+mxSubDialog = nullptr;
return;
}
-auto aColorSet = pDialog->getColorSet();
+auto aColorSet = mxSubDialog->getColorSet();
if (!aColorSet.getName().isEmpty())
{
ColorSets::get().insert(aColorSet,
ColorSets::IdenticalNameAction::AutoRename);
@@ -113,7 +114,7 @@ void ThemeDialog::runThemeColorEditDialog()
=
std::make_shared(maColorSets[maColorSets.size() - 1]);
}
mxAdd->set_sensitive(true);
-mxSubDialog = false;
+mxSubDialog = nullptr;
});
}
[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source
sd/Library_sd.mk |1
sd/source/core/ThemeColorChanger.cxx | 19 ++--
sd/source/ui/dlg/UndoThemeChange.cxx | 55 +++
sd/source/ui/inc/UndoThemeChange.hxx | 39
4 files changed, 111 insertions(+), 3 deletions(-)
New commits:
commit d3b06d044fafec0b31ada9ecbaf60f396555fb12
Author: Tomaž Vajngerl
AuthorDate: Sun Aug 27 22:34:13 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 28 07:08:46 2023 +0200
sd: add undo/redo action for changing the model::ColorSet
And add the undo action when changing the theme colors in the
ThemeColorChanger.
Change-Id: Ibeee8aeff420b42fd961e0abd630569e74075585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156178
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 62a1579dc6aa..3d20e14f0ddd 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -249,6 +249,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/dlg/sdtreelb \
sd/source/ui/dlg/titledockwin \
sd/source/ui/dlg/unchss \
+ sd/source/ui/dlg/UndoThemeChange \
sd/source/ui/docshell/docshel2 \
sd/source/ui/docshell/docshel3 \
sd/source/ui/docshell/docshel4 \
diff --git a/sd/source/core/ThemeColorChanger.cxx
b/sd/source/core/ThemeColorChanger.cxx
index 020bc1455f6c..adfacb6a47ac 100644
--- a/sd/source/core/ThemeColorChanger.cxx
+++ b/sd/source/core/ThemeColorChanger.cxx
@@ -24,6 +24,8 @@
#include
#include
#include
+#include
+#include
using namespace css;
@@ -39,7 +41,8 @@ ThemeColorChanger::~ThemeColorChanger() = default;
namespace
{
-void changeTheTheme(SdrPage* pMasterPage, std::shared_ptr
const& pColorSet)
+void changeThemeColors(sd::DrawDocShell* pDocShell, SdrPage* pMasterPage,
+ std::shared_ptr const& pNewColorSet)
{
auto pTheme = pMasterPage->getSdrPageProperties().getTheme();
if (!pTheme)
@@ -47,7 +50,17 @@ void changeTheTheme(SdrPage* pMasterPage,
std::shared_ptr const
pTheme = std::make_shared("Office");
pMasterPage->getSdrPageProperties().setTheme(pTheme);
}
-pTheme->setColorSet(pColorSet);
+
+std::shared_ptr const& pOldColorSet =
pTheme->getColorSet();
+
+auto* pUndoManager = pDocShell->GetUndoManager();
+if (pUndoManager)
+{
+pUndoManager->AddUndoAction(std::make_unique(
+pDocShell->GetDoc(), pMasterPage, pOldColorSet, pNewColorSet));
+}
+
+pTheme->setColorSet(pNewColorSet);
}
bool changeStyle(sd::DrawDocShell* pDocShell, SdStyleSheet* pStyle,
@@ -164,7 +177,7 @@ void
ThemeColorChanger::apply(std::shared_ptr const& pColorSet)
}
}
-changeTheTheme(mpMasterPage, pColorSet);
+changeThemeColors(mpDocShell, mpMasterPage, pColorSet);
pUndoManager->LeaveListAction();
}
diff --git a/sd/source/ui/dlg/UndoThemeChange.cxx
b/sd/source/ui/dlg/UndoThemeChange.cxx
new file mode 100644
index ..1270dc06cab7
--- /dev/null
+++ b/sd/source/ui/dlg/UndoThemeChange.cxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+namespace sd
+{
+UndoThemeChange::UndoThemeChange(SdDrawDocument* pDocument, SdrPage*
pMasterPage,
+ std::shared_ptr const&
pOldColorSet,
+ std::shared_ptr const&
pNewColorSet)
+: SdUndoAction(pDocument)
+, mpMasterPage(pMasterPage)
+, mpOldColorSet(pOldColorSet)
+, mpNewColorSet(pNewColorSet)
+{
+SetComment(SvxResId(RID_SVXSTR_UNDO_THEME_COLOR_CHANGE));
+}
+
+namespace
+{
+std::shared_ptr getTheme(SdrPage* pMasterPage)
+{
+auto pTheme = pMasterPage->getSdrPageProperties().getTheme();
+if (!pTheme)
+{
+pTheme = std::make_shared("Office");
+pMasterPage->getSdrPageProperties().setTheme(pTheme);
+}
+return pTheme;
+}
+}
+
+void UndoThemeChange::Undo()
+{
+auto pTheme = getTheme(mpMasterPage);
+pTheme->setColorSet(mpOldColorSet);
+}
+
+void UndoThemeChange::Redo()
+{
+auto pTheme = getTheme(mpMasterPage);
+pTheme->setColorSet(mpNewColorSet);
+}
+
+} // end sd namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/UndoThemeChange.hxx
b/sd/source/ui/inc/UndoThemeChange.hxx
new file mode 100644
index ..798f2adb50bf
--- /dev/null
+++ b/sd/source/ui/inc/UndoThemeChange.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form
[Libreoffice-commits] core.git: cppcanvas/source include/vcl vcl/source
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 67 ---
include/vcl/outdev.hxx |5 +
vcl/source/outdev/transparent.cxx| 28 +-
3 files changed, 86 insertions(+), 14 deletions(-)
New commits:
commit e7496f41562b75ea9732ca48f9aa0c07b69e424f
Author: Patrick Luby
AuthorDate: Fri Aug 25 08:39:46 2023 -0400
Commit: Patrick Luby
CommitDate: Sun Aug 27 23:11:29 2023 +0200
tdf#150610 fix broken rendering of text meta actions
Even when drawing to a VirtualDevice where antialiasing
is disabled, text will still be drawn with some
antialiased pixels on HiDPI displays. So, expand the
size of the VirtualDevice slightly to capture any of
the pixles drawn past the edges of the destination
bounds.
Change-Id: Ibcba8234708d8784c12f984289ec0a8fcad6694e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156098
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Patrick Luby
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index b8350a8f3944..e0caeaa7cf2a 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -205,6 +205,8 @@ namespace cppcanvas::internal
return false;
}
+::Point aMtfOffsetPoint;
+
// if there's no buffer bitmap, or as soon as the
// total transformation changes, we've got to
// re-render the bitmap
@@ -215,15 +217,59 @@ namespace cppcanvas::internal
{
DBG_TESTSOLARMUTEX();
+// tdf#150610 fix broken rendering of text meta actions
+// Even when drawing to a VirtualDevice where antialiasing
+// is disabled, text will still be drawn with some
+// antialiased pixels on HiDPI displays. So, expand the
+// size of the VirtualDevice slightly to capture any of
+// the pixles drawn past the edges of the destination
+// bounds.
+boolbHasTextActions = false;
+MetaAction* pCurrAct;
+int nCurrActionIndex;
+for( nCurrActionIndex=0,
pCurrAct=mpGroupMtf->FirstAction();
+ pCurrAct && !bHasTextActions;
+ ++nCurrActionIndex, pCurrAct =
mpGroupMtf->NextAction() )
+{
+switch( pCurrAct->GetType() )
+{
+case MetaActionType::TEXT:
+case MetaActionType::TEXTARRAY:
+case MetaActionType::STRETCHTEXT:
+case MetaActionType::TEXTRECT:
+if( ( rSubset.mnSubsetBegin == 0 &&
rSubset.mnSubsetEnd == -1 ) || ( rSubset.mnSubsetBegin <= nCurrActionIndex &&
rSubset.mnSubsetEnd > nCurrActionIndex ) )
+bHasTextActions = true;
+break;
+default:
+break;
+}
+}
+
// output size of metafile
::Size aOutputSizePixel( ::basegfx::fround( aScale.getX()
* maDstSize.getWidth() ),
::basegfx::fround( aScale.getY()
* maDstSize.getHeight() ) );
-// pixel size of cache bitmap: round up to nearest int
-::Size aBitmapSizePixel( static_cast(
aScale.getX() * maDstSize.getWidth() )+1,
- static_cast(
aScale.getY() * maDstSize.getHeight() )+1 );
+sal_Int32 nBitmapExtra;
+if ( bHasTextActions )
+{
+nBitmapExtra = 10;
+aMtfOffsetPoint = ::Point( nBitmapExtra / 2,
nBitmapExtra / 2 );
+}
+else
+{
+// Related tdf#150610 assume antialiasing is enabled
+// Although antialiasing is normally disabled in the
+// VirtualDevice, lines in tdf#150610 will draw past
+// the edge of the VirtualDevice when running a
+// slideshow so always add an extra pixel on the
+// right and bottom edges.
+nBitmapExtra = 1;
+}
-::Point aEmptyPoint;
+// pixel size of cache bitmap: round up to nearest int
+::Point aBitmapPoint;
+::Size aBitmapSizePixel( static_cast(
aS
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/AccessibleControlShape.cxx | 44 +++-
1 file changed, 16 insertions(+), 28 deletions(-)
New commits:
commit aa3eea21fcf302ef4ddbba5841037378945f9d5e
Author: Arnaud VERSINI
AuthorDate: Sun Aug 27 18:44:21 2023 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 27 20:46:23 2023 +0200
svx : replace local function with OUStringLiteral
Change-Id: Ica39cd5b6da3c97dd03aa9844e2dd8d99c279697
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156170
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx
b/svx/source/accessibility/AccessibleControlShape.cxx
index 8fe42db6dada..e625beaec508 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -61,29 +61,18 @@ using namespace ::com::sun::star::container;
namespace
{
-OUString lcl_getNamePropertyName( )
-{
-return "Name";
-}
-OUString lcl_getDescPropertyName( )
-{
-return "HelpText";
-}
-OUString lcl_getLabelPropertyName( )
-{
-return "Label";
-}
-OUString lcl_getLabelControlPropertyName( )
-{
-return "LabelControl";
-}
+constexpr OUStringLiteral NAME_PROPERTY_NAME = u"Name";
+constexpr OUStringLiteral DESC_PROPERTY_NAME = u"HelpText";
+constexpr OUStringLiteral LABEL_PROPERTY_NAME = u"Label";
+constexpr OUStringLiteral LABEL_CONTROL_PROPERTY_NAME = u"LabelControl";
+
// return the property which should be used as AccessibleName
OUString lcl_getPreferredAccNameProperty( const Reference<
XPropertySetInfo >& _rxPSI )
{
-if ( _rxPSI.is() && _rxPSI->hasPropertyByName(
lcl_getLabelPropertyName() ) )
-return lcl_getLabelPropertyName();
+if ( _rxPSI.is() && _rxPSI->hasPropertyByName( LABEL_PROPERTY_NAME ) )
+return LABEL_PROPERTY_NAME;
else
-return lcl_getNamePropertyName();
+return NAME_PROPERTY_NAME;
}
// determines whether or not a state which belongs to the inner context
needs to be forwarded to the "composed"
@@ -325,7 +314,7 @@ OUString
case DRAWING_CONTROL:
{
// check if we can obtain the "Desc" property from the model
-OUString sDesc( getControlModelStringProperty(
lcl_getDescPropertyName() ) );
+OUString sDesc( getControlModelStringProperty( DESC_PROPERTY_NAME
) );
if ( sDesc.isEmpty() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
@@ -333,7 +322,7 @@ OUString
aDG.AddProperty ( "ControlBorder",
DescriptionGenerator::PropertyType::Integer);
}
// ensure that we are listening to the Name property
-m_bListeningForDesc = ensureListeningState( m_bListeningForDesc,
true, lcl_getDescPropertyName() );
+m_bListeningForDesc = ensureListeningState( m_bListeningForDesc,
true, DESC_PROPERTY_NAME );
}
break;
@@ -357,14 +346,14 @@ void SAL_CALL AccessibleControlShape::propertyChange(
const PropertyChangeEvent&
::osl::MutexGuard aGuard( m_aMutex );
// check if it is the name or the description
-if ( _rEvent.PropertyName == lcl_getNamePropertyName()
-|| _rEvent.PropertyName == lcl_getLabelPropertyName() )
+if ( _rEvent.PropertyName == NAME_PROPERTY_NAME
+|| _rEvent.PropertyName == LABEL_PROPERTY_NAME )
{
SetAccessibleName(
CreateAccessibleName(),
AccessibleContextBase::AutomaticallyCreated);
}
-else if ( _rEvent.PropertyName == lcl_getDescPropertyName() )
+else if ( _rEvent.PropertyName == DESC_PROPERTY_NAME )
{
SetAccessibleDescription(
CreateAccessibleDescription(),
@@ -612,7 +601,7 @@ void SAL_CALL AccessibleControlShape::disposing()
{
// ensure we're not listening
m_bListeningForName = ensureListeningState( m_bListeningForName, false,
lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
-m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, false,
lcl_getDescPropertyName() );
+m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, false,
DESC_PROPERTY_NAME );
if ( m_bMultiplexingStates )
stopStateMultiplexing( );
@@ -843,12 +832,11 @@ AccessibleControlShape*
AccessibleControlShape::GetLabeledByControlShape( )
{
if(m_xControlModel.is())
{
-const OUString& rAccLabelControlProperty =
lcl_getLabelControlPropertyName();
Any sCtlLabelBy;
// get the "label by" property value of the control
-if (::comphelper::hasProperty(rAccLabelControlProperty,
m_xControlModel))
+if (::comphelper::hasProperty(LABEL_CONTROL_PROPERTY_NAME,
m_xControlModel))
{
-sCtlLabelBy =
m_xControlModel->getPropertyValue(rAccLabelControl
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx |4 ++--
sc/source/ui/docshell/docsh3.cxx |5 -
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d
Author: Szymon Kłos
AuthorDate: Tue Jul 25 14:35:49 2023 +0200
Commit: Caolán McNamara
CommitDate: Sun Aug 27 20:42:13 2023 +0200
lok: notify only affected tabs on cell resize
When row has automatic height and we type something into
one cell - it may be resized. That caused sending
document size changed callback to all the views, also
affecting all the parts/tabs.
This patch calls that only for affected views which
are looking at modified parts. It will not invalidate
all the tabs when only one is modified.
Change-Id: I93e574cf967d608696c1a95ad8b5a7614973c3f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154891
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156156
Tested-by: Jenkins
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 35304683e724..76286912a698 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1054,7 +1054,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testInvalidateOnInserRowCol)
aView.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:InsertRows", aArgs);
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(-75, 51240, 32212230, 63990),
aView.m_aInvalidations[0]);
// move on the right
@@ -1070,7 +1070,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest,
testInvalidateOnInserRowCol)
aView.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:InsertColumns", aArgs);
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(254925, -15, 32212230, 63990),
aView.m_aInvalidations[0]);
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 789737e5f824..50e99f36f109 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -109,6 +109,7 @@ void ScDocShell::PostPaint( SCCOL nStartCol, SCROW
nStartRow, SCTAB nStartTab,
void ScDocShell::PostPaint( const ScRangeList& rRanges, PaintPartFlags nPart,
sal_uInt16 nExtFlags )
{
ScRangeList aPaintRanges;
+std::set aTabsInvalidated;
for (size_t i = 0, n = rRanges.size(); i < n; ++i)
{
const ScRange& rRange = rRanges[i];
@@ -167,6 +168,7 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges,
PaintPartFlags nPart, sa
}
}
aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2,
nTab2));
+aTabsInvalidated.insert(nTab1);
}
Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));
@@ -176,7 +178,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges,
PaintPartFlags nPart, sa
if ((nPart & (PaintPartFlags::Top | PaintPartFlags::Left)) &&
comphelper::LibreOfficeKit::isActive())
{
ScModelObj* pModel = GetModel();
-SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel);
+for (auto nTab : aTabsInvalidated)
+SfxLokHelper::notifyPartSizeChangedAllViews(pModel, nTab);
}
}
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f2484d071edb415216f5a2d09d146005cdd063e Author: Andrea Gelmini AuthorDate: Sun Aug 27 00:06:19 2023 +0200 Commit: Julien Nabet CommitDate: Sun Aug 27 18:46:57 2023 +0200 Fix typo Change-Id: Iadaed462970f7bc70769664920524ac2c193433a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156152 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 54593eead31f..e836bbee122b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2988,7 +2988,7 @@ bool SwContentTree::HasContentChanged() // Set_id needs to be done here because FillMemberList clears the content type member // list and refills with new data making the previously set id invalid. If there is no -// content change detected the Dispay function will not be called and the tree entry +// content change detected the Display function will not be called and the tree entry // user data will not be set to the new content member pointer address. OUString sSubId(weld::toId(pCnt)); m_xTreeView->set_id(*xEntry, sSubId);
[Libreoffice-commits] core.git: xmlsecurity/README.md
xmlsecurity/README.md |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6d58d3aa8620a23abd0dfdc3cda86aa51bc88268 Author: Andrea Gelmini AuthorDate: Sun Aug 27 00:06:44 2023 +0200 Commit: Julien Nabet CommitDate: Sun Aug 27 18:46:24 2023 +0200 Fix typo Change-Id: I618431147060b4bec7d1957b949dc270eeaafdd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156153 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/xmlsecurity/README.md b/xmlsecurity/README.md index 80259e6dcbf9..5d45e36119eb 100644 --- a/xmlsecurity/README.md +++ b/xmlsecurity/README.md @@ -24,7 +24,7 @@ the exported PDF files. It is also possible to sign existing PDF files. ## Source Primary Contents - * `component`: Main implementation of `DocumentDigitalSignatuers` where the interaction with security environment and certificates occur. + * `component`: Main implementation of `DocumentDigitalSignatures` where the interaction with security environment and certificates occur. * `dialogs`: Certificate & Signatures management dialogs. * `certificatechooser`: Dialog that allows you to find and choose certificates or signatures for encryption. * `certificateviewer`: More detailed information about each certificate.
[Libreoffice-commits] core.git: xmlsecurity/qa
xmlsecurity/qa/create-certs/create-dump-certs.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0142562a1dafb7d1d1b60684934525dbbeb76c0 Author: Andrea Gelmini AuthorDate: Sun Aug 27 00:07:30 2023 +0200 Commit: Julien Nabet CommitDate: Sun Aug 27 18:46:00 2023 +0200 Fix typo Change-Id: I9880e5a7957bf2124f1ce8d9fc0cd3e44e129e65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156154 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/xmlsecurity/qa/create-certs/create-dump-certs.sh b/xmlsecurity/qa/create-certs/create-dump-certs.sh index 4056ddb1a404..95e8de9c6f5a 100644 --- a/xmlsecurity/qa/create-certs/create-dump-certs.sh +++ b/xmlsecurity/qa/create-certs/create-dump-certs.sh @@ -8,7 +8,7 @@ # # This script generates 100 certificates (modifiable) for cases of testing UI latency for instance. # -# Basically, it creates certificates with sender same as reciever following User [number] pattern. +# Basically, it creates certificates with sender same as receiver following User [number] pattern. # for ((i=1; i<=100; i++))
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0da3af62d39d31024133784c736b58cd35e3e23 Author: Olivier Hallot AuthorDate: Sun Aug 27 10:54:21 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Aug 27 15:54:21 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d122af7bbaa552c59a060682331149d102533561 - tdf#155875 Tab'd UI cmds Writer/Format in Help(23) + refactoring + Writer Format menu (part 23) + Grouping of objects Change-Id: I61f6cc5ed587da17db63c3ecb9dd734e3135bf34 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156169 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5c2ad05f8621..d122af7bbaa5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5c2ad05f8621f3af05ea573a529e00e417f6f9d3 +Subproject commit d122af7bbaa552c59a060682331149d102533561 commit e2f1eaa8d86596cda116197e5092e071f05130ef Author: Olivier Hallot AuthorDate: Sun Aug 27 10:54:06 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Aug 27 15:54:06 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5c2ad05f8621f3af05ea573a529e00e417f6f9d3 - Indexing of flip UNO commands Change-Id: I282d7e926eb4114d3ef35274492f2573a27f570f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156168 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c82e14e83133..5c2ad05f8621 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c82e14e8313305ba4fee0cc8662462005cac535d +Subproject commit 5c2ad05f8621f3af05ea573a529e00e417f6f9d3
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/shared/00/00040502.xhp | 62 ++--- source/text/shared/00/00040503.xhp |1 source/text/shared/01/0524.xhp |2 - source/text/shared/01/05240100.xhp |3 + source/text/shared/01/05240200.xhp |3 + source/text/shared/01/0529.xhp | 39 +-- source/text/shared/01/05290100.xhp | 25 +- source/text/shared/01/05290200.xhp | 24 -- source/text/shared/01/05290300.xhp | 19 +++ source/text/shared/01/05290400.xhp | 22 +++-- 10 files changed, 125 insertions(+), 75 deletions(-) New commits: commit d122af7bbaa552c59a060682331149d102533561 Author: Olivier Hallot AuthorDate: Sun Aug 27 10:51:24 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Aug 27 15:54:20 2023 +0200 tdf#155875 Tab'd UI cmds Writer/Format in Help(23) + refactoring + Writer Format menu (part 23) + Grouping of objects Change-Id: I61f6cc5ed587da17db63c3ecb9dd734e3135bf34 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156169 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index c7c553d95f..23ab0b4067 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -479,25 +479,38 @@ CommandCtrl + J Click Fontwork icon on Drawing bar. + + Choose Format - Group. -Open context menu - choose Group. + +Choose Group. + +Choose Draw tab. + + + - - - Choose Shape - Group - Group - - - Choose Format - Group - Group - - - Open context menu - choose Group (for text box and shapes). + + + +Choose Shape - Group - Group + + +Choose Format - Group - Group + + + +Choose Group. + +Choose Draw - Group. + -Icon Group +Icon Group Group @@ -506,7 +519,9 @@ + + Choose Shape - Group - Ungroup. @@ -515,12 +530,15 @@ Choose Format - Group - Ungroup. - Open context menu - choose Ungroup. + + Choose Ungroup. + + -Icon Ungroup +Icon Ungroup Ungroup @@ -530,6 +548,7 @@ + Choose Shape - Group - Exit Group. @@ -538,12 +557,16 @@ Choose Format - Group - Exit Group. - Open context menu - choose Exit Group. + + Choose Exit Group. + + Choose Draw - Exit Group. + -Icon Exit Group +Icon Exit Group Exit Group @@ -553,6 +576,7 @@ + Choose Shape - Group - Enter Group. @@ -561,12 +585,16 @@ Choose Format - Group - Enter Group. -Open context menu - choose Enter Group. + +Choose Enter Group. + +Choose Draw - Enter Group. + -Icon Enter Group +Icon Enter Group Enter Group diff --git a/source/text/shared/01/0529.xhp b/source/text/shared/01/0529.xhp index ce3603cdc1..c8a145f6f9 100644 --- a/source/text/shared/01/0529.xhp +++ b/source/text/shared/01/0529.xhp @@ -1,6 +1,4 @@ - - - -Group +Group /text/shared/01/0529.xhp @@ -30,30 +27,26 @@ + + + group menu + - -Group -Groups keep together selected objects, so that they can be moved or formatted as a single object. + Group +Groups keep together selected objects, so that they can be moved or formatted as a single object. Working with groups -To edit the individual objects of a group, select the group, right-click, and then choose Enter Group - -Group - Enter Group -When you are editing a group, the objects that are not part of the group are faded. -Use Tab and Shift+Tab to move forwards and backwards through the objects in a group. -To exit a group, right-click, and then choose Exit Group - -Group - Exit Group -Group - -Ungroup - -Enter Group - -
[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/text
AllLangHelp_shared.mk |4 + source/text/shared/00/00040503.xhp | 60 - source/text/shared/01/0524.xhp |6 +- source/text/shared/01/05240100.xhp |6 +- source/text/shared/01/05240200.xhp |6 +- source/text/shared/02/0509.xhp | 45 +++--- source/text/shared/02/rotate_180.xhp | 35 ++ source/text/shared/02/rotate_left.xhp | 48 source/text/shared/02/rotate_right.xhp | 48 source/text/shared/menu/submenu_rotateflip.xhp | 53 ++ source/text/swriter/main0105.xhp |3 - 11 files changed, 277 insertions(+), 37 deletions(-) New commits: commit c82e14e8313305ba4fee0cc8662462005cac535d Author: Olivier Hallot AuthorDate: Sat Aug 26 18:37:41 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Aug 27 12:49:44 2023 +0200 tdf#155875 Tab'd UI cmds Writer/Format in Help(21) + refactoring + Writer Format menu (part 21) + rotate or flip submenu Change-Id: I346f7361eec94a89467d572c898697591b1061fa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156155 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 1c80e74deb..dcf7efdcb8 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -545,6 +545,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/02/namedialog \ helpcontent2/source/text/shared/02/paintbrush \ helpcontent2/source/text/shared/02/querypropdlg \ +helpcontent2/source/text/shared/02/rotate_left \ +helpcontent2/source/text/shared/02/rotate_right \ +helpcontent2/source/text/shared/02/rotate_180 \ helpcontent2/source/text/shared/02/stars \ helpcontent2/source/text/shared/02/symbolshapes \ helpcontent2/source/text/shared/04/0101 \ @@ -807,6 +810,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/menu/set_image_background \ helpcontent2/source/text/shared/menu/submenu_image \ helpcontent2/source/text/shared/menu/submenu_lists \ +helpcontent2/source/text/shared/menu/submenu_rotateflip \ helpcontent2/source/text/shared/menu/submenu_spacing \ helpcontent2/source/text/shared/menu/submenu_text \ helpcontent2/source/text/shared/need_help \ diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index 831667539f..616169347e 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -61,22 +61,62 @@ Open context menu of a row header in a database table - choose Table Format. Open context menu of a column header in a database table - choose Column Format. Context menu for a row header in an open database table - Delete Rows. + -Choose Shape - Flip ($[officename] Draw). -Choose Format - Image - Properties - Image tab. -Open context menu - choose Flip (presentation documents). + + + + Choose Format - Rotate or Flip + + + Choose Shape - Flip. + + + Choose Format - Flip. + + + + Choose Rotate or Flip + + -Choose Shape - Flip - Vertically ($[officename] Draw). -Choose Format - Image - Properties - Image tab. -Open context menu - choose Flip - Vertically (presentation documents). + + + + Choose Format - Rotate or Flip - Vertically + + + Choose Shape - Flip - Vertically. + + + Choose Format - Flip - Vertically. + + + + Choose Rotate or Flip - Vertically + + -Choose Shape - Flip - Horizontally ($[officename] Draw). -Choose Format - Image - Properties, and then click the Image tab. -Choose Format - Flip - Horizontally. -Right-click a selected object - choose Flip - Horizontally ($[officename] Impress). + + + + Choose Format - Rotate or Flip - Horizontally + + + Choose Shape - Flip - Horizontally. + + + Choose Format - Flip - Horizontally. + + + + Choose Rotate or Flip - Horizontally + + + Select three or more objects and Choose Shape - Distribute Selection ($[officename] Draw). diff --git a/source/text/shared/01/0524.xhp b/source/text/shared/01/0524.xhp index 61fd1f7146..d49cbb3337 100644 --- a/source/text/shared/01/0524.xhp +++ b/source/text/shared/01/0524.xhp @@ -20,7 +20,7 @@ --> - + @@ -33,10 +33,10 @@ -draw objects; flipping +draw objects; flipping flipping draw objects - + Flip Flips the selected object horizontally, or vertically. diff --git a/source/text/shared/01/05240100.xhp b/source/text/shared/01/05240100.xhp index e124fb042f..4f72bfc44e 100644 --- a/source/text/shared/01/05240100.xhp +++ b/source/text/shared/01/05240100.xhp @@ -24,15 +24,17 @@ - + Flip Ver
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f34750b6a6c0c120aa9f2c66c4243779553c5d02 Author: Olivier Hallot AuthorDate: Sun Aug 27 07:49:44 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Aug 27 12:49:44 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to c82e14e8313305ba4fee0cc8662462005cac535d - tdf#155875 Tab'd UI cmds Writer/Format in Help(21) + refactoring + Writer Format menu (part 21) + rotate or flip submenu Change-Id: I346f7361eec94a89467d572c898697591b1061fa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156155 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e1b40215eecb..c82e14e83133 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e1b40215eecbaa0de54536778d012c6f4f974c7d +Subproject commit c82e14e8313305ba4fee0cc8662462005cac535d commit 38b1ee4268679af8cd3e6b8d9dcf26677076656f Author: Olivier Hallot AuthorDate: Sun Aug 27 07:49:27 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Aug 27 12:49:27 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to e1b40215eecbaa0de54536778d012c6f4f974c7d - tdf#155875 Tab'd UI cmds Writer/Format in Help(20) + refactoring + Writer Format menu (part 20) + Arrange menu covering other modules too. Change-Id: Ib875d27d83ac36a23c6f2e72ce44b22c9e82d2bb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156125 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index bc1437b6ac1d..e1b40215eecb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bc1437b6ac1d9a51eea44fd3b7fe2f290e58cbba +Subproject commit e1b40215eecbaa0de54536778d012c6f4f974c7d
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040501.xhp | 204 --- source/text/shared/01/0525.xhp | 45 +-- source/text/shared/01/05250100.xhp | 17 +- source/text/shared/01/05250200.xhp | 16 +- source/text/shared/01/05250300.xhp | 16 +- source/text/shared/01/05250400.xhp | 15 +- source/text/shared/01/05250500.xhp | 15 +- source/text/shared/01/05250600.xhp | 16 +- source/text/simpress/00/0413.xhp | 27 +++- source/text/simpress/01/05250500.xhp |5 source/text/simpress/01/05250600.xhp |5 11 files changed, 263 insertions(+), 118 deletions(-) New commits: commit e1b40215eecbaa0de54536778d012c6f4f974c7d Author: Olivier Hallot AuthorDate: Sat Aug 26 12:22:32 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Aug 27 12:49:27 2023 +0200 tdf#155875 Tab'd UI cmds Writer/Format in Help(20) + refactoring + Writer Format menu (part 20) + Arrange menu covering other modules too. Change-Id: Ib875d27d83ac36a23c6f2e72ce44b22c9e82d2bb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156125 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040501.xhp b/source/text/shared/00/00040501.xhp index 62106cad03..ae379c7706 100644 --- a/source/text/shared/00/00040501.xhp +++ b/source/text/shared/00/00040501.xhp @@ -193,14 +193,32 @@ + -Choose Format - Arrange ($[officename] Writer, $[officename] Calc). -Open context menu - choose Arrange ($[officename] Impress, $[officename] Draw). -Choose Shape - Arrange ($[officename] Draw). + + + +Choose Shape - Arrange. + + +Choose Format - Arrange. + + + +Choose Arrange. + +Choose Image tab. +Choose Object tab. + + +Choose Home - Arrange. + + + -Icon Arrange +Icon Arrange Arrange @@ -208,11 +226,36 @@ + -Choose Format - Arrange - Bring to Front ($[officename] Writer, $[officename] Calc). -Choose Shape - Arrange - Bring to Front ($[officename] Draw). -Shift+CommandCtrl+plus sign ($[officename] Impress, $[officename] Draw). -Open context menu - choose Arrange - Bring to Front ($[officename] Impress). + + + +Choose Shape - Arrange - Bring to Front. + + +Choose Format - Arrange - Bring to Front. + + + +Choose Arrange - Bring to Front. + +Choose Image - Bring to Front. +Choose Object - Bring to Front + + +Choose Home - Arrange - Bring to Front. + + + + + + + +Shift + CommandCtrl + plus sign. + + + @@ -227,51 +270,127 @@ -Choose Format - Arrange - Bring Forward ($[officename] Writer, $[officename] Calc). -Choose Shape - Arrange - Bring Forward ($[officename] Draw). -CommandCtrl+plus sign ($[officename] Impress, $[officename] Draw) -Open context menu - choose Arrange - Bring Forward ($[officename] Impress). + + + + +Choose Shape - Arrange - Bring Forward. + +Choose Arrange - Bring Forward. + +CommandCtrl + plus sign. + +Choose Image - Bring Forward. +Choose Object - Bring Forward. + +Choose Home - Arrange - Bring Forward. + + + + + + +Choose Format - Arrange - Forward One. + +Choose Arrange - Forward One. + +Choose Image - Forward One. +Choose Object - Forward One. + + + - - -Icon Bring Forward - - -Bring Forward - - + + +Icon Bring Forward + + +Bring Forward + + + -Choose Format - Arrange - Send Backward ($[officename] Writer, $[officenam
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8cd30c86eec55d93dbd6c5fcf96cbbafc502de7b Author: Olivier Hallot AuthorDate: Sun Aug 27 07:48:59 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Aug 27 12:48:59 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to bc1437b6ac1d9a51eea44fd3b7fe2f290e58cbba - tdf#155875 Tab'd UI cmds Writer/Format in Help(19) + refactoring + Writer Format menu (part 19) + Wrap text Change-Id: Idd607e5a4a5443530188e0064e1b564e08375554 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156112 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1120b5793d45..bc1437b6ac1d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1120b5793d455cf4bda04fb01c8ee3b62934e368 +Subproject commit bc1437b6ac1d9a51eea44fd3b7fe2f290e58cbba
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp | 11 ++ source/text/swriter/01/05060200.xhp | 172 source/text/swriter/guide/wrap.xhp | 31 +++--- 3 files changed, 125 insertions(+), 89 deletions(-) New commits: commit bc1437b6ac1d9a51eea44fd3b7fe2f290e58cbba Author: Olivier Hallot AuthorDate: Fri Aug 25 12:19:29 2023 -0300 Commit: Olivier Hallot CommitDate: Sun Aug 27 12:48:59 2023 +0200 tdf#155875 Tab'd UI cmds Writer/Format in Help(19) + refactoring + Writer Format menu (part 19) + Wrap text Change-Id: Idd607e5a4a5443530188e0064e1b564e08375554 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156112 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index c625736202..d905c96314 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -204,12 +204,23 @@ Click on the Selected Object Size area, Position and Size tab. + + + Choose Format - Wrap. Choose Format - Image - Properties - Wrap tab. Choose Format - Frame and Object - Properties - Wrap tab. Choose Insert - Frame - Frame - Wrap tab. Choose Format - Wrap - Edit - Wrap tab. + + Choose Wrap. + Choose Wrap - Edit - Wrap tab. + + Choose Image - Wrap tab. + + On the Properties panel, choose Wrap deck. + Choose Format - Wrap - Edit Contour. Choose Format - Image - Properties - Hyperlink tab. diff --git a/source/text/swriter/01/05060200.xhp b/source/text/swriter/01/05060200.xhp index 0e059fe40a..8e09f7c707 100644 --- a/source/text/swriter/01/05060200.xhp +++ b/source/text/swriter/01/05060200.xhp @@ -22,168 +22,192 @@ -Wrap +Wrap /text/swriter/01/05060200.xhp + + + + + + + +wrap text;around objects + - - - - - - -Wrap -Specify the way you want text to wrap around an object. You can also specify the spacing between the text and the object. +Wrap +Specify the way you want text to wrap around an object. You can also specify the spacing between the text and the object. -To wrap text around a table, place the table in a frame, and then wrap the text around the frame. +To wrap text around a table, place the table in a frame, and then wrap the text around the frame. Settings - - + +wrap;wrap off +wrap text;none + + + None -Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object. +Places the object on a separate line in the document. The Text in the document appears above and below the object, but not on the sides of the object. - -Icon - + +Icon None -None +None - - + + + +wrap;wrap left +wrap text;before + Before -Wraps text on the left side of the object if there is enough space. +Wraps text on the left side of the object if there is enough space. - -Icon - + +Icon Before -Before +Before - - + + + +wrap;wrap right +wrap text;after + After -Wraps text on the right side of the object if there is enough space. +Wraps text on the right side of the object if there is enough space. - -Icon - + +Icon After -After +After - - + + + +wrap;wrap parallel +wrap text;parallel + Parallel -Wraps text on all four sides of the border frame of the object. +Wraps text on all four sides of the border frame of the object. - -Icon - + +Icon Parallel -Parallel +Parallel - - + + + +wrap;wrap through +wrap text;through + Through -Places the object in front of the text. +Places the object in front of the text. - -Icon - + +Icon Through -Through +Through - - + + + +wrap;wrap optimal +wrap text;optimal + Optimal -Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped. +Automatically wraps text to the left, to the right, or on all four sides of the border frame of the object. If the distance between the object and the page margin is less than 2 cm, the text is not wrapped. - -Icon - + +Icon Optimal -Optimal +Optimal Options -Specify the text wrap options. - - +Specify the text wrap options. + + First Paragraph -Starts a new paragraph below the object after you press Enter. The space between the paragraphs is determined by the size of the object. +Starts a new paragraph below the object after you press Enter. The space between the paragraphs is determined by the size of the object. - - + + In Background -Moves the selected object to the background. This option is only available if you selected the Through wrap type. +Moves
[Libreoffice-commits] core.git: include/svx oox/source sc/qa sc/source sd/qa sd/source svx/source sw/qa sw/source
include/svx/svdmodel.hxx |5
include/svx/svdpage.hxx|4 +--
oox/source/drawingml/theme.cxx |2 -
sc/qa/unit/ucalc_DocumentThemes.cxx|8 +-
sc/qa/unit/ucalc_sparkline.cxx |4 ---
sc/source/filter/excel/excdoc.cxx | 26
sc/source/filter/oox/workbookfragment.cxx |5 +---
sc/source/ui/docshell/docsh.cxx| 14 ++-
sc/source/ui/theme/ThemeColorChanger.cxx | 16
sc/source/ui/undo/UndoThemeChange.cxx | 36 +
sc/source/ui/view/tabvwsh3.cxx |9 +++
sd/qa/unit/ThemeTest.cxx |2 -
sd/source/core/ThemeColorChanger.cxx |4 +--
sd/source/filter/eppt/pptx-epptooxml.cxx |2 -
sd/source/ui/docshell/docshell.cxx |4 +--
sd/source/ui/unoidl/unopage.cxx|8 +++---
sd/source/ui/view/drviews2.cxx |2 -
svx/source/form/fmmodel.cxx|8 +-
svx/source/svdraw/svdmodel.cxx |2 +
svx/source/svdraw/svdpage.cxx | 36 -
sw/qa/core/theme/ThemeTest.cxx | 22 +
sw/source/core/model/ThemeColorChanger.cxx |6 ++--
sw/source/core/undo/UndoThemeChange.cxx|8 +++---
sw/source/core/unocore/unodraw.cxx |4 +--
sw/source/filter/ww8/docxexport.cxx|6 +++-
sw/source/filter/xml/xmlfmte.cxx |3 +-
sw/source/uibase/app/docst.cxx |6 ++--
sw/source/uibase/shells/basesh.cxx | 10
28 files changed, 129 insertions(+), 133 deletions(-)
New commits:
commit d150b7a60d7be4b09a838ae4c038e78509f75126
Author: Tomaž Vajngerl
AuthorDate: Sat Aug 26 15:35:40 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Aug 27 12:15:14 2023 +0200
Change theme location to SdrModel and SdrPage (master page only)
In Writer and Calc we only have one theme per document, so the
theme can be stored inside the SdrModel. For Imporess/Draw the
theme is defined per master page, so it needs to be stored on the
master page. This changes the implementation to reflect that.
In addition refactor all the usages in writer and calc to get and
set the theme to SdrModel, when needed and rename the methods on
the SdrPageProperties from {Get,Set}Theme to {get,set}Theme.
Change-Id: I0cc3b332c029c28d15f8cda748c578c2a54a5c61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156128
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 69beb4646175..a5a3a10a2763 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -96,6 +96,11 @@ namespace model
class Theme;
}
+namespace svx
+{
+class IThemeColorChanger;
+}
+
constexpr const sal_Unicode DEGREE_CHAR = u'\x00B0'; /* U+00B0 DEGREE SIGN */
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 6a65712719f1..97142d661296 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -348,8 +348,8 @@ public:
void SetStyleSheet(SfxStyleSheet* pStyleSheet);
SfxStyleSheet* GetStyleSheet() const { return mpStyleSheet;}
-void SetTheme(std::shared_ptr const& pTheme);
-std::shared_ptr const& GetTheme() const;
+void setTheme(std::shared_ptr const& pTheme);
+std::shared_ptr const& getTheme() const;
void dumpAsXml(xmlTextWriterPtr pWriter) const;
};
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index e8511a32eb5d..32ae9b4349da 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -120,7 +120,7 @@ void Theme::addTheme(const
css::uno::Reference& xDrawPa
if (!pPage)
return;
-pPage->getSdrPageProperties().SetTheme(getTheme());
+pPage->getSdrPageProperties().setTheme(getTheme());
}
} // namespace oox::drawingml
diff --git a/sc/qa/unit/ucalc_DocumentThemes.cxx
b/sc/qa/unit/ucalc_DocumentThemes.cxx
index f40116742d23..664b06a879f9 100644
--- a/sc/qa/unit/ucalc_DocumentThemes.cxx
+++ b/sc/qa/unit/ucalc_DocumentThemes.cxx
@@ -37,9 +37,7 @@ CPPUNIT_TEST_FIXTURE(DocumentThemesTest, testGetTheme)
ScDrawLayer* pDrawLayer = m_pDoc->GetDrawLayer();
CPPUNIT_ASSERT(pDrawLayer);
-const SdrPage* pPage(pDrawLayer->GetPage(0));
-CPPUNIT_ASSERT(pPage);
-auto const& pTheme = pPage->getSdrPageProperties().GetTheme();
+auto const& pTheme = pDrawLayer->getTheme();
CPPUNIT_ASSERT(pTheme);
}
@@ -50,9 +48,7 @@ CPPUNIT_TEST_FIXTURE(DocumentThemesTest, testChangeTheme)
ScDrawLayer* pDrawLayer = m_pDoc->GetDrawLayer();
CPPUNIT_ASSERT(pDrawLayer);
-const SdrPage* pPage(pDrawLayer->GetPage(0));
-CPPUNIT_ASSERT(pPage);
-auto const& pTheme = pPage->getSdrPageProperties().GetTheme();
+auto const& pTheme = pDrawLayer->getTheme();
C
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sw/qa test/Library_subsequenttest.mk test/source
include/test/text/footnote.hxx | 27 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv |1
qadevOOo/tests/java/ifc/text/_Footnote.java | 47
sw/qa/api/SwXFootnote.cxx |5 +
test/Library_subsequenttest.mk |1
test/source/text/footnote.cxx | 31 +++
7 files changed, 63 insertions(+), 50 deletions(-)
New commits:
commit 8496f805da8ea9f2585b7485b448dda52557db9a
Author: anfanite396
AuthorDate: Thu Aug 24 19:50:12 2023 +0530
Commit: Tomaž Vajngerl
CommitDate: Sun Aug 27 10:51:38 2023 +0200
tdf#45904: Move _Footnote Java tests to C++
Change-Id: I1e69267a72296f55fac12326ec69d3c29e63561a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156055
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/test/text/footnote.hxx b/include/test/text/footnote.hxx
new file mode 100644
index ..9970ee43cc3b
--- /dev/null
+++ b/include/test/text/footnote.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST Footnote
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual ~Footnote();
+void testFootnoteProperties();
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d71eb77d943b..65ed25b15758 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -594,7 +594,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/text/_Defaults \
qadevOOo/tests/java/ifc/text/_DocumentIndex \
qadevOOo/tests/java/ifc/text/_DocumentSettings \
-qadevOOo/tests/java/ifc/text/_Footnote \
qadevOOo/tests/java/ifc/text/_FootnoteSettings \
qadevOOo/tests/java/ifc/text/_GenericTextDocument \
qadevOOo/tests/java/ifc/text/_LineNumberingProperties \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
index 125fef2ec96d..98181e7e1929 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXFootnote.csv
@@ -14,4 +14,3 @@
"SwXFootnote";"com::sun::star::text::XTextContent";"getAnchor()"
"SwXFootnote";"com::sun::star::text::XText";"insertTextContent()"
"SwXFootnote";"com::sun::star::text::XText";"removeTextContent()"
-"SwXFootnote";"com::sun::star::text::Footnote";"ReferenceId#optional"
diff --git a/qadevOOo/tests/java/ifc/text/_Footnote.java
b/qadevOOo/tests/java/ifc/text/_Footnote.java
deleted file mode 100644
index 4af1725644be..
--- a/qadevOOo/tests/java/ifc/text/_Footnote.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.text;
-
-import lib.MultiPropertyTest;
-
-/**
-* Testing com.sun.star.text.Footnote
-* service properties :
-*
-* ReferenceId
-*
-* Properties testing is automated by lib.MultiPropertyTest.
-* @see com.sun.star.text.Footnote
-*/
-public class _Footnote extends MultiPropertyTest {
-
-/**
-* This property can be VOID, and in case if it is so new
-* value must be defined.
-*/
-public void _ReferenceId() {
-final Short val1 = Short.valueOf( (short) 1);
-final Short val2 = Short.valueOf( (short) 2);
-
-log.println("Testing with custom Property tester");
-testProperty("ReferenceId", val1, val2);
-}
-
-} //finish class _Footnote
-
diff --git a/sw/qa/api/SwXFootnote.cxx b/sw/qa/api/SwXFootnote.cxx
index ea3ec0231e55..5c6f7418d941 100644
--- a/sw/qa/api/SwXFootnote.cxx
+++ b/sw/qa/api/SwXFootnote.cxx
@@ -9,6 +9,7
