[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/basedlgs.cxx |2 +-
 svx/source/dialog/srchdlg.cxx   |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 82f473c87da72a3d7aac80249d408a02caa25afa
Author: Caolán McNamara 
AuthorDate: Thu Mar 25 10:43:49 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 25 12:45:20 2021 +0100

fix crash on pressing esc in search/replace dialog

activate can be called during tear down as focus is transferred between
widgets as they die

Change-Id: Ia8d65b4d3c2e0ea4b8238e598ace0cc0d0e7d738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113080
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index fcebc6ea041c..1f10f73ce5e4 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -118,7 +118,7 @@ IMPL_LINK_NOARG(SfxDialogController, FocusChangeHdl, 
weld::Container&, void)
 
 void SfxModelessDialogController::Activate()
 {
-if (!m_xImpl)
+if (!m_xImpl || !m_xImpl->pMgr)
 return;
 m_pBindings->SetActiveFrame(m_xImpl->pMgr->GetFrame());
 m_xImpl->pMgr->Activate_Impl();
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 06836388a33c..2045730344d4 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -373,6 +373,8 @@ void SvxSearchDialog::ChildWinDispose()
 SvxSearchDialog::~SvxSearchDialog()
 {
 m_aPresentIdle.Stop();
+pSearchItem.reset();
+pImpl.reset();
 }
 
 void SvxSearchDialog::Construct_Impl()
@@ -598,7 +600,6 @@ bool SvxSearchDialog::IsOtherOptionsExpanded() const
 void SvxSearchDialog::Activate()
 {
 // apply possible transliteration changes of the SvxSearchItem member
-DBG_ASSERT( pSearchItem, "SearchItem missing" );
 if (pSearchItem)
 {
 m_xMatchCaseCB->set_active( pSearchItem->GetExact() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Noel (via logerrit)]

 sfx2/source/control/dispatch.cxx|4 +-
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |4 +-
 svx/source/engine3d/dragmt3d.cxx|8 ++--
 svx/source/engine3d/scene3d.cxx |   12 ++
 svx/source/fmcomp/gridcell.cxx  |4 +-
 svx/source/form/fmexpl.cxx  |8 ++--
 svx/source/form/navigatortree.cxx   |   30 +---
 svx/source/form/navigatortreemodel.cxx  |   27 ++
 svx/source/sdr/contact/viewcontactofsdrobj.cxx  |9 ++--
 svx/source/sdr/properties/properties.cxx|4 +-
 svx/source/svdraw/svdedtv1.cxx  |4 --
 svx/source/svdraw/svdmrkv.cxx   |4 +-
 svx/source/svdraw/svdotxat.cxx  |   16 
 svx/source/svdraw/svdotxdr.cxx  |8 ++--
 svx/source/svdraw/svdpage.cxx   |6 +--
 svx/source/unodraw/unomod.cxx   |4 +-
 svx/source/unodraw/unopage.cxx  |   10 ++---
 17 files changed, 72 insertions(+), 90 deletions(-)

New commits:
commit 530d0e0569342742d7bcf529b77ba4a409cf01a9
Author: Noel 
AuthorDate: Tue Oct 13 11:30:37 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 13 13:29:08 2020 +0200

static_cast after dynamic_cast

Change-Id: If93fa126f10393a250cc1ad64bee28e84c42a6b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104226
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9c6f3c5200c2..6e6104883fe0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1964,8 +1964,8 @@ SfxModule* SfxDispatcher::GetModule() const
 SfxShell *pSh = GetShell(nShell);
 if ( pSh == nullptr )
 return nullptr;
-if ( dynamic_cast< const SfxModule *>( pSh ) !=  nullptr )
-return static_cast(pSh);
+if ( auto pModule = dynamic_cast( pSh ) )
+return pModule;
 }
 }
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 6a88afe524df..8ccc0337389c 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -554,9 +554,9 @@ static basegfx::B2DPolyPolygon GetOutlinesFromShape2d( 
const SdrObject* pShape2d
 while( aObjListIter.IsMore() )
 {
 SdrObject* pPartObj = aObjListIter.Next();
-if ( dynamic_cast( pPartObj) !=  nullptr )
+if ( auto pPathObj = dynamic_cast( pPartObj))
 {
-basegfx::B2DPolyPolygon 
aCandidate(static_cast(pPartObj)->GetPathPoly());
+basegfx::B2DPolyPolygon aCandidate(pPathObj->GetPathPoly());
 if(aCandidate.areControlPointsUsed())
 {
 aCandidate = 
basegfx::utils::adaptiveSubdivideByAngle(aCandidate);
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 9e7425a02ed0..3020e19a4ab0 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -338,9 +338,9 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
 
 // Get modifier
 sal_uInt16 nModifier = 0;
-if(dynamic_cast(()))
+if(auto pDragView = dynamic_cast(()))
 {
-const MouseEvent& rLastMouse = 
static_cast(getSdrDragView()).GetMouseEvent();
+const MouseEvent& rLastMouse = pDragView->GetMouseEvent();
 nModifier = rLastMouse.GetModifier();
 }
 
@@ -520,9 +520,9 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
 // Get modifier
 sal_uInt16 nModifier(0);
 
-if(dynamic_cast(()))
+if(auto pDragView = dynamic_cast(()))
 {
-const MouseEvent& rLastMouse = 
static_cast(getSdrDragView()).GetMouseEvent();
+const MouseEvent& rLastMouse = pDragView->GetMouseEvent();
 nModifier = rLastMouse.GetModifier();
 }
 
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 09a7bbdfa973..9cd91246071a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -116,10 +116,10 @@ Imp3DDepthRemapper::Imp3DDepthRemapper(E3dScene const & 
rScene)
 
 if(pCandidate)
 {
-if(dynamic_cast< const E3dCompoundObject*>(pCandidate))
+if(auto pCompoundObj = dynamic_cast< const 
E3dCompoundObject*>(pCandidate))
 {
 // single 3d object, calc depth
-const double 
fMinimalDepth(getMinimalDepthInViewCoordinates(static_cast< const 
E3dCompoundObject& >(*pCandidate)));
+const double 
fMinimalDepth(getMinimalDepthInViewCoordinates(*pCompoundObj));
 ImpRemap3DDepth 

[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara (via logerrit)]

 sfx2/source/inc/templdgi.hxx |1 -
 svx/source/inc/fmexch.hxx|3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 583058cb5944e9e64552bb39b732ad19b33d0888
Author: Caolán McNamara 
AuthorDate: Fri Aug 7 11:56:50 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 7 20:10:32 2020 +0200

drop unneeded forward declares

Change-Id: I32c8f5fd73249bdd7a233801f6a23b280b8df50c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100305
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 57b95edf9191..03a499c1aca2 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -44,7 +44,6 @@ class SfxTemplateItem;
 class SfxBindings;
 class SfxStyleSheetBase;
 class SfxStyleSheetBasePool;
-class SvTreeListBox ;
 class StyleTreeListBox_Impl;
 class SfxTemplateDialog_Impl;
 class SfxCommonTemplateDialog_Impl;
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 8eb65854e564..22066c5c887b 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -34,9 +34,6 @@
 #include 
 #include 
 
-class SvTreeListEntry;
-class SvTreeListBox;
-
 namespace svxform
 {
 typedef ::std::set> ListBoxEntrySet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source sw/source

[Maxim Monastirsky (via logerrit)]

 sfx2/source/control/emojipopup.cxx|2 +-
 sfx2/source/dialog/charmappopup.cxx   |2 +-
 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx |2 +-
 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx |2 +-
 svx/source/tbxctrls/layctrl.cxx   |4 ++--
 sw/source/uibase/sidebar/PageColumnPopup.cxx  |2 +-
 sw/source/uibase/sidebar/PageMarginPopup.cxx  |2 +-
 sw/source/uibase/sidebar/PageOrientationPopup.cxx |2 +-
 sw/source/uibase/sidebar/PageSizePopup.cxx|2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit da09a3cf14ea2c7690b98ec32639125087bcf18f
Author: Maxim Monastirsky 
AuthorDate: Sun Aug 2 18:45:21 2020 +0300
Commit: Maxim Monastirsky 
CommitDate: Mon Aug 3 09:58:50 2020 +0200

Remove pointless check

This check was originally introduced by me for a few toolbar
controllers (save, underline, currency), as an attempt to reuse
the same controllers also for non-split buttons (see tdf#98745
and tdf#101672). But since then it was copy-pasted to other
places where it probably makes no sense.

Change-Id: I7af2a3f5864ced88c91f330e87f32046d0c21383
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99960
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sfx2/source/control/emojipopup.cxx 
b/sfx2/source/control/emojipopup.cxx
index a0161fe2dbd7..7254d844a831 100644
--- a/sfx2/source/control/emojipopup.cxx
+++ b/sfx2/source/control/emojipopup.cxx
@@ -31,7 +31,7 @@ void EmojiPopup::initialize( const css::uno::Sequence< 
css::uno::Any >& rArgumen
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
diff --git a/sfx2/source/dialog/charmappopup.cxx 
b/sfx2/source/dialog/charmappopup.cxx
index 7788a45c73c0..f8a791889c37 100644
--- a/sfx2/source/dialog/charmappopup.cxx
+++ b/sfx2/source/dialog/charmappopup.cxx
@@ -35,7 +35,7 @@ void CharmapPopup::initialize( const css::uno::Sequence< 
css::uno::Any >& rArgum
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 28bbf44c13dc..2d2e59f79f78 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -43,7 +43,7 @@ void SvxLineSpacingToolBoxControl::initialize( const 
css::uno::Sequence< css::un
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx 
b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 5c1bf67dcc89..7957b1794e46 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -39,7 +39,7 @@ void TextCharacterSpacingPopup::initialize( const 
css::uno::Sequence< css::uno::
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 88b110e8c1f1..a08029b4be88 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -695,7 +695,7 @@ void SvxTableToolBoxControl::initialize( const 
css::uno::Sequence< css::uno::Any
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
@@ -753,7 +753,7 @@ void SvxColumnsToolBoxControl::initialize( const 
css::uno::Sequence< css::uno::A
 
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if (getToolboxId(nId, ) && pToolBox->GetItemCommand(nId) == 
m_aCommandURL)
+if (getToolboxId(nId, ))
 pToolBox->SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | 
pToolBox->GetItemBits(nId));
 }
 
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx 
b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index b0b9e07fc883..e0fcd0d055c5 100644
--- 

[Libreoffice-commits] core.git: sfx2/source svx/source

[Yusuf Keten (via logerrit)]

 sfx2/source/doc/doctemplates.cxx |4 ++--
 svx/source/dialog/charmap.cxx|4 ++--
 svx/source/svdraw/svdedtv2.cxx   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c7de89df5efc4b2af1f81c00befcc957a7e22ca6
Author: Yusuf Keten 
AuthorDate: Sat Jan 4 15:30:01 2020 +0300
Commit: Michael Stahl 
CommitDate: Mon Jan 13 14:04:42 2020 +0100

tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer types

Change-Id: Ia45fb0bc882411fe0bfcd1e83932d187b4873ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86214
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index aba17d40360b..1247d6cfab88 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2580,8 +2580,8 @@ void SfxDocTplService_Impl::addGroupToHierarchy( 
GroupData_Impl *pGroup )
 setProperty( aGroup, TARGET_DIR_URL, makeAny( pGroup->getTargetURL() ) 
);
 pGroup->setHierarchyURL( aNewGroupURL );
 
-sal_uIntPtr nCount = pGroup->count();
-for ( sal_uIntPtr i=0; icount();
+for ( size_t i = 0; i < nCount; i++ )
 {
 DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i );
 addToHierarchy( pGroup, pData ); // add entry to hierarchy
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index ff323461cfa5..403d748a231e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -358,9 +358,9 @@ int SvxShowCharSet::FirstInView() const
 
 int SvxShowCharSet::LastInView() const
 {
-sal_uIntPtr nIndex = FirstInView();
+sal_uInt32 nIndex = FirstInView();
 nIndex += ROW_COUNT * COLUMN_COUNT - 1;
-sal_uIntPtr nCompare = 
sal::static_int_cast(mxFontCharMap->GetCharCount() - 1);
+sal_uInt32 nCompare = mxFontCharMap->GetCharCount() - 1;
 if (nIndex > nCompare)
 nIndex = nCompare;
 return nIndex;
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 286b74bb5a23..72a743fda6c8 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2093,7 +2093,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo 
*pProgrInfo)
 SdrPageView* pPV=pM->GetPageView();
 SdrObjList*  pOL=pObj->getParentSdrObjListFromSdrObject();
 const size_t nInsPos=pObj->GetOrdNum()+1;
-sal_uIntPtr  nInsCnt=0;
+size_t  nInsCnt=0;
 tools::Rectangle aLogicRect;
 
 SdrGrafObj*  pGraf = dynamic_cast( pObj );
@@ -2142,7 +2142,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo 
*pProgrInfo)
 if (aGeoStat.nRotationAngle)
 aGeoStat.RecalcSinCos();
 
-for (sal_uIntPtr i = 0; i < nInsCnt; i++)
+for (size_t i = 0; i < nInsCnt; i++)
 {
 if (bUndo)
 
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Szymon Kłos (via logerrit)]

 sfx2/source/view/ipclient.cxx |6 ++
 svx/source/svdraw/svdmrkv.cxx |7 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b3293953b885be5ab1b67c00552b3c399eb48814
Author: Szymon Kłos 
AuthorDate: Wed May 29 15:29:04 2019 +0200
Commit: Michael Meeks 
CommitDate: Mon Dec 16 15:02:07 2019 +0100

lok: send message when in place editing

Fixup mis-merge into the wrong module of
"lok: send message when in place editing"

This reverts commit a5acbbdbce32b25000ad2f1429c7bc307c7d28cb.

Change-Id: Ia7ee0b70e2c491274d9fa7eb5808396e83fb3e52
Reviewed-on: https://gerrit.libreoffice.org/80682
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/82151
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 289ed49e9194..02d6910e02bc 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -197,6 +197,12 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const 
document::EventObject& a
 
 if ( m_pClient && aEvent.EventName == "OnVisAreaChanged" && m_nAspect != 
embed::Aspects::MSOLE_ICON )
 {
+if(SfxViewShell* pViewShell = m_pClient->GetViewShell())
+{
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, 
"INPLACE");
+SfxLokHelper::notifyOtherViews(pViewShell, 
LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE");
+}
+
 m_pClient->FormatChanged(); // for Writer when format of the object is 
changed with the area
 m_pClient->ViewChanged();
 m_pClient->Invalidate();
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0be2473a44ca..4f9e748dd922 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -767,12 +767,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 
 if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || 
pSdrOle2Obj->isUiActive()))
 {
-if(pViewShell)
-{
-
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, 
"INPLACE");
-SfxLokHelper::notifyOtherViews(pViewShell, 
LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE");
-return;
-}
+return;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Szymon Kłos (via logerrit)]

 sfx2/source/view/lokhelper.cxx |   26 ++
 svx/source/xoutdev/xattr.cxx   |8 
 2 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 255ee67072aefdd31265df1cc462821797ef76e5
Author: Szymon Kłos 
AuthorDate: Tue Nov 26 15:02:48 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Nov 28 11:00:10 2019 +0100

jsdialogs: add generic commandName

Change-Id: Icefe02e7682cf47da0bcc5efdfc3ab1019c8abf3
Reviewed-on: https://gerrit.libreoffice.org/83772
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit a1f1e5545dfcf73c8fcf286a9a1e14c0321e8330)
Reviewed-on: https://gerrit.libreoffice.org/83964
Tested-by: Jenkins

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index ee032c6f4977..acb4fea6f49a 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -24,6 +24,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -183,6 +186,24 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell* 
pThisView, int nType, const OS
 }
 }
 
+namespace {
+OUString lcl_getNameForSlot(const SfxViewShell* pShell, sal_uInt16 nWhich)
+{
+if (pShell->GetFrame())
+{
+const SfxSlot* pSlot = 
SfxSlotPool::GetSlotPool(pShell->GetFrame()).GetSlot(nWhich);
+if (pSlot)
+{
+OUStringBuffer sUnoCommand(".uno:");
+sUnoCommand.append(OStringToOUString(pSlot->GetUnoName(), 
RTL_TEXTENCODING_ASCII_US));
+return sUnoCommand.makeStringAndClear();
+}
+}
+
+return "";
+}
+}
+
 void SfxLokHelper::sendUnoStatus(const SfxViewShell* pShell, const SfxItemSet* 
pSet)
 {
 if (!pShell || !pSet)
@@ -197,6 +218,11 @@ void SfxLokHelper::sendUnoStatus(const SfxViewShell* 
pShell, const SfxItemSet* p
 if (pSet->HasItem(nWhich) && SfxItemState::SET >= 
pSet->GetItemState(nWhich))
 {
 boost::property_tree::ptree aItem = pSet->Get(nWhich).dumpAsJSON();
+
+OUString sCommand = lcl_getNameForSlot(pShell, nWhich);
+if (!sCommand.isEmpty())
+aItem.put("commandName", sCommand);
+
 if (!aItem.empty())
 anArray.push_back(std::make_pair("", aItem));
 }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 48eb70474e28..327321bbc7dc 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1839,7 +1839,7 @@ boost::property_tree::ptree XFillStyleItem::dumpAsJSON() 
const
 boost::property_tree::ptree aTree = SfxPoolItem::dumpAsJSON();
 
 if (Which() == XATTR_FILLSTYLE)
-aTree.put("which", ".uno:FillStyle");
+aTree.put("commandName", ".uno:FillStyle");
 
 OUString sValue;
 
@@ -1863,7 +1863,7 @@ boost::property_tree::ptree XFillStyleItem::dumpAsJSON() 
const
 default: break;
 }
 
-aTree.put("data", sValue);
+aTree.put("state", sValue);
 
 return aTree;
 }
@@ -2342,9 +2342,9 @@ boost::property_tree::ptree 
XFillGradientItem::dumpAsJSON() const
 boost::property_tree::ptree aTree = SfxPoolItem::dumpAsJSON();
 
 if (Which() == XATTR_FILLGRADIENT)
-aTree.put("which", ".uno:FillGradient");
+aTree.put("commandName", ".uno:FillGradient");
 
-aTree.push_back(std::make_pair("data", GetGradientValue().dumpAsJSON()));
+aTree.push_back(std::make_pair("state", GetGradientValue().dumpAsJSON()));
 
 return aTree;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Andrea Gelmini]

 sfx2/source/bastyp/bitset.cxx  |2 +-
 svx/source/table/svdotable.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89f01477245bda732b48205df4b2045034253c31
Author: Andrea Gelmini 
Date:   Tue May 22 15:31:57 2018 +0200

Fix typos

Change-Id: Ic3eadd695a11d4afdefa5ed4192faa47779e84f8
Reviewed-on: https://gerrit.libreoffice.org/54055
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index d0b5ddaeaf57..495909f8f14b 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -43,7 +43,7 @@ IndexBitSet& IndexBitSet::operator-=(sal_uInt16 nBit)
 return *this;
 }
 
-// unites with a single bit
+// unify with a single bit
 
 IndexBitSet& IndexBitSet::operator|=( sal_uInt16 nBit )
 {
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 369a04b7437a..f376c52b521e 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1760,7 +1760,7 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& 
rObj)
 // call parent
 // before SdrObject::operator= was called which is wrong from
 // the derivation hierarchy and may leave quite some entries
-// unititialized. Changed to SdrTextObj::operator=, but had to adapt
+// uninitialized. Changed to SdrTextObj::operator=, but had to adapt
 // usage of pNewOutlinerParaObject/mpText there due to nullptr access
 SdrTextObj::operator=(rObj);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source sw/source

[Caolán McNamara]

 sfx2/source/dialog/alienwarn.cxx |   16 +++-
 svx/source/dialog/linkwarn.cxx   |   16 +++-
 sw/source/ui/table/tautofmt.cxx  |   10 --
 3 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 7df7545fc9ac4aa55403998b2d65e1b147a9f037
Author: Caolán McNamara 
Date:   Mon Mar 19 15:43:36 2018 +

coverity#1430074 Uncaught exception

and

coverity#1430066 Uncaught exception
coverity#1430095 Uncaught exception

Change-Id: Idca2e12d3911e3ea768a2a9fb8e7f3b03a2c887f
Reviewed-on: https://gerrit.libreoffice.org/51567
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index d5b45ba091a6..d3ffe5c13c8d 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -63,11 +63,17 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(weld::Window* 
pParent, const OUStri
 
 SfxAlienWarningDialog::~SfxAlienWarningDialog()
 {
-// save value of "warning off" checkbox, if necessary
-SvtSaveOptions aSaveOpt;
-bool bChecked = m_xWarningOnBox->get_active();
-if (aSaveOpt.IsWarnAlienFormat() != bChecked)
-aSaveOpt.SetWarnAlienFormat(bChecked);
+try
+{
+// save value of "warning off" checkbox, if necessary
+SvtSaveOptions aSaveOpt;
+bool bChecked = m_xWarningOnBox->get_active();
+if (aSaveOpt.IsWarnAlienFormat() != bChecked)
+aSaveOpt.SetWarnAlienFormat(bChecked);
+}
+catch (...)
+{
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 2dcf5be18747..8d7c23d08e20 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -42,11 +42,17 @@ SvxLinkWarningDialog::SvxLinkWarningDialog(weld::Widget* 
pParent, const OUString
 
 SvxLinkWarningDialog::~SvxLinkWarningDialog()
 {
-// save value of "warning off" checkbox, if necessary
-SvtMiscOptions aMiscOpt;
-bool bChecked = m_xWarningOnBox->get_active();
-if (aMiscOpt.ShowLinkWarningDialog() != bChecked)
-aMiscOpt.SetShowLinkWarningDialog(bChecked);
+try
+{
+// save value of "warning off" checkbox, if necessary
+SvtMiscOptions aMiscOpt;
+bool bChecked = m_xWarningOnBox->get_active();
+if (aMiscOpt.ShowLinkWarningDialog() != bChecked)
+aMiscOpt.SetShowLinkWarningDialog(bChecked);
+}
+catch (...)
+{
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 37deeb341cfc..a66761b483d4 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -93,8 +93,14 @@ SwAutoFormatDlg::SwAutoFormatDlg(weld::Window* pParent, 
SwWrtShell* pWrtShell,
 
 SwAutoFormatDlg::~SwAutoFormatDlg()
 {
-if (m_bCoreDataChanged)
-m_xTableTable->Save();
+try
+{
+if (m_bCoreDataChanged)
+m_xTableTable->Save();
+}
+catch (...)
+{
+}
 m_xTableTable.reset();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Tomaž Vajngerl]

 sfx2/source/view/classificationhelper.cxx  |3 +--
 svx/source/dialog/ClassificationDialog.cxx |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ec9b555e8094f4552c068820cab633307fcf520f
Author: Tomaž Vajngerl 
Date:   Mon Nov 27 17:07:33 2017 +0900

TSCP: don't put a non-existing name into doc. props

We combined the abbr. name with the name and put that as a value
into doc. properties. This is not correct as such a name doesn't
exist in the BAPolicy and con't be identified anymore, so removing
this.

Also use the values that were put into the ClassificationField
instead of the extracted text.

Change-Id: I3037bc90a7a394d430f7c0cca4d326473eff3147
Reviewed-on: https://gerrit.libreoffice.org/45316
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index e1381e85cd01..1d7c0e94b4d3 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -451,8 +451,7 @@ void 
SfxClassificationHelper::Impl::pushToDocumentProperties()
 SfxClassificationPolicyType eType = rPair.first;
 SfxClassificationCategory& rCategory = rPair.second;
 std::map aLabels = rCategory.m_aLabels;
-const OUString abbreviation = (rCategory.m_aName != 
rCategory.m_aAbbreviatedName ? " (" + rCategory.m_aAbbreviatedName + ")" : 
OUString());
-aLabels[policyTypeToString(eType) + PROP_BACNAME()] = 
rCategory.m_aName + abbreviation;
+aLabels[policyTypeToString(eType) + PROP_BACNAME()] = 
rCategory.m_aName;
 for (const auto& rLabel : aLabels)
 {
 try
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index aa7f2e778be9..fa5be8da164d 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -568,7 +568,7 @@ std::vector 
ClassificationDialog::getResult()
 if (pClassificationField)
 {
 aClassificationResults.push_back({ 
pClassificationField->meType, pClassificationField->msFullClassName,
-   sDisplayString, 
pClassificationField->msIdentifier });
+   
pClassificationField->msDescription, pClassificationField->msIdentifier });
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara]

 sfx2/source/sidebar/ResourceManager.cxx |   52 ++--
 svx/source/tbxctrls/PaletteManager.cxx  |   10 --
 2 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 879c1c398ffdd00b7a9e9cc3cbe26e1aa263e00d
Author: Caolán McNamara 
Date:   Tue Aug 1 10:08:58 2017 +0100

Related: tdf#108655 only write to config if values changed

Change-Id: I6ba001745638dc2b8ce091d717915e334ece4b04
Reviewed-on: https://gerrit.libreoffice.org/40623
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index 83ff5337dd6e..a75aa42c86b6 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -322,11 +322,29 @@ void ResourceManager::SaveDeckSettings(const 
DeckDescriptor* pDeckDesc)
 
 utl::OConfigurationNode aDeckNode 
(aDeckRootNode.openNode(pDeckDesc->msNodeName));
 
-aDeckNode.setNodeValue("Title", makeAny(pDeckDesc->msTitle));
-aDeckNode.setNodeValue("OrderIndex", makeAny(pDeckDesc->mnOrderIndex));
-aDeckNode.setNodeValue("ContextList", makeAny( sContextList ));
+css::uno::Any aTitle(makeAny(pDeckDesc->msTitle));
+css::uno::Any aOrder(makeAny(pDeckDesc->mnOrderIndex));
+css::uno::Any aContextList(makeAny(sContextList));
 
-aDeckRootNode.commit();
+bool bChanged = false;
+if (aTitle != aDeckNode.getNodeValue("Title"))
+{
+aDeckNode.setNodeValue("Title", aTitle);
+bChanged = true;
+}
+if (aOrder != aDeckNode.getNodeValue("OrderIndex"))
+{
+aDeckNode.setNodeValue("OrderIndex", aOrder);
+bChanged = true;
+}
+if (aContextList != aDeckNode.getNodeValue("ContextList"))
+{
+aDeckNode.setNodeValue("ContextList", aContextList);
+bChanged = true;
+}
+
+if (bChanged)
+aDeckRootNode.commit();
 
 // save panel settings
 
@@ -343,6 +361,7 @@ void ResourceManager::SaveDeckSettings(const 
DeckDescriptor* pDeckDesc)
 
 SharedPanelContainer rPanels = pDeckDesc->mpDeck->GetPanels();
 
+bChanged = false;
 for ( SharedPanelContainer::iterator iPanel(rPanels.begin()), 
iEnd(rPanels.end());
   iPanel!=iEnd; ++iPanel)
 {
@@ -354,14 +373,29 @@ void ResourceManager::SaveDeckSettings(const 
DeckDescriptor* pDeckDesc)
 
 utl::OConfigurationNode aPanelNode 
(aPanelRootNode.openNode(xPanelDesc->msNodeName));
 
-aPanelNode.setNodeValue("Title", makeAny(xPanelDesc->msTitle));
-aPanelNode.setNodeValue("OrderIndex", 
makeAny(xPanelDesc->mnOrderIndex));
-aPanelNode.setNodeValue("ContextList", makeAny( sPanelContextList ));
+aTitle <<= xPanelDesc->msTitle;
+aOrder <<= xPanelDesc->mnOrderIndex;
+aContextList <<= sPanelContextList;
 
+if (aTitle != aPanelNode.getNodeValue("Title"))
+{
+aPanelNode.setNodeValue("Title", aTitle);
+bChanged = true;
+}
+if (aOrder != aPanelNode.getNodeValue("OrderIndex"))
+{
+aPanelNode.setNodeValue("OrderIndex", aOrder);
+bChanged = true;
+}
+if (aContextList != aPanelNode.getNodeValue("ContextList"))
+{
+aPanelNode.setNodeValue("ContextList", aContextList);
+bChanged = true;
+}
 }
 
- aPanelRootNode.commit();
-
+if (bChanged)
+aPanelRootNode.commit();
 }
 
 void ResourceManager::ReadPanelList()
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index b9e14521af6e..6e77ff700521 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -206,9 +206,13 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
 }
 }
 }
-std::shared_ptr 
batch(comphelper::ConfigurationChanges::create(m_context));
-officecfg::Office::Common::UserColors::PaletteName::set(GetPaletteName(), 
batch);
-batch->commit();
+OUString 
aPaletteName(officecfg::Office::Common::UserColors::PaletteName::get());
+if (aPaletteName != GetPaletteName())
+{
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create(m_context));
+
officecfg::Office::Common::UserColors::PaletteName::set(GetPaletteName(), 
batch);
+batch->commit();
+}
 }
 
 sal_Int32 PaletteManager::GetPalette()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Stephan Bergmann]

 sfx2/source/notebookbar/SfxNotebookBar.cxx  |4 ++--
 sfx2/source/sidebar/SidebarController.cxx   |   14 ++
 sfx2/source/sidebar/SidebarPanelBase.cxx|6 ++
 svx/source/sidebar/paragraph/ParaSpacingControl.cxx |2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 1b616752eaa389ebefd7caef437368052aecbfa5
Author: Stephan Bergmann 
Date:   Tue Dec 20 11:44:27 2016 +0100

Result of css::ui::ContextChangeEventMultiplexer::get cannot be null

Change-Id: I00fba6c2a79404c824feaa5bb302d37c4158f9a3

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index c3821b6..c34b666 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -299,7 +299,7 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
 = ContextChangeEventMultiplexer::get(
 
::comphelper::getProcessComponentContext());
 
-if(xFrame.is() && xMultiplexer.is())
+if(xFrame.is())
 {
 xMultiplexer->addContextChangeEventListener(
 
pNotebookBar->getContextChangeEventListener(),
@@ -326,7 +326,7 @@ void SfxNotebookBar::RemoveListeners(SystemWindow* 
pSysWindow)
 = ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext());
 
-if (pSysWindow->GetNotebookBar() && xMultiplexer.is())
+if (pSysWindow->GetNotebookBar())
 {
 xMultiplexer->removeAllContextChangeEventListeners(

pSysWindow->GetNotebookBar()->getContextChangeEventListener());
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 2b4a668..eb5cad7 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -164,10 +164,9 @@ void 
SidebarController::registerSidebarForFrame(SidebarController* pController,
 css::uno::Reference xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
-if (xMultiplexer.is())
-xMultiplexer->addContextChangeEventListener(
-static_cast(pController),
-xController);
+xMultiplexer->addContextChangeEventListener(
+static_cast(pController),
+xController);
 }
 
 void SidebarController::unregisterSidebarForFrame(SidebarController* 
pController, const css::uno::Reference& xController)
@@ -176,10 +175,9 @@ void 
SidebarController::unregisterSidebarForFrame(SidebarController* pController
 css::uno::Reference xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
-if (xMultiplexer.is())
-xMultiplexer->removeContextChangeEventListener(
-static_cast(pController),
-xController);
+xMultiplexer->removeContextChangeEventListener(
+static_cast(pController),
+xController);
 }
 
 void SidebarController::disposeDecks()
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx 
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index ff77084..0e90e95 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -65,8 +65,7 @@ SidebarPanelBase::SidebarPanelBase (
 css::uno::Reference 
xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
-if (xMultiplexer.is())
-xMultiplexer->addContextChangeEventListener(this, 
mxFrame->getController());
+xMultiplexer->addContextChangeEventListener(this, 
mxFrame->getController());
 }
 if (mpControl != nullptr)
 {
@@ -89,8 +88,7 @@ void SAL_CALL SidebarPanelBase::disposing()
 css::uno::Reference 
xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
-if (xMultiplexer.is())
-xMultiplexer->removeAllContextChangeEventListeners(this);
+xMultiplexer->removeAllContextChangeEventListeners(this);
 mxFrame = nullptr;
 }
 }
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index e4dc5d0..6fde988 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -113,7 +113,7 @@ void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, 
SfxItemState eState,
 m_xMultiplexer = css::ui::ContextChangeEventMultiplexer::get(

[Libreoffice-commits] core.git: sfx2/source svx/source sw/source vcl/source

[Tomaž Vajngerl]

 sfx2/source/sidebar/TabBar.cxx|   13 -
 svx/source/stbctrls/modctrl.cxx   |   11 ---
 svx/source/stbctrls/pszctrl.cxx   |   11 ---
 svx/source/stbctrls/selctrl.cxx   |8 
 svx/source/stbctrls/xmlsecctrl.cxx|   17 -
 svx/source/stbctrls/zoomsliderctrl.cxx|   19 ---
 sw/source/uibase/utlui/content.cxx|   12 
 sw/source/uibase/utlui/viewlayoutctrl.cxx |   24 
 vcl/source/control/fixed.cxx  |   11 ++-
 vcl/source/window/menu.cxx|   11 ---
 vcl/source/window/toolbox2.cxx|   14 --
 11 files changed, 2 insertions(+), 149 deletions(-)

New commits:
commit 484390a09624f68a8dec01eb5bf06e84cdcb80f6
Author: Tomaž Vajngerl 
Date:   Thu Oct 27 18:04:46 2016 +0200

HiDPI: remove unneeded image scaling when HiDPI is enabled

We don't need to scale images for HiDPI mode anymore - this is now
done automatically when the image is loaded.

Change-Id: Ie285cf4d672f4c098a468d3f7560ee2700365b92
Reviewed-on: https://gerrit.libreoffice.org/30340
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 8de..62826f7 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -145,12 +145,6 @@ void TabBar::SetDecks(const 
ResourceManager::DeckContextDescriptorContainer& rDe
 void TabBar::UpdateButtonIcons()
 {
 Image aImage = Theme::GetImage(Theme::Image_TabBarMenu);
-if ( mpMenuButton->GetDPIScaleFactor() > 1 )
-{
-BitmapEx b = aImage.GetBitmapEx();
-b.Scale(mpMenuButton->GetDPIScaleFactor(), 
mpMenuButton->GetDPIScaleFactor(), BmpScaleFlag::Fast);
-aImage = Image(b);
-}
 mpMenuButton->SetModeImage(aImage);
 
 for(ItemContainer::const_iterator
@@ -163,13 +157,6 @@ void TabBar::UpdateButtonIcons()
 if (xDeckDescriptor)
 {
 aImage = GetItemImage(*xDeckDescriptor);
-if ( mpMenuButton->GetDPIScaleFactor() > 1 )
-{
-BitmapEx b = aImage.GetBitmapEx();
-b.Scale(mpMenuButton->GetDPIScaleFactor(), 
mpMenuButton->GetDPIScaleFactor(), BmpScaleFlag::Fast);
-aImage = Image(b);
-}
-
 iItem->mpButton->SetModeImage(aImage);
 }
 }
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index a76263b..8b476f5 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -66,17 +66,6 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, 
sal_uInt16 _nId, Status
 SfxStatusBarControl( _nSlotId, _nId, rStb ),
 mxImpl(new ImplData)
 {
-//#ifndef MACOSX
-if ( rStb.GetDPIScaleFactor() > 1 )
-{
-for (int i = 0; i < ImplData::MODIFICATION_STATE_SIZE; i++)
-{
-BitmapEx b = mxImpl->maImages[i].GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(), 
BmpScaleFlag::Fast);
-mxImpl->maImages[i] = Image(b);
-}
-}
-//#endif
 mxImpl->maIdle.SetIdleHdl( LINK(this, SvxModifyControl, OnTimer) );
 }
 
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index d623a86..90e1594 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -177,17 +177,6 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( 
sal_uInt16 _nSlotId,
 pImpl->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
 pImpl->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
 
-if ( rStb.GetDPIScaleFactor() > 1)
-{
-BitmapEx b = pImpl->aPosImage.GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(), 
BmpScaleFlag::Fast);
-pImpl->aPosImage = Image(b);
-
-b = pImpl->aSizeImage.GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(), 
BmpScaleFlag::Fast);
-pImpl->aSizeImage = Image(b);
-}
-
 addStatusListener( STR_POSITION); // SID_ATTR_POSITION
 addStatusListener( STR_TABLECELL);   // SID_TABLE_CELL
 addStatusListener( STR_FUNC);// SID_PSZ_FUNCTION
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 13579ed..8cf5f5c 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -77,14 +77,6 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 
_nSlotId,
 mnState( 0 ),
 maImage( SVX_RES( RID_SVXBMP_SELECTION ) )
 {
-//#ifndef MACOSX
-if ( GetStatusBar().GetDPIScaleFactor() > 1 )
-{
-BitmapEx b = maImage.GetBitmapEx();
-b.Scale(GetStatusBar().GetDPIScaleFactor(), 
GetStatusBar().GetDPIScaleFactor(), BmpScaleFlag::Fast);
-   

[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara]

 sfx2/source/view/classificationcontroller.cxx |2 +-
 sfx2/source/view/classificationhelper.cxx |2 +-
 svx/source/dialog/crashreportdlg.hxx  |2 +-
 svx/source/dialog/crashreportui.cxx   |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f1aca4db8bd82e8beefeccc8e12c752f686133ee
Author: Caolán McNamara 
Date:   Thu Mar 17 09:08:42 2016 +

cppcheck: noExplicitConstructor

Change-Id: Id506e26ab4986a3972ebf24397c5c0c8d131fe69

diff --git a/sfx2/source/view/classificationcontroller.cxx 
b/sfx2/source/view/classificationcontroller.cxx
index 788eddf..523e4e0 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -56,7 +56,7 @@ class ClassificationCategoriesController : public 
ClassificationCategoriesContro
 DECL_LINK_TYPED(SelectHdl, ListBox&, void);
 
 public:
-ClassificationCategoriesController(const 
uno::Reference& rContext);
+explicit ClassificationCategoriesController(const 
uno::Reference& rContext);
 virtual ~ClassificationCategoriesController();
 
 // XServiceInfo
diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index fc1d236..5e4567a 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -324,7 +324,7 @@ public:
 std::vector m_aCategories;
 const uno::Reference& m_xDocumentProperties;
 
-Impl(const uno::Reference& 
xDocumentProperties);
+explicit Impl(const uno::Reference& 
xDocumentProperties);
 void parsePolicy();
 /// Synchronize m_aLabels back to the document properties.
 void pushToDocumentProperties();
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index a7f22e2..d1304a1 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -17,7 +17,7 @@ class CrashReportDialog : public Dialog
 {
 public:
 
-CrashReportDialog(vcl::Window* pParent);
+explicit CrashReportDialog(vcl::Window* pParent);
 
 virtual ~CrashReportDialog();
 
diff --git a/svx/source/dialog/crashreportui.cxx 
b/svx/source/dialog/crashreportui.cxx
index d338705..eaa6a8e 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -24,7 +24,7 @@ class CrashReportUI : public ::cppu::WeakImplHelper< 
css::lang::XServiceInfo

css::frame::XSynchronousDispatch > // => XDispatch!
 {
 public:
-CrashReportUI(const css::uno::Reference< css::uno::XComponentContext >& 
xContext);
+explicit CrashReportUI(const css::uno::Reference< 
css::uno::XComponentContext >& xContext);
 virtual ~CrashReportUI();
 
 // css.lang.XServiceInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Julien Nabet]

 sfx2/source/appl/appmain.cxx  |2 +-
 svx/source/dialog/docrecovery.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ea5701ee819de9f28df6dd6ab009e85aa59e975
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Feb 21 11:00:57 2015 +0100

Typo: window not widow here

Change-Id: I68fc6c2f6564ea61fd83bb610813a5476dcced39

diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 2c56d19..9f97c00 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -79,7 +79,7 @@ void SfxApplication::Exit()
 after Execute() has finished and
 - the configuration (SfxConfigManager) was already saved,
 - the window positions etc. in the SfxIniManager were written,
-- the Application widow still exists, but is hidden
+- the Application window still exists, but is hidden
 - all Documents and their Views already are closed.
 - Dispatcher, Bindings etc. already destroyed.
 
diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index d96a352..f7c8075 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -634,7 +634,7 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* 
pCore)
 get(m_pOkBtn, ok);
 
 // Prepare the office for the following crash save step.
-// E.g. hide all open widows so the user can't influence our
+// E.g. hide all open windows so the user can't influence our
 // operation .-)
 m_pCore-doEmergencySavePrepare();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara]

 sfx2/source/appl/appdde.cxx  |6 ++
 sfx2/source/appl/helpinterceptor.cxx |4 ++--
 sfx2/source/appl/newhelp.cxx |3 ++-
 svx/source/dialog/fntctrl.cxx|6 +-
 svx/source/dialog/pagectrl.cxx   |2 +-
 svx/source/form/datanavi.cxx |4 +++-
 svx/source/svdraw/svdotext.cxx   |2 +-
 7 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit cb92e6440cebbdf307e5740325d04d9656440fd8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 5 10:41:27 2013 +0100

match original intent of String::Erase(String::Search))

the single argument String::Erase erased from the passed in index to the 
end of
the string

Search returns STRING_NOTFOUND on failure, which results in String::Erase
erasing nothing and so leaving the original string untouched.

Change-Id: I83939fce2a92c38fbfb62196b7248908117c1e69

diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index cf9a739..f3efec1 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -122,15 +122,13 @@ bool ImplDdeService::MakeTopic( const OUString rNm )
 // First only loop over the ObjectShells to find those
 // with the specific name:
 sal_Bool bRet = sal_False;
-OUString sNm( rNm );
-sNm = sNm.toAsciiLowerCase();
+OUString sNm( rNm.toAsciiLowerCase() );
 TypeId aType( TYPE(SfxObjectShell) );
 SfxObjectShell* pShell = SfxObjectShell::GetFirst( aType );
 while( pShell )
 {
 OUString sTmp( pShell-GetTitle(SFX_TITLE_FULLNAME) );
-sTmp = sTmp.toAsciiLowerCase();
-if( sTmp == sNm )
+if( sNm == sTmp.toAsciiLowerCase() )
 {
 SFX_APP()-AddDdeTopic( pShell );
 bRet = true;
diff --git a/sfx2/source/appl/helpinterceptor.cxx 
b/sfx2/source/appl/helpinterceptor.cxx
index 40044ab..fc05688 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -235,8 +235,8 @@ Sequence OUString  SAL_CALL 
HelpInterceptor_Impl::getInterceptedURLs()
 void SAL_CALL HelpInterceptor_Impl::dispatch(
 const URL aURL, const Sequence ::com::sun::star::beans::PropertyValue  
) throw( RuntimeException )
 {
-sal_Bool bBack = ( OUString( .uno:Backward ) == OUString( aURL.Complete 
) );
-if ( bBack || OUString( .uno:Forward ) == OUString( aURL.Complete ) )
+sal_Bool bBack = ( OUString( .uno:Backward ) == aURL.Complete );
+if ( bBack || OUString( .uno:Forward ) == aURL.Complete )
 {
 if ( m_pHistory )
 {
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5b09cdb..1b231fc 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1615,7 +1615,8 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
 for ( sal_uInt16 i = 0; i  aActiveLB.GetEntryCount(); ++i )
 {
 OUString* pFactory = (OUString*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
-if ( pFactory-toAsciiLowerCase() == pIPage-GetFactory() )
+*pFactory = pFactory-toAsciiLowerCase();
+if ( *pFactory == pIPage-GetFactory() )
 {
 if ( aActiveLB.GetSelectEntryPos() != i )
 {
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index c19acdb..04d175b 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -719,7 +719,11 @@ void SvxFontPrevWindow::Paint( const Rectangle )
 pImpl-aText = GetText();
 
 if ( pImpl-aText.getLength()  (TEXT_WIDTH-1) )
-pImpl-aText = pImpl-aText.replaceAt( pImpl-aText.indexOf( 
, TEXT_WIDTH), 1,  );
+{
+sal_Int32 nSpaceIdx = pImpl-aText.indexOf( , TEXT_WIDTH);
+if (nSpaceIdx != -1)
+pImpl-aText = pImpl-aText.copy(0, nSpaceIdx);
+}
 }
 
 // calculate text width scaling
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index a08f8fe..d645628 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -300,7 +300,7 @@ void SvxPageWindow::DrawPage( const Point rOrg, const 
sal_Bool bSecond, const s
 sText += OUString(cArrow);
 for(sal_uInt16 i = 0; i  sText.getLength(); i++)
 {
-OUString sDraw(sText.copy(0,1));
+OUString sDraw(sText.copy(i,1));
 long nHDiff = 0;
 long nCharWidth = GetTextWidth(sDraw);
 bool bHorizontal = 0 == aMove.Y();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 66cffba..58f74cbb 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3464,7 +3464,9 @@ namespace svxform
 sTemp = m_aRefED.GetText();
 m_xSubmission-setPropertyValue( PN_SUBMISSION_REF, makeAny( 
sTemp ) );
 OUString sEntry = m_aBindLB.GetSelectEntry();
-sEntry = 

[Libreoffice-commits] core.git: sfx2/source svx/source

[Caolán McNamara]

 sfx2/source/sidebar/Theme.cxx  |5 +
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 09b054fc4c2a8d9ee2a6ed28194b828d8ff7dd0f
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 10 11:29:03 2013 +0100

update graphicrepository links for new icon-theme locations

Change-Id: I8de2dbfa6eb98a9b879af362b850c487ab28fa7f

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index a234215..967adc7 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -363,10 +363,7 @@ void Theme::UpdateTheme (void)
 Any(A2S(private:graphicrepository/sfx2/res/closedoc.png)));
 setPropertyValue(
 maPropertyIdToNameMap[Image_CloseIndicator],
-Any(
-mbIsHighContrastMode
-? 
A2S(private:graphicrepository/res/commandimagelist/lch_decrementlevel.png)
-: 
A2S(private:graphicrepository/res/commandimagelist/lc_decrementlevel.png)));
+Any(A2S(private:graphicrepository/cmd/lc_decrementlevel.png)));
 setPropertyValue(
 maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
 Any(
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 6db5c75..fa6009f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -199,7 +199,7 @@ Control RID_SIDEBAR_PARA_PANEL
 defined for Draw/Impress.  It has to be defined in
 GenericCommancs.xcu to be recognized. See issue 122446 for 
more details.
 */
-Command = 
private:graphicrepository/res/commandimagelist/sc_paraspaceincrease.png;
+Command = 
private:graphicrepository/cmd/sc_paraspaceincrease.png;
 };
 ToolBoxItem
 {
@@ -209,7 +209,7 @@ Control RID_SIDEBAR_PARA_PANEL
 /** See above or issue 122446 why the following line is not
 Command = .uno:ParaspaceDecrease;
 */
-Command = 
private:graphicrepository/res/commandimagelist/sc_paraspacedecrease.png;
+Command = 
private:graphicrepository/cmd/sc_paraspacedecrease.png;
 };
 };
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source svx/source

[Thomas Arnhold]

 sfx2/source/appl/newhelp.cxx |   10 +-
 svx/source/table/tablecontroller.cxx |4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3dd40efee6ca280ef205c75517621b5f8d5089cd
Author: Thomas Arnhold tho...@arnhold.org
Date:   Fri Mar 22 00:48:24 2013 +0100

strg is ctrl in english

Change-Id: I569bfa7c9d461a5af0ef6e6f37bf717255936b78

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 40f9420..df962be 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1809,7 +1809,7 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent 
rNEvt )
 }
 else if ( bCtrl )
 {
-// STRGTAB moves through the pages
+// CTRLTAB moves through the pages
 if ( nPageId  HELP_INDEX_PAGE_LAST )
 nPageId++;
 else
@@ -2316,8 +2316,8 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode 
_rKeyCode )
 bool bRet = false;
 sal_uInt16 nCode = _rKeyCode.GetCode();
 
-// the keys STRGA (select all), STRGC (copy),
-//  STRGF (find), STRGP (print) and STRGW (close 
window)
+// the keys CTRLA (select all), CTRLC (copy),
+//  CTRLF (find), CTRLP (print) and CTRLW (close 
window)
 // were handled in help
 if ( _rKeyCode.IsMod1() 
  ( KEY_A == nCode || KEY_C == nCode || KEY_F == nCode || KEY_P == 
nCode || KEY_W == nCode ) )
@@ -2632,7 +2632,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent 
rNEvt )
  }
 else if ( rKeyCode.IsMod1()  ( KEY_F4 == nKey || KEY_W == nKey ) )
 {
-// STRGF4 or STRGW - close top frame
+// CTRLF4 or CTRLW - close top frame
 pHelpWin-CloseWindow();
 nDone = 1;
 }
@@ -3229,7 +3229,7 @@ long SfxHelpWindow_Impl::PreNotify( NotifyEvent rNEvt )
 }
 else if ( rKeyCode.IsMod1()  ( KEY_F4 == nKey || KEY_W == nKey ) )
 {
-// STRGF4 or STRGW - close top frame
+// CTRLF4 or CTRLW - close top frame
 CloseWindow();
 bHandled = sal_True;
 }
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 1a888ba..1cb3035 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1291,7 +1291,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const 
KeyEvent rKEvt, Window*
 {
 if( bMod1  !bMod2 )
 {
-// strg + home jumps to first cell
+// ctrl + home jumps to first cell
 nAction = ACTION_GOTO_FIRST_CELL;
 }
 else if( !bMod1  bMod2 )
@@ -1309,7 +1309,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const 
KeyEvent rKEvt, Window*
 {
 if( bMod1  !bMod2 )
 {
-// strg + end jumps to last cell
+// ctrl + end jumps to last cell
 nAction = ACTION_GOTO_LAST_CELL;
 }
 else if( !bMod1  bMod2 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits