[Libreoffice-commits] core.git: sw/sdi

2023-06-16 Thread Justin Luth (via logerrit) 
 sw/sdi/swriter.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 967c8db8e1ebee924b185b7476df712189e4e51b
Author: Justin Luth 
AuthorDate: Fri Jun 16 13:45:02 2023 -0400
Commit: Justin Luth 
CommitDate: Fri Jun 16 21:41:45 2023 +0200

tdf#132061: disable uno:PageColumnType when read-only

When the document is read-only, it should not be able
to be have the column information changed,
so disable that toolboxControl, just like everything else.

It was set to be active in READ-ONLY mode since initial import,
but no indication why it should be different
from the two other page actions added at the same time.

It was added as part of adding the sidebar.
However, I don't see where it would be found in the sidebar.
It is not in the normal menus - just in the notebookbar.

Change-Id: Icf342d5ee51cf8bba296049833e0e520813efb03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153193
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index dda1dc187f55..1ae79b5b2b8b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8026,7 +8026,7 @@ SfxInt16Item PageColumnType SID_ATTR_PAGE_COLUMN
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,

[Libreoffice-commits] core.git: sw/sdi

2023-05-22 Thread Seth Chaiklin (via logerrit) 
 sw/sdi/swriter.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 23a41c919602828acb88a477f3f073154d9388ec
Author: Seth Chaiklin 
AuthorDate: Thu May 4 09:55:53 2023 +0200
Commit: Seth Chaiklin 
CommitDate: Mon May 22 22:53:01 2023 +0200

tdf#155065  hide .uno:PageOffsetDialog from Customize dialog

Change-Id: Iad95d757ed09921403f41ed3c757b34149ec8c47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151285
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Seth Chaiklin 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index b765d861e34a..dda1dc187f55 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -5011,9 +5011,9 @@ SfxUInt16Item PageOffsetDialog FN_CHANGE_PAGENUM
 RecordPerSet;
 Asynchron;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Options;
 ]

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

2023-02-07 Thread Heiko Tietze (via logerrit) 
 sw/sdi/viewsh.sdi |4 
 sw/source/uibase/uiview/pview.cxx |6 +
 sw/source/uibase/utlui/viewlayoutctrl.cxx |  169 --
 3 files changed, 102 insertions(+), 77 deletions(-)

New commits:
commit 0b9aef0aaa7c17cc7da722002e27996a01ffc7fa
Author: Heiko Tietze 
AuthorDate: Mon Jan 23 13:50:55 2023 +0100
Commit: Heiko Tietze 
CommitDate: Tue Feb 7 13:53:45 2023 +

Resolves tdf#148441 - Hide viewlayout in statusbar in preview mode

Change-Id: I255ad3b952d7b424e9ff0475798bbe0cfc57ef9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146004
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index e4f3c0a362e0..86dd74a62c91 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -390,6 +390,10 @@ interface TextPrintPreview
 ExecMethod = Execute ;
 StateMethod = GetState ;
 ]
+SID_ATTR_VIEWLAYOUT
+[
+StateMethod = GetState ;
+]
 FN_CLOSE_PAGEPREVIEW
 [
 ExecMethod = Execute ;
diff --git a/sw/source/uibase/uiview/pview.cxx 
b/sw/source/uibase/uiview/pview.cxx
index f6db5bb9d928..84c1cf06680c 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1015,6 +1016,11 @@ void  SwPagePreview::GetState( SfxItemSet& rSet )
 }
 }
 break;
+case SID_ATTR_VIEWLAYOUT:
+{
+rSet.DisableItem( SID_ATTR_VIEWLAYOUT );
+}
+break;
 case FN_SHOW_MULTIPLE_PAGES:
 // should never be disabled
 break;
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx 
b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 8e2ef79c5a0e..b0631559ac68 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -34,7 +34,7 @@ SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, 
SvxViewLayoutItem );
 
 struct SwViewLayoutControl::SwViewLayoutControl_Impl
 {
-sal_uInt16  mnState; // 0 = auto, 1= single, 2 = book, 3 = none
+sal_uInt16  mnState; // 0 = auto, 1= single, 2 = book, 3 = none, 4 = 
off
 Image   maImageSingleColumn;
 Image   maImageSingleColumn_Active;
 Image   maImageAutomatic;
@@ -64,7 +64,10 @@ SwViewLayoutControl::~SwViewLayoutControl()
 void SwViewLayoutControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, 
SfxItemState eState, const SfxPoolItem* pState )
 {
 if ( SfxItemState::DEFAULT != eState || pState->IsVoidItem() )
+{
 GetStatusBar().SetItemText( GetId(), OUString() );
+mpImpl->mnState = 4; //tdf#148441 switch off is disabled
+}
 else
 {
 assert( dynamic_cast< const SvxViewLayoutItem *>( pState )  && 
"invalid item type" );
@@ -94,102 +97,114 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& 
rUsrEvt )
 
 const tools::Rectangle aControlRect = getControlRect();
 
-const bool bSingleColumn= 0 == mpImpl->mnState;
-const bool bAutomatic   = 1 == mpImpl->mnState;
-const bool bBookMode= 2 == mpImpl->mnState;
-
-const tools::Long nImageWidthSum = 
mpImpl->maImageSingleColumn.GetSizePixel().Width() +
-
mpImpl->maImageAutomatic.GetSizePixel().Width() +
-mpImpl->maImageBookMode.GetSizePixel().Width();
-
-const tools::Long nXOffset = (aRect.GetWidth() - nImageWidthSum) / 2;
-const tools::Long nYOffset = (aControlRect.GetHeight() - 
mpImpl->maImageSingleColumn.GetSizePixel().Height()) / 2;
+if (mpImpl->mnState < 4)
+{
+const bool bSingleColumn= 0 == mpImpl->mnState;
+const bool bAutomatic   = 1 == mpImpl->mnState;
+const bool bBookMode= 2 == mpImpl->mnState;
 
-aRect.AdjustLeft( nXOffset );
-aRect.AdjustTop( nYOffset );
+const tools::Long nImageWidthSum = 
mpImpl->maImageSingleColumn.GetSizePixel().Width() +
+
mpImpl->maImageAutomatic.GetSizePixel().Width() +
+
mpImpl->maImageBookMode.GetSizePixel().Width();
 
-// draw single column image:
-pDev->DrawImage( aRect.TopLeft(), bSingleColumn ? 
mpImpl->maImageSingleColumn_Active : mpImpl->maImageSingleColumn );
+const tools::Long nXOffset = (aRect.GetWidth() - nImageWidthSum) / 2;
+const tools::Long nYOffset = (aControlRect.GetHeight() - 
mpImpl->maImageSingleColumn.GetSizePixel().Height()) / 2;
 
-// draw automatic image:
-aRect.AdjustLeft(mpImpl->maImageSingleColumn.GetSizePixel().Width() );
-pDev->DrawImage( aRect.TopLeft(), bAutomatic ? 
mpImpl->maImageAutomatic_Active   : mpImpl->maImageAutomatic );
+aRect.AdjustLeft( nXOffset );
+aRect.AdjustTop( nYOffset );
 
-// draw bookmode image:
-

[Libreoffice-commits] core.git: sw/sdi

2023-02-01 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 94c670f030fc63afe84ecfdfffc75d4764218754
Author: Miklos Vajna 
AuthorDate: Wed Feb 1 20:17:06 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 2 07:19:31 2023 +

sw, FN_UPDATE_TEXT_FORMFIELD: remove unused StateMethod

This was added in 337416dafb66ed8f930d2d69e83fae438fc85f3c (sw: add a
new .uno:UpdateTextFormField UNO command, 2023-01-06), but only
SwTextShell::ExecField() handles FN_UPDATE_TEXT_FORMFIELD, so the
StateMethod is not needed.

Change-Id: I237f82f7f3b5efa7e619576880d973d144c77b25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index cca84716962f..1f5db939267b 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1821,7 +1821,6 @@ interface BaseText
 FN_UPDATE_TEXT_FORMFIELD
 [
 ExecMethod = ExecField ;
-StateMethod = StateField ;
 ]
 
 FN_DELETE_TEXT_FORMFIELDS

[Libreoffice-commits] core.git: sw/sdi

2023-01-25 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit cba2fda9ce2a82d874b86e585b576cb7d551d64d
Author: Miklos Vajna 
AuthorDate: Wed Jan 25 20:08:18 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 26 07:38:41 2023 +

sw, FN_DELETE_TEXT_FORMFIELDS: remove unused StateMethod

FN_DELETE_TEXT_FORMFIELDS is only handled in SwTextShell::ExecField()
and SwTextShell::StateField() doesn't seem to have a default handler for
slots not mentioned explicitly, so this is not needed.

Change-Id: I00bc3c543c44d541d352748c721be43b76965e32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146144
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index d8ec5afef933..cca84716962f 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1827,7 +1827,6 @@ interface BaseText
 FN_DELETE_TEXT_FORMFIELDS
 [
 ExecMethod = ExecField ;
-StateMethod = StateField ;
 ]
 
 FN_PROTECT_FIELDS

[Libreoffice-commits] core.git: sw/sdi

2023-01-16 Thread Miklos Vajna (via logerrit) 
 sw/sdi/swriter.sdi |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f41d42491528905594b9a36a3bf16998f309c702
Author: Miklos Vajna 
AuthorDate: Mon Jan 16 09:42:25 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 16 11:34:30 2023 +

sw: disable AutoUpdate for many new recent field/book/refmark UNO commands

As noted in

,
these only make sense for commands which have a GetState()
implementation (AutoUpdate will call GetState() automatically for you
after an exec), and none of these commands have an explicit GetState(),
so AutoUpdate=TRUE doesn't make sense for them.

Change-Id: I9899c297a7b0f8c447c66b50a228bc7e1896e146
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145557
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 038f70125909..bc1b52b92b43 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2603,7 +2603,7 @@ SfxVoidItem UpdateBookmarks FN_UPDATE_BOOKMARKS
 SfxVoidItem DeleteBookmarks FN_DELETE_BOOKMARKS
 (SfxStringItem BookmarkNamePrefix FN_PARAM_1)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -2617,7 +2617,7 @@ SfxVoidItem DeleteBookmarks FN_DELETE_BOOKMARKS
 SfxVoidItem DeleteFields FN_DELETE_FIELDS
 (SfxStringItem TypeName FN_PARAM_1, SfxStringItem NamePrefix FN_PARAM_2)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -8356,7 +8356,7 @@ SfxBoolItem ShowInlineTooltips FN_SHOW_INLINETOOLTIPS
 SfxVoidItem TextFormField FN_INSERT_TEXT_FORMFIELD
 (SfxStringItem FieldType FN_PARAM_1, SfxStringItem FieldCommand FN_PARAM_2, 
SfxStringItem FieldResult FN_PARAM_3)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -8374,7 +8374,7 @@ SfxVoidItem TextFormField FN_INSERT_TEXT_FORMFIELD
 SfxVoidItem TextFormFields FN_UPDATE_TEXT_FORMFIELDS
 (SfxStringItem FieldType FN_PARAM_1, SfxStringItem FieldCommandPrefix 
FN_PARAM_2, SfxUnoAnyItem Fields FN_PARAM_3)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -8389,7 +8389,7 @@ SfxVoidItem TextFormFields FN_UPDATE_TEXT_FORMFIELDS
 SfxVoidItem DeleteTextFormFields FN_DELETE_TEXT_FORMFIELDS
 (SfxStringItem FieldType FN_PARAM_1, SfxStringItem FieldCommandPrefix 
FN_PARAM_2)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -8403,7 +8403,7 @@ SfxVoidItem DeleteTextFormFields FN_DELETE_TEXT_FORMFIELDS
 SfxVoidItem UpdateTextFormField FN_UPDATE_TEXT_FORMFIELD
 (SfxStringItem FieldType FN_PARAM_1, SfxStringItem FieldCommandPrefix 
FN_PARAM_2, SfxUnoAnyItem Field FN_PARAM_3)
 [
-AutoUpdate = TRUE,
+AutoUpdate = FALSE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,

[Libreoffice-commits] core.git: sw/sdi

2023-01-11 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 200e2a3c28bdeec785ac389473f5fca6576071a0
Author: Miklos Vajna 
AuthorDate: Wed Jan 11 14:24:50 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 12 07:19:51 2023 +

sw, UpdateSections: remove not needed StateMethod

SwTextShell::GetState() doesn't handle FN_UPDATE_SECTIONS at the moment,
so this is unused.

Noticed by Justin at

.

Change-Id: If1a95aa0f1cbe83b42f720421d345a3e12f0b97b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145346
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f08e0b21b675..e1b64a45e5d1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -160,7 +160,6 @@ interface BaseText
 FN_UPDATE_SECTIONS
 [
 ExecMethod = Execute ;
-StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 FN_SET_REMINDER

[Libreoffice-commits] core.git: sw/sdi

2022-11-29 Thread Miklos Vajna (via logerrit) 
 sw/sdi/swriter.sdi |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 12f434277bc424f01597be83020a569c84bbee5a
Author: Miklos Vajna 
AuthorDate: Tue Nov 29 09:42:18 2022 +0100
Commit: Miklos Vajna 
CommitDate: Tue Nov 29 13:24:29 2022 +0100

sw: hide TextFormFields from the customization dialog like

Addresses

,
this command is meant to be invoked from macros and the LOK API, not
from the UI, so hide these instead of adding a label.

Change-Id: Icc17aa10db49fd2937453b3a5ceddfb368787574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143430
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 60ca3faa4437..42e24f93e878 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8267,9 +8267,6 @@ SfxVoidItem TextFormFields FN_UPDATE_TEXT_FORMFIELDS
 RecordPerSet;
 
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::Controls;
 ]

[Libreoffice-commits] core.git: sw/sdi

2022-07-01 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_grfsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c769c369c87a46ec877b7eefee27988044a2798f
Author: Miklos Vajna 
AuthorDate: Fri Jul 1 11:40:10 2022 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 1 13:08:55 2022 +0200

sw content controls: fix picture placeholders

This went wrong in commit c321498f915f4e8b3f4853232860ce040ab48e46 (sw
content controls: reject typing inside checkbox or picture content
controls, 2022-06-10), now a freshly inserted picture content control is
not replaced with an image on click.

The problem is that we want to forbid typing into a picture content
control (it should only host a single as-char image), but changing the
picture's bitmap is meant to be still possible.

Fix the problem by allowing SID_CHANGE_PICTURE even if the cursor is
protected: this allows changing the picture again, and a real read-only
document still doesn't show the "change" menu item in its context menu.

If we later find some other corner-case where this command should be
still disabled, we can extend SwGrfShell::GetAttrState(), similar to how
e.g. inserting images in input fields is disabled there.

Change-Id: I8b55e930330b9748ecda950dedae907b86c57e2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136729
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 8291745966bb..5475017d448e 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -63,7 +63,6 @@ interface BaseTextGraphic
 [
 ExecMethod = Execute ;
 StateMethod = GetAttrState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
 SID_EXTERNAL_EDIT

[Libreoffice-commits] core.git: sw/sdi

2022-06-16 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9aeca50f4f0c1b2503a91eb1c7d9ed8a7231e598
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 09:14:04 2022 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jun 16 10:08:51 2022 +0200

sw content controls: allow the properties dialog in read-only sel

Once you enter a checkbox or picture content control, the selection is
read-only to avoid loosing content the next time the content control is
updated. But this means you can't launch the properties dialog to e.g.
enable placeholder mode.

Fix this by relaxing the restriction and allow the properties dialog on
protected cursor as well, matching Word behavior.

Change-Id: Ifef9af66d077682c46c852c9ecba2df5f17234fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135965
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 55d515d944a0..fce2a4df9740 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -306,7 +306,6 @@ interface BaseText
 [
 ExecMethod = ExecInsert ;
 StateMethod = GetState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 FN_INSERT_COLUMN_BREAK // status(final|play)
 [

[Libreoffice-commits] core.git: sw/sdi

2022-04-26 Thread Seth Chaiklin (via logerrit) 
 sw/sdi/swriter.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8831d4ebbf8253327f4f0024035ff310ae233e43
Author: Seth Chaiklin 
AuthorDate: Wed Apr 20 15:33:38 2022 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Apr 26 23:39:13 2022 +0200

tdf#131760 change category of Load Styles

Change-Id: I9d27c1a829991232f09486a6fd9cdd1625b03a91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133147
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index fdc98db8a778..274122f1cb81 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3794,7 +3794,7 @@ SfxVoidItem LoadStyles SID_TEMPLATE_LOAD
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = SfxGroupId::Format;
+GroupId = SfxGroupId::Template;
 ]
 
 SfxBoolItem Marks FN_VIEW_MARKS

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

2022-02-26 Thread Jim Raykowski (via logerrit) 
 sw/sdi/swriter.sdi  |1 
 sw/source/uibase/uiview/viewmdi.cxx |   57 +---
 2 files changed, 34 insertions(+), 24 deletions(-)

New commits:
commit 5df0289f6af5aa7142017b56a8e17c134d54fe41
Author: Jim Raykowski 
AuthorDate: Fri Feb 25 00:31:29 2022 -0900
Commit: Jim Raykowski 
CommitDate: Sun Feb 27 05:08:38 2022 +0100

tdf#147565 Make navigate by comments skip hidden comments

Change-Id: I80f55146529505e5b6146db8cc324971fbc475e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130518
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 0e994261c28c..265a4000c5a0 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2494,7 +2494,6 @@ SfxVoidItem InsertAnnotation FN_POSTIT
 Container = FALSE,
 RecordAbsolute = FALSE,
 RecordPerSet;
-Asynchron;
 
 AccelConfig = TRUE,
 MenuConfig = TRUE,
diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index b85c05eb1af8..9acb7f8f7bd0 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -530,38 +530,48 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
 {
 if (m_pPostItMgr->HasNotes())
 {
-rSh.EnterStdMode();
-sw::annotation::SwAnnotationWin* pPostIt = 
m_pPostItMgr->GetActiveSidebarWin();
-if (pPostIt)
-m_pPostItMgr->SetActiveSidebarWin(nullptr);
+m_pPostItMgr->AssureStdModeAtShell();
+m_pPostItMgr->SetActiveSidebarWin(nullptr);
+GetEditWin().GrabFocus();
+SwShellCursor* pCursor = rSh.GetCursor_();
+SwCursorSaveState aSaveState(*pCursor);
 SwFieldType* pFieldType = rSh.GetFieldType(0, 
SwFieldIds::Postit);
+bool bWrapped = false;
+bool bFound = false;
 rSh.StartAction();
-if (!rSh.MoveFieldType(pFieldType, bNext))
+while (!bFound)
 {
-// no postits found in the move direction
-// wrap and try again
-SwShellCursor* pCursor = rSh.GetCursor_();
-SwCursorSaveState aSaveState(*pCursor);
-rSh.SttEndDoc(bNext);
-if (rSh.MoveFieldType(pFieldType, bNext))
+if (!rSh.MoveFieldType(pFieldType, bNext))
 {
-GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
-SvxSearchDialogWrapper::SetSearchLabel(bNext ? 
SearchLabel::EndWrapped :
-   
SearchLabel::StartWrapped);
+if (bWrapped)
+break;
+bWrapped = true;
+rSh.SttEndDoc(bNext);
+continue;
 }
-else
+do
 {
-// no visible postits
-pCursor->RestoreSavePos();
-
SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::NavElementNotFound);
-}
+auto pAnnotationWin = m_pPostItMgr->GetAnnotationWin(
+rSh.GetPostItFieldAtCursor());
+if (pAnnotationWin && pAnnotationWin->IsVisible())
+bFound = true;
+} while (!bFound && rSh.MoveFieldType(pFieldType, bNext));
 }
-else
+if (!bFound)
 {
-GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
-SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty 
);
+pCursor->RestoreSavePos();
+
SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::NavElementNotFound);
 }
 rSh.EndAction();
+if (bFound)
+{
+GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
+if (bWrapped)
+SvxSearchDialogWrapper::SetSearchLabel(bNext ? 
SearchLabel::EndWrapped :
+   
SearchLabel::StartWrapped);
+else
+
SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::Empty);
+}
 }
 else
 
SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::NavElementNotFound);
@@ -597,7 +607,8 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
 bNext ? rSh.GetNavigationMgr().goForward() : 
rSh.GetNavigationMgr().goBack();
 break;
 }
-m_pEditWin->GrabFocus();
+if

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

2022-01-27 Thread Justin Luth (via logerrit) 
 sw/sdi/drwtxtsh.sdi  |5 +
 sw/source/uibase/shells/drwtxtex.cxx |9 +
 2 files changed, 14 insertions(+)

New commits:
commit bb183ef3734cc3ccad81bd1ca1309f726c279870
Author: Justin Luth 
AuthorDate: Thu Jan 27 15:08:21 2022 +0200
Commit: Justin Luth 
CommitDate: Fri Jan 28 07:16:50 2022 +0100

related tdf#111733 TextCharacterSpacingControl sw draw: goto position tab

The kerning button on the sidebar very unhelpfully
did nothing at all in draw text (like textboxes).
It should have brought the user directly to the "position" tab
where the kerning property can be found.

Change-Id: I89d4a180ac19e1e096b9157f3f32a254ff138940
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129045
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index c9e76ab9fbfb..3acf703d75e8 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -393,6 +393,11 @@ interface TextDrawText
 StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+SID_CHAR_DLG_POSITION
+[
+ExecMethod = Execute ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_CHAR_DLG_FOR_PARAGRAPH
 [
 ExecMethod = Execute ;
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 068a9be9feca..502fd7a6fa09 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -353,6 +353,7 @@ void SwDrawTextShell::Execute( SfxRequest  )
 break;
 
 case SID_CHAR_DLG_EFFECT:
+case SID_CHAR_DLG_POSITION:
 case SID_CHAR_DLG:
 case SID_CHAR_DLG_FOR_PARAGRAPH:
 {
@@ -386,6 +387,10 @@ void SwDrawTextShell::Execute( SfxRequest  )
 {
 pDlg->SetCurPageId("fonteffects");
 }
+else if (nSlot == SID_CHAR_DLG_POSITION)
+{
+pDlg->SetCurPageId("position");
+}
 else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
 {
 pDlg->SetCurPageId("font");
@@ -640,6 +645,10 @@ void SwDrawTextShell::Execute( SfxRequest  )
 {
 
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
 }
+else if (nEEWhich == EE_CHAR_KERNING)
+{
+
GetView().GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_POSITION);
+}
 
 
 SetAttrToMarked(aNewAttr);

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

2022-01-27 Thread Justin Luth (via logerrit) 
 sw/sdi/_annotsh.sdi |7 +++
 sw/source/uibase/shells/annotsh.cxx |   10 ++
 2 files changed, 17 insertions(+)

New commits:
commit e1f82fec6262db708f7911d20b62b74a4b4feab2
Author: Justin Luth 
AuthorDate: Thu Jan 27 15:21:37 2022 +0200
Commit: Justin Luth 
CommitDate: Fri Jan 28 05:58:09 2022 +0100

related tdf#11173 TextCharacterSpacingControl sw annot: goto position tab

The kerning button on the sidebar very unhelpfully
did nothing at all in draw text (like textboxes).
It should have brought the user directly to the "position" tab
where the kerning property can be found.

Change-Id: I83687c732cc45bb28a835e878d0c91f10fb713ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129046
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index b335fb9e0676..ff720d238226 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -326,6 +326,13 @@ interface _Annotation
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_CHAR_DLG_POSITION
+[
+ExecMethod = Exec ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 SID_ATTR_CHAR_WEIGHT // api:
 [
 ExecMethod = Exec ;
diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 61b665058381..95880f303579 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -449,6 +449,7 @@ void SwAnnotationShell::Exec( SfxRequest  )
 break;
 }
 case SID_CHAR_DLG_EFFECT:
+case SID_CHAR_DLG_POSITION:
 case SID_CHAR_DLG:
 {
 const SfxItemSet* pArgs = rReq.GetArgs();
@@ -474,6 +475,10 @@ void SwAnnotationShell::Exec( SfxRequest  )
 {
 pDlg->SetCurPageId("fonteffects");
 }
+if (nSlot == SID_CHAR_DLG_POSITION)
+{
+pDlg->SetCurPageId("position");
+}
 else if (pItem)
 {
 pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), 
RTL_TEXTENCODING_UTF8));
@@ -582,6 +587,11 @@ void SwAnnotationShell::Exec( SfxRequest  )
 {
 m_rView.GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_EFFECT);
 }
+else if (nEEWhich == EE_CHAR_KERNING)
+{
+
m_rView.GetViewFrame()->GetDispatcher()->Execute(SID_CHAR_DLG_POSITION);
+}
+
 
 tools::Rectangle aOutRect = pOLV->GetOutputArea();
 if (tools::Rectangle() != aOutRect && aNewAttr.Count())

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

2021-10-19 Thread Jim Raykowski (via logerrit) 
 sw/sdi/_navsh.sdi |2 --
 sw/source/core/crsr/crstrvl.cxx   |6 ++
 sw/source/core/crsr/trvlfnfl.cxx  |   10 ++
 sw/source/uibase/wrtsh/navmgr.cxx |4 
 sw/source/uibase/wrtsh/wrtsh2.cxx |4 
 5 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit cf8de077f885b7632967c8bdfde98279d98f4cce
Author: Jim Raykowski 
AuthorDate: Mon Oct 18 21:49:45 2021 -0800
Commit: Jim Raykowski 
CommitDate: Wed Oct 20 02:42:57 2021 +0200

tdf#74604 tdf#54412 Make recency work for hyperlink, field and footnote

cursor position changes

Change-Id: I451cb5a538fd4baf00282238741011c6d4fc17b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123793
Tested-by: Jenkins
Reviewed-by: V, Stuart Foote 
Reviewed-by: Jim Raykowski 

diff --git a/sw/sdi/_navsh.sdi b/sw/sdi/_navsh.sdi
index 03ecd8498544..413355e4312f 100644
--- a/sw/sdi/_navsh.sdi
+++ b/sw/sdi/_navsh.sdi
@@ -13,14 +13,12 @@ interface _Navigation
 [
 ExecMethod = Execute ;
 StateMethod = GetState;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
 SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD
 [
 ExecMethod = Execute ;
 StateMethod = GetState;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
 }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index d241ba739bf8..e2e5822a3103 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -833,6 +833,9 @@ bool SwCursorShell::MoveFieldType(
 
 bool SwCursorShell::GotoFootnoteAnchor(const SwTextFootnote& rTextFootnote)
 {
+if (SwWrtShell* pWrtSh = dynamic_cast(this))
+pWrtSh->addCurrentPosition();
+
 bool bRet = false;
 SwCursor* pCursor = getShellCursor(true);
 
@@ -1482,6 +1485,9 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 bRet = true;
 if( bSetCursor )
 {
+if (SwWrtShell* pWrtSh = 
dynamic_cast(this))
+pWrtSh->addCurrentPosition();
+
 SwCallLink aLk( *this ); // watch Cursor-Moves
 SwCursorSaveState aSaveState( *m_pCurrentCursor );
 m_pCurrentCursor->GetPoint()->nNode = 
*static_cast(pTextAttr)->GetStartNode();
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 45dcb5415afa..62c30c55f0dc 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -30,9 +30,13 @@
 #include 
 #include "callnk.hxx"
 #include 
+#include 
 
 bool SwCursorShell::CallCursorShellFN( FNCursorShell fnCursor )
 {
+if (SwWrtShell* pWrtSh = dynamic_cast(this))
+pWrtSh->addCurrentPosition();
+
 SwCallLink aLk( *this ); // watch Cursor-Moves
 bool bRet = (this->*fnCursor)();
 if( bRet )
@@ -43,6 +47,9 @@ bool SwCursorShell::CallCursorShellFN( FNCursorShell fnCursor 
)
 
 bool SwCursorShell::CallCursorFN( FNCursor fnCursor )
 {
+if (SwWrtShell* pWrtSh = dynamic_cast(this))
+pWrtSh->addCurrentPosition();
+
 SwCallLink aLk( *this ); // watch Cursor-Moves
 SwCursor* pCursor = getShellCursor( true );
 bool bRet = (pCursor->*fnCursor)();
@@ -161,6 +168,9 @@ bool SwCursor::GotoFootnoteAnchor()
 
 bool SwCursorShell::GotoFootnoteAnchor()
 {
+if (SwWrtShell* pWrtSh = dynamic_cast(this))
+pWrtSh->addCurrentPosition();
+
 // jump from footnote to anchor
 SwCallLink aLk( *this ); // watch Cursor-Moves
 bool bRet = m_pCurrentCursor->GotoFootnoteAnchor();
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx 
b/sw/source/uibase/wrtsh/navmgr.cxx
index 1960f831e4ee..db97e2919146 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -170,10 +170,6 @@ void SwNavigationMgr::goForward() {
 
 bool SwNavigationMgr::addEntry(const SwPosition& rPos) {
 
-// For additions other than to the end, check here if the cursor position 
has changed
-if (m_nCurrent < m_entries.size() && (rPos == 
*m_entries[m_nCurrent]->GetPoint()))
-return false;
-
 // Flags that will be used for refreshing the buttons
 bool bBackWasDisabled = !backEnabled();
 bool bForwardWasEnabled = forwardEnabled();
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index a4f050492328..77a6d4c19d28 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -338,6 +338,8 @@ void SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const 
SfxItemSet* pSet)
 
 void SwWrtShell::ClickToField(const SwField& rField, bool bExecHyperlinks)
 {
+addCurrentPosition();
+
 // cross reference field must not be selected because it moves the cursor
 if (SwFieldIds::GetRef != rField.GetTyp()->Which())
 {
@@ -450,6 +452,8 @@ void SwWrtShell::ClickToField(const SwField& rField,

[Libreoffice-commits] core.git: sw/sdi

2021-07-14 Thread Samuel Mehrbrodt (via logerrit) 
 sw/sdi/swpatch.txt |   39 ---
 1 file changed, 39 deletions(-)

New commits:
commit 8b6bcdcddbf76e256b142408c855889414a4dd33
Author: Samuel Mehrbrodt 
AuthorDate: Wed Jul 14 16:25:59 2021 +0200
Commit: Caolán McNamara 
CommitDate: Wed Jul 14 21:30:09 2021 +0200

Remove unused file

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

diff --git a/sw/sdi/swpatch.txt b/sw/sdi/swpatch.txt
deleted file mode 100644
index 3aaeb25703d5..
--- a/sw/sdi/swpatch.txt
+++ /dev/null
@@ -1,39 +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 .
-#
-
-swinter.h:
-
-unsigned char SYSCALL SwDocumentGetIsPrinting( C_Object ObjHdl );
-
-
-swinter.c:
-
-unsigned char SYSCALL SwDocumentGetIsPrinting( C_Object ObjHdl )
-{
-if( SvIPCIsConnected() )
-{
-return (unsigned char) pIPCCallFunction( SvIPCGetClient(), 136598,
- ObjHdl , 1, NULL );
-}
-return 0;
-}
-
-#ifdef _MSC_VER
-#pragma code_seg("swinter2","CODE")
-#endif
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-03-01 Thread mert (via logerrit) 
 sw/sdi/_viewsh.sdi |5 +
 sw/sdi/drawsh.sdi  |5 +
 sw/source/uibase/shells/drawsh.cxx |   16 +++-
 sw/source/uibase/uiview/view2.cxx  |   18 ++
 4 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 9e7e616a9c3363cf06801a1974711c4dcef97476
Author: mert 
AuthorDate: Fri Feb 19 09:37:19 2021 +0300
Commit: Mert Tumer 
CommitDate: Tue Mar 2 08:27:34 2021 +0100

Implemented MoveShapeHandle uno command for sw

Change-Id: I9feccc4fa1a4d7426609afa474f87ab12c769090
Signed-off-by: mert 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111512
Tested-by: Jenkins

diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 7b11d4064d1f..f55496ee26a4 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -976,5 +976,10 @@ interface BaseTextEditView
 MenuConfig , AccelConfig , ToolBoxConfig ;
 ]
 
+SID_MOVE_SHAPE_HANDLE
+[
+ExecMethod = Execute ;
+]
+
 }
 
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 5ea1f46d1ecc..a4e999872e48 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -537,5 +537,10 @@ shell SwDrawShell : SwDrawBaseShell
 StateMethod = GetState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+
+SID_MOVE_SHAPE_HANDLE
+[
+ExecMethod = Execute ;
+]
 }
 
diff --git a/sw/source/uibase/shells/drawsh.cxx 
b/sw/source/uibase/shells/drawsh.cxx
index 09b6bdbb3a0d..7589507511a9 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -197,7 +197,21 @@ void SwDrawShell::Execute(SfxRequest )
 GetView().FlipDrawRotate();
 }
 break;
-
+case SID_MOVE_SHAPE_HANDLE:
+{
+if (pArgs && pArgs->Count() == 3)
+{
+const SfxUInt32Item* handleNumItem = 
rReq.GetArg(FN_PARAM_1);
+const SfxUInt32Item* newPosXTwips = 
rReq.GetArg(FN_PARAM_2);
+const SfxUInt32Item* newPosYTwips = 
rReq.GetArg(FN_PARAM_3);
+
+const sal_uLong handleNum = handleNumItem->GetValue();
+const sal_uLong newPosX = newPosXTwips->GetValue();
+const sal_uLong newPosY = newPosYTwips->GetValue();
+pSdrView->MoveShapeHandle(handleNum, Point(newPosX, newPosY));
+}
+}
+break;
 case SID_BEZIER_EDIT:
 if (GetView().IsDrawRotate())
 {
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index e76fc2f30e41..1946f6a3a02d 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1348,6 +1348,24 @@ void SwView::Execute(SfxRequest )
 rReq.SetReturnValue(SfxBoolItem(nSlot, InsertGraphicDlg( rReq )));
 }
 break;
+case SID_MOVE_SHAPE_HANDLE:
+{
+if (pArgs && pArgs->Count() == 3)
+{
+SdrView *pSdrView = m_pWrtShell->HasDrawView() ? 
m_pWrtShell->GetDrawView() : nullptr;
+if (pSdrView == nullptr)
+break;
+const SfxUInt32Item* handleNumItem = 
rReq.GetArg(FN_PARAM_1);
+const SfxUInt32Item* newPosXTwips = 
rReq.GetArg(FN_PARAM_2);
+const SfxUInt32Item* newPosYTwips = 
rReq.GetArg(FN_PARAM_3);
+
+const sal_uLong handleNum = handleNumItem->GetValue();
+const sal_uLong newPosX = newPosXTwips->GetValue();
+const sal_uLong newPosY = newPosYTwips->GetValue();
+pSdrView->MoveShapeHandle(handleNum, Point(newPosX, newPosY));
+}
+break;
+}
 
 default:
 OSL_ENSURE(false, "wrong dispatcher");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-09-26 Thread Jim Raykowski (via logerrit) 
 sw/sdi/_viewsh.sdi   |   10 ++
 sw/source/uibase/uiview/view2.cxx|   13 +
 sw/source/uibase/uiview/viewmdi.cxx  |3 +++
 sw/source/uibase/uiview/viewstat.cxx |   11 +++
 4 files changed, 37 insertions(+)

New commits:
commit 2cddaa6e199ed8bb6185b7825791199f9da4a670
Author: Jim Raykowski 
AuthorDate: Tue Sep 15 21:41:25 2020 -0800
Commit: Jim Raykowski 
CommitDate: Sun Sep 27 06:34:51 2020 +0200

tdf#45705 Integrate zoom UI commands into Writer text edit view

Change-Id: I71481e018175086a1a1711db22cea03b13eda490
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102830
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index e087a07a6126..8231265d4e21 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -18,6 +18,16 @@
 
 interface BaseTextEditView
 {
+SID_ZOOM_IN
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+SID_ZOOM_OUT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
 FN_TOGGLE_OUTLINE_CONTENT_VISIBILITY
 [
 ExecMethod = Execute ;
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index b4ae522a2cf9..6866c8b4788a 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -141,6 +141,8 @@
 #include 
 #include 
 
+#include 
+
 const char sStatusDelim[] = " : ";
 
 using namespace sfx2;
@@ -581,6 +583,17 @@ void SwView::Execute(SfxRequest )
 rTmpWin.SetUseInputLanguage( false );
 }
 break;
+case SID_ZOOM_IN:
+case SID_ZOOM_OUT:
+{
+long nFact = m_pWrtShell->GetViewOptions()->GetZoom();
+if (SID_ZOOM_OUT == nSlot)
+nFact = basegfx::zoomtools::zoomIn(nFact);
+else
+nFact = basegfx::zoomtools::zoomOut(nFact);
+SetZoom(SvxZoomType::PERCENT, nFact);
+}
+break;
 case FN_TO_PREV_PAGE:
 case FN_TO_NEXT_PAGE:
 {
diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index 12606618f8e2..3b18942f150d 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -77,6 +77,9 @@ void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, 
bool bViewOnly )
 if (bCursorIsVisible)
 m_pWrtShell->ShowCursor();
 
+Invalidate(SID_ZOOM_IN);
+Invalidate(SID_ZOOM_OUT);
+
 collectUIInformation(OUString::number(nFactor));
 }
 
diff --git a/sw/source/uibase/uiview/viewstat.cxx 
b/sw/source/uibase/uiview/viewstat.cxx
index c9ace0d854a0..8c267d180350 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -69,6 +69,17 @@ void SwView::GetState(SfxItemSet )
 {
 switch(nWhich)
 {
+case SID_ZOOM_IN:
+case SID_ZOOM_OUT:
+{
+long nFact = m_pWrtShell->GetViewOptions()->GetZoom();
+if ((SID_ZOOM_OUT == nWhich && nFact >= long(600)) ||
+(SID_ZOOM_IN == nWhich && nFact <= long(20)))
+{
+rSet.DisableItem(nWhich);
+}
+}
+break;
 case FN_TOGGLE_OUTLINE_CONTENT_VISIBILITY:
 {
 bool bDisable(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi sw/source sw/uiconfig

2019-08-06 Thread Samuel Mehrbrodt (via logerrit) 
 sw/sdi/drwtxtsh.sdi|   12 +++
 sw/source/uibase/shells/drwtxtex.cxx   |   30 +
 sw/uiconfig/swriter/popupmenu/drawtext.xml |2 +
 3 files changed, 44 insertions(+)

New commits:
commit e959f4446cbba0e07c89c2be468e4ade29e7ef0c
Author: Samuel Mehrbrodt 
AuthorDate: Tue Aug 6 10:41:52 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Aug 6 11:58:56 2019 +0200

Add missing hyperlink context menu entries to sw shapes

"Copy Hyperlink location" and "Open hyperlink" were missing.

Change-Id: I53ede27570a7b2378e5eb8be05d77bb131a87ab7
Reviewed-on: https://gerrit.libreoffice.org/77011
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 560c60b9d7d1..259ed1e8be66 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -546,6 +546,12 @@ interface TextDrawText
 [
 StateMethod = StateInsert ;
 ]
+SID_OPEN_HYPERLINK
+[
+ExecMethod = Execute ;
+StateMethod = GetState;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_EDIT_HYPERLINK
 [
 ExecMethod = Execute ;
@@ -558,6 +564,12 @@ interface TextDrawText
 StateMethod = GetState;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+FN_COPY_HYPERLINK_LOCATION
+[
+ExecMethod = Execute ;
+StateMethod = GetState;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_TRANSLITERATE_SENTENCE_CASE
 [
 ExecMethod = ExecTransliteration;
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index e5c63fbb0f77..e802654a7717 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -501,6 +502,33 @@ void SwDrawTextShell::Execute( SfxRequest  )
 }
 break;
 
+case SID_OPEN_HYPERLINK:
+{
+const SvxFieldData* pField = pOLV->GetFieldAtCursor();
+if (const SvxURLField* pURLField = dynamic_cast(pField))
+{
+SfxStringItem aUrl(SID_FILE_NAME, pURLField->GetURL());
+SfxStringItem aTarget(SID_TARGETNAME, 
pURLField->GetTargetFrame());
+SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, false);
+SfxBoolItem aBrowsing(SID_BROWSE, true);
+GetView().GetViewFrame()->GetDispatcher()->ExecuteList(
+SID_OPENDOC, SfxCallMode::SYNCHRON, { , , 
,  });
+}
+}
+break;
+
+case FN_COPY_HYPERLINK_LOCATION:
+{
+const SvxFieldData* pField = pOLV->GetFieldAtCursor();
+if (const SvxURLField* pURLField = dynamic_cast(pField))
+{
+uno::Reference xClipboard
+= GetView().GetEditWin().GetClipboard();
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+}
+}
+break;
+
 case SID_TEXTDIRECTION_LEFT_TO_RIGHT:
 case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
 // Shell switch!
@@ -902,6 +930,8 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
 break;
 case SID_REMOVE_HYPERLINK:
 case SID_EDIT_HYPERLINK:
+case SID_OPEN_HYPERLINK:
+case FN_COPY_HYPERLINK_LOCATION:
 {
 if (!URLFieldHelper::IsCursorAtURLField(pOLV))
 rSet.DisableItem(nWhich);
diff --git a/sw/uiconfig/swriter/popupmenu/drawtext.xml 
b/sw/uiconfig/swriter/popupmenu/drawtext.xml
index 7536d60f7fd7..07a09cccae9d 100644
--- a/sw/uiconfig/swriter/popupmenu/drawtext.xml
+++ b/sw/uiconfig/swriter/popupmenu/drawtext.xml
@@ -25,7 +25,9 @@
   
   
   
+  
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-28 Thread Miklos Vajna (via logerrit) 
 sw/sdi/_frmsh.sdi |5 +
 sw/source/uibase/inc/frmsh.hxx|1 +
 sw/source/uibase/shells/frmsh.cxx |   13 +
 3 files changed, 19 insertions(+)

New commits:
commit 40c096508da7ee14f36715eee3185041f4a36ddd
Author: Miklos Vajna 
AuthorDate: Tue May 28 18:11:13 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue May 28 19:46:23 2019 +0200

sw: implement select-all for the frame shell

There is no reason why Ctrl-A should be a NOP when you have an image
selected.

No test, there is one in the cp-6.0 copy code, that coverage will
arrive as part of that copy code forward-port.

Change-Id: If0013ee0e9ff9a6fb038a22de7b5d3c76e5c52b9
Reviewed-on: https://gerrit.libreoffice.org/73118
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 6d02c04efdeb..398cd30a93ff 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -406,5 +406,10 @@ interface BaseTextFrame
 ExecMethod = Execute ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+SID_SELECTALL
+[
+ExecMethod = ExecMove ;
+StateMethod = NoState ;
+]
 }
 
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index f86e0d06501f..4b8a64c75823 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -35,6 +35,7 @@ public:
 virtual ~SwFrameShell() override;
 
 voidExecute(SfxRequest &);
+voidExecMove(SfxRequest& rReq);
 voidGetState(SfxItemSet &);
 voidExecFrameStyle(SfxRequest const & rReq);
 voidGetLineStyleState(SfxItemSet );
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index d0fead931a0b..dfb403b9ffcf 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -115,6 +115,19 @@ void SwFrameShell::InitInterface_Impl()
 GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, 
SfxVisibilityFlags::Invisible, ToolbarId::Frame_Toolbox);
 }
 
+void SwFrameShell::ExecMove(SfxRequest& rReq)
+{
+SwWrtShell& rSh = GetShell();
+sal_uInt16 nSlot = rReq.GetSlot();
+switch (nSlot)
+{
+case SID_SELECTALL:
+rSh.SelAll();
+rReq.Done();
+break;
+}
+}
+
 void SwFrameShell::Execute(SfxRequest )
 {
 //First those who do not need FrameMgr.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-16 Thread Libreoffice Gerrit user 
 sw/sdi/_textsh.sdi  |6 +++
 sw/source/uibase/shells/textsh1.cxx |   59 
 2 files changed, 65 insertions(+)

New commits:
commit 770ef0d216a30efd756b4be26e9fc6e077748fed
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 14:11:37 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Sat Feb 16 18:34:57 2019 +0100

MSForms: Make Control Properties menu to work with drop-down form field

Always forward the Execute and State method to the form shell,
so if a form control is selected the Control Properites will
work correctly.
Otherwise we check whether there is any field next to the cursor.

Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e
Reviewed-on: https://gerrit.libreoffice.org/67911
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
 StateMethod = StateField ;
 ]
 
+SID_FM_CTL_PROPERTIES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
 }  // end of interface text
 
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index fd759463b971..270fcabc08dc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest )
 GetView().UpdateWordCount(this, nSlot);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), 
pFieldBM));
+pDlg->Execute();
+pFieldBM->Invalidate();
+rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+}
+else
+{
+SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+rWrtSh.GetView().GetFormShell()->Execute( aReq );
+}
+}
+break;
 default:
 OSL_ENSURE(false, "wrong dispatcher");
 return;
@@ -1906,6 +1934,37 @@ void SwTextShell::GetState( SfxItemSet  )
 rSet.DisableItem(nWhich);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+bool bDisable = false;
+
+// First get the state from the form shell
+SfxItemSet aSet(GetShell().GetAttrPool(), 
svl::Items{});
+aSet.Put(SfxBoolItem( SID_FM_CTL_PROPERTIES, true ));
+GetShell().GetView().GetFormShell()->GetState( aSet );
+
+if(SfxItemState::DISABLED == 
aSet.GetItemState(SID_FM_CTL_PROPERTIES))
+{
+bDisable = true;
+}
+
+// Enable it if we have a valid object other than what form 
shell knows
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+bDisable = false;
+}
+
+if(bDisable)
+rSet.DisableItem(nWhich);
+}
+break;
 }
 nWhich = aIter.NextWhich();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-09-03 Thread Libreoffice Gerrit user 
 sw/sdi/_frmsh.sdi |6 ++
 sw/source/uibase/shells/frmsh.cxx |6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 6c3d10d86e48e92ad963750ec5ba6e1049df2532
Author: Maxim Monastirsky 
AuthorDate: Mon Sep 3 12:16:55 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Mon Sep 3 23:39:20 2018 +0200

Enable the align group button for frames

Change-Id: I6ba8b5fe0d185817e61986c90f5264493b6d5339
Reviewed-on: https://gerrit.libreoffice.org/59951
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 734b50c5ebc1..6d02c04efdeb 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -330,6 +330,12 @@ interface BaseTextFrame
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_OBJECT_ALIGN
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 FN_FORMAT_FOOTNOTE_DLG // status()
 [
 ExecMethod = Execute;
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index b9c7b98a3f95..1f3a0d3424ca 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -735,6 +735,12 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 rSet.Put(aSet.Get(GetPool().GetWhich(nWhich)));
 }
 break;
+case SID_OBJECT_ALIGN:
+{
+if ( bProtect )
+rSet.DisableItem( nWhich );
+}
+break;
 case SID_OBJECT_ALIGN_LEFT   :
 case SID_OBJECT_ALIGN_CENTER :
 case SID_OBJECT_ALIGN_RIGHT  :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-09-02 Thread Libreoffice Gerrit user 
 sw/sdi/_annotsh.sdi |7 +++
 sw/source/uibase/shells/annotsh.cxx |5 +
 2 files changed, 12 insertions(+)

New commits:
commit 4d8a5ebdf9d2bef608a77559e93b5c543acfe6fd
Author: Maxim Monastirsky 
AuthorDate: Sun Sep 2 14:40:45 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Sun Sep 2 19:30:04 2018 +0200

tdf#117835 Paste as Unformatted for comments in Writer

Change-Id: Ia96f8c51cc0a3898c1169454bd7c3031e08c45d4
Reviewed-on: https://gerrit.libreoffice.org/59906
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 27c200944c0f..e271625bcdd8 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -96,6 +96,13 @@ interface _Annotation
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_PASTE_UNFORMATTED
+[
+ExecMethod = ExecClpbrd ;
+StateMethod = StateClpbrd ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 SID_PASTE_SPECIAL  // api:
 [
 StateMethod = StateClpbrd ;
diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index 19a513387e3f..9a519715a5c9 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -906,6 +906,10 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest const )
 if 
(pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
 pOLV->PasteSpecial();
 break;
+case SID_PASTE_UNFORMATTED:
+if 
(pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
+pOLV->Paste();
+break;
 case SID_PASTE_SPECIAL:
 {
 if 
(pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
@@ -986,6 +990,7 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet )
 break;
 }
 case SID_PASTE:
+case SID_PASTE_UNFORMATTED:
 case SID_PASTE_SPECIAL:
 {
 if( !bPastePossible )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-09-02 Thread Libreoffice Gerrit user 
 sw/sdi/drwtxtsh.sdi  |   19 +--
 sw/source/uibase/shells/drwtxtex.cxx |   86 ++-
 2 files changed, 88 insertions(+), 17 deletions(-)

New commits:
commit 8fb5567dc05397e9b28b821b2d3ff2735ccdeb33
Author: Maxim Monastirsky 
AuthorDate: Sun Sep 2 13:20:07 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Sun Sep 2 18:07:04 2018 +0200

tdf#118674 Paste special and unformatted for shapes in Writer

Change-Id: I348a6f93b61ea644077dcd3a16ba9d9fe17afb91
Reviewed-on: https://gerrit.libreoffice.org/59905
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index b24f0e8e43f2..a8e79c298b4f 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -44,17 +44,26 @@ interface TextDrawText
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_PASTE_UNFORMATTED  // api:
+[
+ExecMethod = ExecClpbrd ;
+StateMethod = StateClpbrd ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 SID_PASTE_SPECIAL  // api:
 [
+ExecMethod = ExecClpbrd ;
 StateMethod = StateClpbrd ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
-SID_CLIPBOARD_FORMAT_ITEMS  // api:
-[
-StateMethod = StateClpbrd ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
-]
+SID_CLIPBOARD_FORMAT_ITEMS  // api:
+[
+ExecMethod = ExecClpbrd ;
+StateMethod = StateClpbrd ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 
 FN_ESCAPE // api:
 [
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 15bd355de83d..8328b9ffd8c2 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -54,7 +54,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -995,6 +997,54 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest const )
 pOLV->PasteSpecial();
 break;
 
+case SID_PASTE_UNFORMATTED:
+pOLV->Paste();
+break;
+
+case SID_PASTE_SPECIAL:
+{
+SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreatePasteDialog(GetView().GetEditWin().GetFrameWeld()));
+
+pDlg->Insert(SotClipboardFormatId::STRING, OUString());
+pDlg->Insert(SotClipboardFormatId::RTF, OUString());
+pDlg->Insert(SotClipboardFormatId::RICHTEXT, OUString());
+
+TransferableDataHelper 
aDataHelper(TransferableDataHelper::CreateFromSystemClipboard(().GetEditWin()));
+SotClipboardFormatId nFormat = 
pDlg->GetFormat(aDataHelper.GetTransferable());
+
+if (nFormat != SotClipboardFormatId::NONE)
+{
+if (nFormat == SotClipboardFormatId::STRING)
+pOLV->Paste();
+else
+pOLV->PasteSpecial();
+}
+
+break;
+}
+
+case SID_CLIPBOARD_FORMAT_ITEMS:
+{
+SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
+const SfxPoolItem* pItem;
+if (rReq.GetArgs() && rReq.GetArgs()->GetItemState(nId, true, 
) == SfxItemState::SET)
+{
+if (const SfxUInt32Item* pUInt32Item = dynamic_cast(pItem))
+nFormat = 
static_cast(pUInt32Item->GetValue());
+}
+
+if (nFormat != SotClipboardFormatId::NONE)
+{
+if (nFormat == SotClipboardFormatId::STRING)
+pOLV->Paste();
+else
+pOLV->PasteSpecial();
+}
+
+break;
+}
+
 default:
 OSL_FAIL("wrong dispatcher");
 return;
@@ -1011,6 +1061,11 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet )
 const bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
 (aSel.nStartPos != aSel.nEndPos);
 
+TransferableDataHelper aDataHelper( 
TransferableDataHelper::CreateFromSystemClipboard( ().GetEditWin() ) );
+const bool bPaste = aDataHelper.HasFormat( SotClipboardFormatId::STRING ) 
||
+aDataHelper.HasFormat( SotClipboardFormatId::RTF ) ||
+aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT 
);
+
 SfxWhichIter aIter(rSet);
 sal_uInt16 nWhich = aIter.FirstWhich();
 
@@ -1025,21 +1080,28 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet )
 break;
 
 case SID_PASTE:
-{
-TransferableDataHelper aDataHelper(
-TransferableDataHelper::CreateFromSystemClipboard( 
().GetEditWin() ) );
-
-if( !aDataHelper.GetXTransferable().is()
-|| !SwTransferable::IsPaste( GetShell(), aDataHelper ) )
-

[Libreoffice-commits] core.git: sw/sdi

2018-07-08 Thread Xisco Fauli 
 sw/sdi/swriter.sdi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eedeeb63d1287ed0416e1fe3d2f7ba37632626d0
Author: Xisco Fauli 
Date:   Sat Jul 7 00:39:38 2018 +0200

tdf#89893: Enable previous/next track changes in read-only mode

Change-Id: Ie7dd41b2f79347e9b959a73d5915379f2e2a
Reviewed-on: https://gerrit.libreoffice.org/57100
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 058fc4bc09f6..19aa9dfeae05 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7263,7 +7263,7 @@ SfxVoidItem NextTrackedChange FN_REDLINE_NEXT_CHANGE
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = FALSE,
+ReadOnlyDoc = TRUE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -7281,7 +7281,7 @@ SfxVoidItem PreviousTrackedChange FN_REDLINE_PREV_CHANGE
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = FALSE,
+ReadOnlyDoc = TRUE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2018-02-01 Thread Jim Raykowski 
 sw/sdi/swriter.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e11eac6b2c7dc4ea6c8fd9fe5a7f8a20510a381d
Author: Jim Raykowski 
Date:   Fri Dec 22 18:45:51 2017 -0900

make 'Navigate By' control avaliable in read only mode

Change-Id: I02926aa962c045081dcf61bfc7a8d2cf522d6e92
Reviewed-on: https://gerrit.libreoffice.org/47011
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 1080b680f52a..3bd3026c9c21 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7672,7 +7672,7 @@ SfxVoidItem NavElement FN_NAV_ELEMENT
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
-ReadOnlyDoc = FALSE,
+ReadOnlyDoc = TRUE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2017-08-16 Thread Andrea Gelmini 
 sw/sdi/_textsh.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b07ce585e8f323c4d9b6596e9f663a3e78492be
Author: Andrea Gelmini 
Date:   Wed Aug 16 17:31:26 2017 +0200

Translated "Methoden" to complete b1f6e6299cf5

No more "methoden" in the tree...

Change-Id: I4deec3c47bfab12beabd1b6d56c9b9c3c2b6c4a7
Reviewed-on: https://gerrit.libreoffice.org/41226
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index b592cb0495dc..75d34f07fdc3 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -444,7 +444,7 @@ interface BaseText
 StateMethod = NoState ;
 ]
 
- // Goto - Methoden
+ // Goto - Methods
 
 SID_FM_TOGGLECONTROLFOCUS
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2017-06-14 Thread Bernhard Widl 
 sw/sdi/_grfsh.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a3a9a393c74872a5ec5f227b7c30ae3d4bcb1aa
Author: Bernhard Widl 
Date:   Wed Jun 14 09:22:38 2017 +0200

tdf#39468 translate german comments in sw

Change-Id: I22114e9c8adaad67f71811f2b44fdd8a6d6e7f7b
Reviewed-on: https://gerrit.libreoffice.org/38767
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index c37d2a197edd..1dc453608103 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -101,7 +101,7 @@ interface BaseTextGraphic
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
-SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
+SID_INSERT_GRAPHIC // points to FN_FORMAT_GRAFIC_DLG
 [
 ExecMethod = Execute ;
 StateMethod = GetAttrState ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-07 Thread Pranav Kant 
 sw/sdi/swriter.sdi  |2 +-
 sw/source/uibase/shells/textfld.cxx |   34 +-
 2 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit c3d1be64e882f7e0edd0e693b9f73a0556bcb003
Author: Pranav Kant 
Date:   Wed Mar 1 17:32:08 2017 +0530

lok: Allow changing comment text of document redlines

The id of the redline is optional. If not mentioned, the current redline
is assumed to be the one whose comment text will be changed.

Change-Id: Ia859de171603239a78f4bdef5eff0facd580d027
Reviewed-on: https://gerrit.libreoffice.org/34923
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index cb42b58..e9ac677 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -663,7 +663,7 @@ SfxVoidItem ClosePreview FN_CLOSE_PAGEPREVIEW
 ]
 
 SfxVoidItem CommentChangeTracking FN_REDLINE_COMMENT
-()
+(SfxUInt16Item ChangeTrackingId FN_REDLINE_COMMENT,SvxPostItTextItem Text 
SID_ATTR_POSTIT_TEXT)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index 6cee279..ac5af41 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -509,9 +509,41 @@ void SwTextShell::ExecField(SfxRequest )
 */
 
 const SwRangeRedline *pRedline = rSh.GetCurrRedline();
+SwDoc *pDoc = rSh.GetDoc();
+SwRedlineTable::size_type nRedline = SwRedlineTable::npos;
+if (pArgs && pArgs->GetItemState(nSlot, false, ) == 
SfxItemState::SET)
+{
+//TODO: SfxUInt16Item vs. SwRedlineTable::size_type 
mismatch:
+nRedline = static_cast(pItem)->GetValue();
+if (nRedline == USHRT_MAX)
+nRedline = SwRedlineTable::npos;
+
+if (nRedline != SwRedlineTable::npos)
+{
+// If index is specified, goto and select the 
appropriate redline
+const SwRedlineTable& rTable = 
pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+if (nRedline < rTable.size())
+pRedline = rSh.GotoRedline(nRedline, true);
+}
+}
+
+OUString sCommentText;
+const SfxStringItem* pTextItem = 
rReq.GetArg(SID_ATTR_POSTIT_TEXT);
+if (pTextItem)
+sCommentText = pTextItem->GetValue();
 
 if (pRedline)
 {
+// In case of LOK and comment text is already provided, 
skip
+// dialog creation and just change the redline comment 
directly
+if (comphelper::LibreOfficeKit::isActive() && 
!sCommentText.isEmpty())
+{
+rSh.SetRedlineComment(sCommentText);
+GetView().AttrChangedNotify(GetShellPtr());
+
const_cast(pRedline)->MaybeNotifyModification();
+break;
+}
+
 OUString sComment = convertLineEnd(pRedline->GetComment(), 
GetSystemLineEnd());
 
 bool bTravel = false;
@@ -811,7 +843,7 @@ void SwTextShell::StateField( SfxItemSet  )
 break;
 
 case FN_REDLINE_COMMENT:
-if (!rSh.GetCurrRedline())
+if (!comphelper::LibreOfficeKit::isActive() && 
!rSh.GetCurrRedline())
 rSet.DisableItem(nWhich);
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2017-02-06 Thread pv2k 
 sw/sdi/swriter.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a73fb11cb235dd600d29f214f8a079792f6b2445
Author: pv2k 
Date:   Sun Feb 5 02:29:40 2017 +0530

tdf#92492 function placed in a wrong category in customise functions list

"Table To Text","Text To Table" and "Text<->Table" have been removed from
"Options" category and placed in "Table" category

Change-Id: Ic5717e4cf91ce3fde2d40b3a3f567747fa7b983f
Reviewed-on: https://gerrit.libreoffice.org/33919
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a835734..cb42b58 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -713,7 +713,7 @@ SfxVoidItem ConvertTableText FN_CONVERT_TEXT_TABLE
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = GID_OPTIONS;
+GroupId = GID_TABLE;
 ]
 
 SfxVoidItem CreateAbstract FN_ABSTRACT_NEWDOC
@@ -6965,7 +6965,7 @@ SfxVoidItem ConvertTableToText FN_CONVERT_TABLE_TO_TEXT
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = GID_OPTIONS;
+GroupId = GID_TABLE;
 ]
 
 SfxVoidItem ConvertTextToTable FN_CONVERT_TEXT_TO_TABLE
@@ -6990,7 +6990,7 @@ SfxVoidItem ConvertTextToTable FN_CONVERT_TEXT_TO_TABLE
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = GID_OPTIONS;
+GroupId = GID_TABLE;
 ]
 
 SfxVoidItem HeadingRowsRepeat FN_TABLE_HEADLINE_REPEAT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2017-01-18 Thread Szymon Kłos 
 sw/sdi/_docsh.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b93856a666cc0af099c934669a3d593116456b84
Author: Szymon Kłos 
Date:   Wed Jan 18 15:32:29 2017 +0100

tdf#102142 : Disable edit paragraph style in the print preview mode

Before that patch clicking on the Edit button
in the print preview mode was causing a crash.

Change-Id: Idd6ab2f16f515caa1d5fd3ed4ccdf9ae681849b5
Reviewed-on: https://gerrit.libreoffice.org/33269
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index 3bb9b7f..f85f95f 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -38,7 +38,7 @@ interface BaseTextDocument
 SID_STYLE_EDIT
 [
 ExecMethod = ExecStyleSheet ;
-StateMethod = NoState ;
+StateMethod = StateStyleSheet ;
 ]
 
 SID_STYLE_DELETE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2016-11-17 Thread Mike Kaganski 
 sw/sdi/_annotsh.sdi |2 ++
 sw/sdi/_viewsh.sdi  |2 ++
 sw/sdi/drwtxtsh.sdi |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit c87e31f763b9c7e0372a13096be205a5930b6498
Author: Mike Kaganski 
Date:   Thu Nov 17 03:06:43 2016 +0300

tdf#103965: set DisableFlags for SID_PARASPACE_INCREASE/DECREASE

Change-Id: Ic60b987d16e3ef97413a38ec5a1ddd6d1d7f93f8
Reviewed-on: https://gerrit.libreoffice.org/30916
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index a3db358..692c888 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -206,11 +206,13 @@ interface _Annotation
 [
 ExecMethod = Exec;
 StateMethod = GetState;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 SID_PARASPACE_DECREASE
 [
 ExecMethod = Exec;
 StateMethod = GetState;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
 FN_INSERT_STRING
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index eed8483..02706cc 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -432,12 +432,14 @@ interface BaseTextEditView
 [
 ExecMethod = ExecTabWin;
 StateMethod = StateTabWin;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
 SID_PARASPACE_DECREASE
 [
 ExecMethod = ExecTabWin;
 StateMethod = StateTabWin;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
 SID_ATTR_PAGE_COLUMN
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index bb28601..e673730 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -217,12 +217,14 @@ interface TextDrawText
 [
 ExecMethod = Execute;
 StateMethod = GetState;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
 SID_PARASPACE_DECREASE
 [
 ExecMethod = Execute;
 StateMethod = GetState;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
 SID_ATTR_PARA_LINESPACE // api:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-13 Thread Gulsah Kose 
 sw/sdi/_frmsh.sdi |7 +++
 sw/source/uibase/shells/frmsh.cxx |   25 -
 2 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit c3c08a16f8317266bcb86041d812d8a9821c237f
Author: Gulsah Kose 
Date:   Thu Nov 10 17:32:11 2016 +0300

tdf#103268 Activate editing object name function for writer images.

Change-Id: Idfe88a3f5b7492dc6ac71fa3791839a000a7483b
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/30759
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index e496cecf..2ccb88f 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -369,6 +369,13 @@ interface BaseTextFrame
 StateMethod = GetState ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
+// tdf#103268
+FN_NAME_SHAPE
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
 
 // Abfragefunktionen fuer ImageMaps
 // Slots ohne Export
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index 764d004..3b962a7 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -614,6 +614,29 @@ void SwFrameShell::Execute(SfxRequest )
 rReq.SetReturnValue(SfxBoolItem(nSlot, bMirror));
 }
 break;
+case FN_NAME_SHAPE:
+{
+bUpdateMgr = false;
+SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
+if ( pSdrView &&
+ pSdrView->GetMarkedObjectCount() == 1 )
+{
+OUString aName(rSh.GetFlyName());
+SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
+assert(pFact);
+ScopedVclPtr pDlg(
+pFact->CreateSvxObjectNameDialog( aName ));
+
+assert(pDlg);
+
+if ( pDlg->Execute() == RET_OK )
+{
+pDlg->GetName(aName);
+rSh.SetFlyName(aName);
+}
+}
+}
+break;
 // #i73249#
 case FN_TITLE_DESCRIPTION_SHAPE:
 {
@@ -917,6 +940,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 break;
 // #i73249#
 case FN_TITLE_DESCRIPTION_SHAPE:
+case FN_NAME_SHAPE:
 {
 SwWrtShell  = GetShell();
 SdrView* pSdrView = rWrtSh.GetDrawViewWithValidMarkList();
@@ -925,7 +949,6 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 {
 rSet.DisableItem( nWhich );
 }
-
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2016-10-15 Thread Szymon Kłos 
 sw/sdi/swriter.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04677dcba24c76a9860839ab59fb3bff86b2b6d1
Author: Szymon Kłos 
Date:   Sat Oct 15 17:18:58 2016 +0200

tdf#86946 Page Column Type popup accessible form the toolbar

Change-Id: I39ab090f62de1fb345a339b308454beb4bffe0cd

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index d28cf521..494068a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7431,7 +7431,7 @@ SfxInt16Item PageColumnType SID_ATTR_PAGE_COLUMN
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = GID_FORMAT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi sw/source sw/uiconfig

2016-10-13 Thread Gulsah Kose 
 sw/sdi/viewsh.sdi |5 +
 sw/source/uibase/ribbar/conrect.cxx   |1 +
 sw/source/uibase/ribbar/drawbase.cxx  |2 +-
 sw/source/uibase/uiview/viewdraw.cxx  |1 +
 sw/source/uibase/uiview/viewstat.cxx  |1 +
 sw/uiconfig/swriter/toolbar/arrowsbar.xml |1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit c3f95221b83f2302778e315330ff8ccf2998a397
Author: Gulsah Kose 
Date:   Thu Oct 13 14:54:24 2016 +0300

tdf#101390 Add "Diagonal Line" command to the writer arrowsbar.

Change-Id: If21ea239289b985e6a7cea717b41e073bc591c62
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/29768
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 56a2d6e..c6d83c8 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -82,6 +82,11 @@ interface TextEditView : BaseTextEditView
 ExecMethod = ExecDraw ;
 StateMethod = GetDrawState ;
 ]
+SID_DRAW_XLINE
+[
+ExecMethod = ExecDraw ;
+StateMethod = GetDrawState ;
+]
 SID_LINE_ARROW_END
 [
 ExecMethod = ExecDraw ;
diff --git a/sw/source/uibase/ribbar/conrect.cxx 
b/sw/source/uibase/ribbar/conrect.cxx
index 2e0542f..39ccea5 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -167,6 +167,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
 case SID_LINE_SQUARE_ARROW:
 case SID_LINE_ARROWS:
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 m_pWin->SetSdrDrawMode(OBJ_LINE);
 break;
 
diff --git a/sw/source/uibase/ribbar/drawbase.cxx 
b/sw/source/uibase/ribbar/drawbase.cxx
index 48526fb..820a99e 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -621,7 +621,7 @@ Point  SwDrawBase::GetDefaultCenterPos()
 // #i33136#
 bool SwDrawBase::doConstructOrthogonal() const
 {
-return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId == 
SID_DRAW_XPOLYGON_NOFILL );
+return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId == 
SID_DRAW_XPOLYGON_NOFILL || m_nSlotId == SID_DRAW_XLINE );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index 750caf8..dbe74d5 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -253,6 +253,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
 case SID_LINE_SQUARE_ARROW:
 case SID_LINE_ARROWS:
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_DRAW_MEASURELINE:
 case SID_DRAW_RECT:
 case SID_DRAW_ELLIPSE:
diff --git a/sw/source/uibase/uiview/viewstat.cxx 
b/sw/source/uibase/uiview/viewstat.cxx
index 1de3fc7..3f01b80 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -495,6 +495,7 @@ void SwView::GetDrawState(SfxItemSet )
 switch(nWhich)
 {
 case SID_DRAW_LINE:
+case SID_DRAW_XLINE:
 case SID_LINE_ARROW_END:
 case SID_LINE_ARROW_CIRCLE:
 case SID_LINE_ARROW_SQUARE:
diff --git a/sw/uiconfig/swriter/toolbar/arrowsbar.xml 
b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
index cfe177a..40d7238 100644
--- a/sw/uiconfig/swriter/toolbar/arrowsbar.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
@@ -29,4 +29,5 @@
  
  
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi sw/source sw/uiconfig

2016-09-13 Thread jan iversen 
 sw/sdi/_grfsh.sdi   |7 ---
 sw/sdi/drawsh.sdi   |8 
 sw/source/uibase/shells/drawsh.cxx  |   10 ++
 sw/source/uibase/shells/grfsh.cxx   |   10 --
 sw/uiconfig/swriter/toolbar/standardbar.xml |2 --
 5 files changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 465d3076835d88972d99c92b9b518a0e1762fea2
Author: jan iversen 
Date:   Tue Sep 13 09:14:23 2016 +

Revert "tdf#73797 Enable object rotation (.uno:ToggleObjectRotateMode) for 
writer"

This reverts commit 594182ce7c2551dd1d13a014cfdfd96a057e63de.

Change-Id: Idf2580e84d4190ba0aaba1a3394a4318043da458
Reviewed-on: https://gerrit.libreoffice.org/28858
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 36ba32c..bf8270c 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -87,13 +87,6 @@ interface BaseTextGraphic
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
-SID_OBJECT_ROTATE
-[
-ExecMethod = ExecuteRotation ;
-StateMethod = GetAttrStateForRotation ;
-DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-]
-
 SID_OBJECT_CROP
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 523990f..6b95420 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -217,6 +217,14 @@ interface TextDraw : TextDrawBase
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+SID_OBJECT_ROTATE
+[
+Export = FALSE;
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
 SID_BEZIER_EDIT
 [
 Export = FALSE;
diff --git a/sw/source/uibase/shells/drawsh.cxx 
b/sw/source/uibase/shells/drawsh.cxx
index e62b324..a0b3b35 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -422,6 +422,16 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
 rSet.DisableItem( nWhich );
 break;
 
+case SID_OBJECT_ROTATE:
+{
+const bool bIsRotate = GetView().IsDrawRotate();
+if ( (!bIsRotate && !pSdrView->IsRotateAllowed()) || 
bProtected )
+rSet.DisableItem( nWhich );
+else
+rSet.Put( SfxBoolItem( nWhich, bIsRotate ) );
+}
+break;
+
 case SID_BEZIER_EDIT:
 if (!Disable(rSet, nWhich))
 rSet.Put( SfxBoolItem( nWhich, 
!GetView().IsDrawSelMode()));
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index dd64d13..db91663 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -840,15 +840,6 @@ void SwGrfShell::ExecuteRotation(SfxRequest )
 
 SwWrtShell& rShell = GetShell();
 
-if (rReq.GetSlot() == SID_OBJECT_ROTATE)
-{
-if (GetView().IsDrawRotate())
-rShell.SetDragMode(SdrDragMode::Move);
-else
-rShell.SetDragMode(SdrDragMode::Rotate);
-
-GetView().FlipDrawRotate();
-}
 if (rReq.GetSlot() == SID_ROTATE_GRAPHIC_LEFT)
 {
 aRotation = 900;
@@ -917,7 +908,6 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet )
 bool bDisable = bIsParentContentProtected;
 switch( nWhich )
 {
-case SID_OBJECT_ROTATE:
 case SID_ROTATE_GRAPHIC_LEFT:
 case SID_ROTATE_GRAPHIC_RIGHT:
 if( rShell.GetGraphicType() == GraphicType::NONE )
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 396f035..4db30e8 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -39,8 +39,6 @@
  
  
  
- 
- 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi sw/source sw/uiconfig

2016-09-10 Thread Gulsah Kose 
 sw/sdi/_grfsh.sdi   |7 +++
 sw/sdi/drawsh.sdi   |8 
 sw/source/uibase/shells/drawsh.cxx  |   10 --
 sw/source/uibase/shells/grfsh.cxx   |   10 ++
 sw/uiconfig/swriter/toolbar/standardbar.xml |2 ++
 5 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 594182ce7c2551dd1d13a014cfdfd96a057e63de
Author: Gulsah Kose 
Date:   Mon Aug 8 22:11:22 2016 +0300

tdf#73797 Enable object rotation (.uno:ToggleObjectRotateMode) for writer

Change-Id: Ida868d0fc077d6697a0c3754b1add6a48c5d426c
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/27995
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index bf8270c..36ba32c 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -87,6 +87,13 @@ interface BaseTextGraphic
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+SID_OBJECT_ROTATE
+[
+ExecMethod = ExecuteRotation ;
+StateMethod = GetAttrStateForRotation ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
 SID_OBJECT_CROP
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 6b95420..523990f 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -217,14 +217,6 @@ interface TextDraw : TextDrawBase
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
-SID_OBJECT_ROTATE
-[
-Export = FALSE;
-ExecMethod = Execute ;
-StateMethod = GetState ;
-DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-]
-
 SID_BEZIER_EDIT
 [
 Export = FALSE;
diff --git a/sw/source/uibase/shells/drawsh.cxx 
b/sw/source/uibase/shells/drawsh.cxx
index a0b3b35..e62b324 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -422,16 +422,6 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
 rSet.DisableItem( nWhich );
 break;
 
-case SID_OBJECT_ROTATE:
-{
-const bool bIsRotate = GetView().IsDrawRotate();
-if ( (!bIsRotate && !pSdrView->IsRotateAllowed()) || 
bProtected )
-rSet.DisableItem( nWhich );
-else
-rSet.Put( SfxBoolItem( nWhich, bIsRotate ) );
-}
-break;
-
 case SID_BEZIER_EDIT:
 if (!Disable(rSet, nWhich))
 rSet.Put( SfxBoolItem( nWhich, 
!GetView().IsDrawSelMode()));
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index db91663..dd64d13 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -840,6 +840,15 @@ void SwGrfShell::ExecuteRotation(SfxRequest )
 
 SwWrtShell& rShell = GetShell();
 
+if (rReq.GetSlot() == SID_OBJECT_ROTATE)
+{
+if (GetView().IsDrawRotate())
+rShell.SetDragMode(SdrDragMode::Move);
+else
+rShell.SetDragMode(SdrDragMode::Rotate);
+
+GetView().FlipDrawRotate();
+}
 if (rReq.GetSlot() == SID_ROTATE_GRAPHIC_LEFT)
 {
 aRotation = 900;
@@ -908,6 +917,7 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet )
 bool bDisable = bIsParentContentProtected;
 switch( nWhich )
 {
+case SID_OBJECT_ROTATE:
 case SID_ROTATE_GRAPHIC_LEFT:
 case SID_ROTATE_GRAPHIC_RIGHT:
 if( rShell.GetGraphicType() == GraphicType::NONE )
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 4db30e8..396f035 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -39,6 +39,8 @@
  
  
  
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2015-04-05 Thread Rishabh Kumar 
 sw/sdi/swriter.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae79991e76f029adcd8bdb5cbc2889419be157f2
Author: Rishabh Kumar kris.kr...@gmail.com
Date:   Sun Apr 5 17:40:20 2015 +0530

tdf#51287: Personalisation of keyboard shortcuts incoherence

To Document Begin moved to Navigate from View

Change-Id: I16061d8d10de42e5eac462bd970dc49a7a4291ce
Reviewed-on: https://gerrit.libreoffice.org/15162
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 7e4cd2b..deea1c0 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2877,7 +2877,7 @@ SfxBoolItem GoToStartOfDoc FN_START_OF_DOCUMENT
 MenuConfig = TRUE,
 StatusBarConfig = FALSE,
 ToolBoxConfig = TRUE,
-GroupId = GID_VIEW;
+GroupId = GID_NAVIGATOR;
 ]
 
 SfxBoolItem GoToStartOfLine FN_START_OF_LINE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-09-09 Thread Jennifer Liebel 
 sw/sdi/_grfsh.sdi |   12 
 sw/source/ui/app/mn.src   |1 +
 sw/source/uibase/shells/grfsh.cxx |3 +--
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 24077ffc063990f9de11c6819432219a59d809f8
Author: Jennifer Liebel jliebe...@gmail.com
Date:   Tue Sep 2 12:40:20 2014 +

fdo#82496: Change picture option by rightclicking

Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5
Reviewed-on: https://gerrit.libreoffice.org/11332
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 15c00cc..2eb2ab2 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -62,6 +62,13 @@ interface BaseTextGraphic
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
 
+SID_CHANGE_PICTURE
+[
+ExecMethod = Execute ;
+StateMethod = GetAttrState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
+
 SID_EXTERNAL_EDIT
 [
 ExecMethod = Execute ;
@@ -224,6 +231,11 @@ interface BaseTextGraphic
 StateMethod = GetAttrState ;
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
+SID_CHANGE_PICTURE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_GRFFILTER_SOLARIZE  // status(final|play|rec)
 [
 ExecMethod = ExecAttr ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f62c8da..79b797d 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU
 MN_FRM_CAPTION_ITEM
 SEPARATOR;
 MenuItem { ITEM_SAVE_GRAPHIC };
+MenuItem { ITEM_CHANGE_PICTURE };
 MenuItem { ITEM_COMPRESS_GRAPHIC };
 MenuItem { ITEM_EXTERNAL_EDIT };
 
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index d5ecec5..0e13b38 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest rReq)
 }
 }
 break;
-
 case SID_EXTERNAL_EDIT:
 {
 // When the graphic is selected to be opened via some external tool
@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest rReq)
 }
 }
 break;
-
+case SID_CHANGE_PICTURE:
 case SID_INSERT_GRAPHIC:
 {
 // #i123922# implement slot independent from the two below to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi sw/source sw/uiconfig

2014-01-30 Thread Maxim Monastirsky 
 sw/sdi/drwtxtsh.sdi|   13 +
 sw/source/ui/shells/drwtxtex.cxx   |   50 +
 sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml  |2 
 sw/uiconfig/sweb/toolbar/drawtextobjectbar.xml |2 
 sw/uiconfig/swform/toolbar/drawtextobjectbar.xml   |2 
 sw/uiconfig/swreport/toolbar/drawtextobjectbar.xml |2 
 sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml  |2 
 sw/uiconfig/swxform/toolbar/drawtextobjectbar.xml  |2 
 8 files changed, 75 insertions(+)

New commits:
commit c885850e2e54da986bd85cfc00bc8a23c272704d
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Jan 30 10:26:28 2014 +0200

Add Increase/Decrease font functionality to drawing objects

Change-Id: I9abfca6f8cefd1e1211a98fa36ce07a407c2fd06
Reviewed-on: https://gerrit.libreoffice.org/7655
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 23402a3..e019b76 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -609,6 +609,19 @@ interface TextDrawText
 StateMethod = GetStatePropPanelAttr ;
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
+
+FN_GROW_FONT_SIZE
+[
+ExecMethod = Execute ;
+StateMethod = GetDrawTxtCtrlState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
+FN_SHRINK_FONT_SIZE
+[
+ExecMethod = Execute ;
+StateMethod = GetDrawTxtCtrlState ;
+DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
+]
 }
 
 interface TextDrawFont
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 80a1049..43b0dfb 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -101,6 +101,8 @@
 #include chrdlg.hrc
 #include misc.hrc
 
+const sal_uInt32 nFontInc = 40;  // 2pt
+const sal_uInt32 nFontMaxSz = 19998; // 999.9pt
 
 using namespace ::com::sun::star;
 
@@ -548,6 +550,32 @@ void SwDrawTextShell::Execute( SfxRequest rReq )
 rSh.GetView().AttrChangedNotify( rSh );
 }
 return;
+
+case FN_GROW_FONT_SIZE:
+case FN_SHRINK_FONT_SIZE:
+{
+SfxItemPool* pPool2 = aEditAttr.GetPool()-GetSecondaryPool();
+if( !pPool2 )
+pPool2 = aEditAttr.GetPool();
+
+SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, *pPool2 );
+aSetItem.GetItemSet().Put( aEditAttr, false );
+
+sal_uInt16 nScriptTypes = pOLV-GetSelectedScriptType();
+SvxFontHeightItem aSize( *static_castconst SvxFontHeightItem*( 
aSetItem.GetItemOfScript( nScriptTypes ) ) );
+sal_uInt32 nSize = aSize.GetHeight();
+
+if( nSlot == FN_GROW_FONT_SIZE  ( nSize += nFontInc )  
nFontMaxSz )
+nSize = nFontMaxSz;
+else if( nSlot == FN_SHRINK_FONT_SIZE  ( nSize -= nFontInc )  
nFontInc )
+nSize = nFontInc;
+
+aSize.SetHeight( nSize );
+aSetItem.PutItemForScriptType( nScriptTypes, aSize );
+aNewAttr.Put( aSetItem.GetItemSet() );
+}
+break;
+
 default:
 OSL_ENSURE(!this, wrong dispatcher);
 return;
@@ -888,6 +916,28 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet rSet)
 case SID_ATTR_CHAR_SCALEWIDTH:   nEEWhich = 
EE_CHAR_FONTWIDTH;break;
 case SID_ATTR_CHAR_AUTOKERN  :   nEEWhich = EE_CHAR_PAIRKERNING; 
break;
 case SID_ATTR_CHAR_ESCAPEMENT:   nEEWhich = EE_CHAR_ESCAPEMENT; 
break;
+case FN_GROW_FONT_SIZE:
+case FN_SHRINK_FONT_SIZE:
+{
+SfxItemPool* pEditPool = 
aEditAttr.GetPool()-GetSecondaryPool();
+if( !pEditPool )
+pEditPool = aEditAttr.GetPool();
+
+SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, 
*pEditPool );
+aSetItem.GetItemSet().Put( aEditAttr, false );
+const SvxFontHeightItem* aSize( static_castconst 
SvxFontHeightItem*( aSetItem.GetItemOfScript( nScriptType ) ) );
+
+if( !aSize )
+rSet.DisableItem( nSlotId );
+else
+{
+sal_uInt32 nSize = aSize-GetHeight();
+if( nSize == nFontMaxSz )
+rSet.DisableItem( FN_GROW_FONT_SIZE );
+else if( nSize == nFontInc )
+rSet.DisableItem( FN_SHRINK_FONT_SIZE );
+}
+}
 }
 if(nEEWhich)
 rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich);
diff --git a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index f604605..5db228b 100644
--- a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
@@ -27,6 +27,8 @@

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

2013-12-03 Thread Noel Grandin 
 sw/sdi/swriter.sdi  |8 
 sw/source/ui/shells/textsh1.cxx |6 +++---
 sw/source/ui/shells/txtcrsr.cxx |8 
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 63947810107e042ebe440b865904c62e2d3f74d8
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 2 14:12:09 2013 +0200

convert FN_PARAM_MOVE_COUNT from SfxInt16 to SfxInt32

so that we can convert surrounding code from xub_StrLen to sal_Int32

Change-Id: Ib779c82a71405f855cfe72bcde2511e8153445f0
Reviewed-on: https://gerrit.libreoffice.org/6896
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 9cb8c62..0c7cff7 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1947,7 +1947,7 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_DLG
 
 //--
 SfxBoolItem GoDown FN_LINE_DOWN
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
 [
 /* flags: */
 AutoUpdate = FALSE,
@@ -1972,7 +1972,7 @@ SfxBoolItem GoDown FN_LINE_DOWN
 
 //--
 SfxBoolItem GoLeft FN_CHAR_LEFT
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
 [
 /* flags: */
 AutoUpdate = FALSE,
@@ -1997,7 +1997,7 @@ SfxBoolItem GoLeft FN_CHAR_LEFT
 
 //--
 SfxBoolItem GoRight FN_CHAR_RIGHT
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
 [
 /* flags: */
 AutoUpdate = FALSE,
@@ -3222,7 +3222,7 @@ SfxVoidItem GoToStartOfPrevPageSel 
FN_START_OF_PREV_PAGE_SEL
 
 //--
 SfxBoolItem GoUp FN_LINE_UP
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select 
FN_PARAM_MOVE_SELECTION)
 [
 /* flags: */
 AutoUpdate = FALSE,
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 091058e..9868653 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -197,7 +197,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot,const
 
 const SfxPoolItem* pSelectionItem;
 sal_Bool bInsert = sal_False;
-xub_StrLen nInsert = 0;
+sal_Int32 nInsert = 0;
 
 // The old item is for unknown reasons back in the set again.
 if( !bSelectionPut  SFX_ITEM_SET == 
aTmpSet.GetItemState(FN_PARAM_SELECTION, sal_False, pSelectionItem) )
@@ -215,7 +215,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot,const
 aReq.AppendItem( SfxStringItem( FN_INSERT_STRING, sInsert ) );
 aReq.Done();
 SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), 
FN_CHAR_LEFT );
-aReq1.AppendItem( SfxInt16Item(FN_PARAM_MOVE_COUNT, nInsert) );
+aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) );
 aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, 
sal_True) );
 aReq1.Done();
 }
@@ -234,7 +234,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot,const
 if(bInsert)
 {
 SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_RIGHT );
-aReq1.AppendItem( SfxInt16Item(FN_PARAM_MOVE_COUNT, nInsert) );
+aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) );
 aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_False) 
);
 aReq1.Done();
 rWrtSh.SwapPam();
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 2c09fea..d686012 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -48,12 +48,12 @@ void SwTextShell::ExecBasicMove(SfxRequest rReq)
 GetView().GetEditWin().FlushInBuffer();
 const SfxItemSet *pArgs = rReq.GetArgs();
 sal_Bool bSelect = sal_False;
-sal_uInt16 nCount = 1;
+sal_Int32 nCount = 1;
 if(pArgs)
 {
 const SfxPoolItem *pItem;
 if(SFX_ITEM_SET == pArgs-GetItemState(FN_PARAM_MOVE_COUNT, sal_True, 
pItem))
-nCount = ((const SfxInt16Item *)pItem)-GetValue();
+nCount = ((const SfxInt32Item *)pItem)-GetValue();
 if(SFX_ITEM_SET == pArgs-GetItemState(FN_PARAM_MOVE_SELECTION, 
sal_True, pItem))
 bSelect = ((const SfxBoolItem *)pItem)-GetValue();
 }
@@

[Libreoffice-commits] core.git: sw/sdi

2013-02-09 Thread Matthias Freund 
 sw/sdi/_viewsh.sdi |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit e3519f6dc62aa53e0ea4f55e8270cf2b405d6d84
Author: Matthias Freund matti...@yahoo.de
Date:   Sat Feb 9 00:39:38 2013 +0100

Remark translations german - english

Hope it helps you a lot.

Change-Id: I5db1b746077c783a6fdf75ba0e30a3573ef4ddea
Reviewed-on: https://gerrit.libreoffice.org/2059
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index d6ff824..eb4d596 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -314,7 +314,7 @@ interface BaseTextEditView
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
  //-
- //Ab hier Statusleiste
+ //From here the statusbar
 FN_STAT_PAGE // status()
 [
 ExecMethod = ExecuteStatusLine ;
@@ -336,7 +336,7 @@ interface BaseTextEditView
 ]
 FN_STAT_SELMODE // status(final|play)
 [
- //Aktueller Selektionsmode: 0 == Normal, 2 == Ergaenzen, 1 == 
Erweitern
+ //Current Selectionmode: 0 == Normal, 2 == Add, 1 == Enhance
 ExecMethod = ExecuteStatusLine ;
 StateMethod = StateStatusLine ;
 ]
@@ -384,7 +384,7 @@ interface BaseTextEditView
 StateMethod = StateStatusLine ;
 ]
  //--
- //End mit Statusleiste
+ //End of the statusbar
  //--
 SID_ATTR_BORDER_SHADOW // status()
 [
@@ -393,7 +393,7 @@ interface BaseTextEditView
 ]
 //
 /*  */
-/*   Properties Seitenformat*/
+/*   Properties Page Format  */
 /*  */
 //
 SID_ATTR_PAGE // status()
@@ -435,7 +435,7 @@ interface BaseTextEditView
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
 /*
-suchen und ersetzen
+search and replace
 */
 
 
@@ -478,7 +478,7 @@ interface BaseTextEditView
 StateMethod = StateTabWin ;
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 ]
-// ab hier Export = FALSE;
+// from here  Export = FALSE;
 FID_SEARCH_ON // status()
 [
 ExecMethod = ExecSearch ;
@@ -640,8 +640,8 @@ interface BaseTextEditView
 StateMethod = StateViewOptions ;
 ]
 
-  //Extra/Optionen/Ansicht
-//Wird zusammen zum Property ViewSettings
+  //Extra/Options/View
+//Will be summerized to Property ViewSettings
 FN_VIEW_HIDDEN_PARA
 [
 ExecMethod = ExecViewOptions ;
@@ -655,7 +655,7 @@ interface BaseTextEditView
 StateMethod = StateViewOptions ;
 Export = FALSE;
 ]
- // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden 
funktionieren
+ // Everything from here can be removed (Export = FALSE;), if the previous 
works
 FN_RULER // status()
 [
 ExecMethod = ExecViewOptions ;
@@ -772,14 +772,14 @@ interface GlobalContents
 [
 ]
 
-// Bereichsname, Index-Titel oder Leerstring
+// Areaname, Index-Titel or Empty String
 String  Title FN_COLL_TITLE
 (
 UINT16  PositionFN_COLL_TITLE
 )
 [
 ]
-// ohne FileName wird ein TextBereich an der Position eingefuegt
+// Without a FileName an area of the text is inserted at this location.
 BOOLInsertDocument  FN_COLL_ADD
 (
 UINT16  PositionFN_COLL_ADD,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2013-02-09 Thread Matthias Freund 
 sw/sdi/basesh.sdi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 50b9a90ef4ab73d812970545d4d89a128d6d01bf
Author: Matthias Freund matti...@yahoo.de
Date:   Sat Feb 9 01:15:34 2013 +0100

Remark Translation german - english

Change-Id: Iddfc42ba61ddf533e0d0832a54730a8f3058b1c0
Reviewed-on: https://gerrit.libreoffice.org/2060
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 4a17a63..baeb362 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -21,8 +21,8 @@ interface TextSelection : BaseTextSelection
 uuid = F23BA0A8-73A0-11d0-89CA-008029E4B0B1
 ]
 {
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here shall the slots are inserted which are not supported by
+// StarWriter/WEB
 
 FN_TOOL_ANCHOR_PAGE
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2013-02-09 Thread Matthias Freund 
 sw/sdi/docsh.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a83a362e5865830018d5b99f84faf251760556b9
Author: Matthias Freund matti...@yahoo.de
Date:   Sun Feb 10 00:36:27 2013 +0100

Comment translation german - english

Translation.

Change-Id: I07d8f85437ce6ff59ac40970de29cc2fccde3d5a
Reviewed-on: https://gerrit.libreoffice.org/2071
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 2c8a9e9..83253dc 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -21,7 +21,7 @@ interface TextDocument : BaseTextDocument
 uuid = 0D960120-111C-101D-9757-6E74207A7520
 ]
 {
-// Slots, die nicht in der WebDocShell gebraucht werden
+// Slots, wich are not needed in the WebDocShell
 
 FN_OUTLINE_TO_IMPRESS
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2013-02-09 Thread Matthias Freund 
 sw/sdi/tabsh.sdi  |4 ++--
 sw/sdi/textsh.sdi |4 ++--
 sw/sdi/viewsh.sdi |2 +-
 sw/sdi/wdocsh.sdi |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 408f462daff5fb059f775e69f9f8f724f765ea22
Author: Matthias Freund matti...@yahoo.de
Date:   Sun Feb 10 00:53:33 2013 +0100

Comment translation german - english

This times i have more files with few translations.

Change-Id: I5a6cb89a36b8fab3db8cfb4029316e51834445b6
Reviewed-on: https://gerrit.libreoffice.org/2072
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index cb2f2b1..3f78944 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -21,8 +21,8 @@ interface TextTable : BaseTextTable
 uuid = 49CE7CA0-111A-101D-9757-6E74207A7520
 ]
 {
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here should the slots be integrated, which are not supported
+// in StarWriter/WEB
 
 import TextSelection;
 
diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi
index e6cd93c..b817536 100644
--- a/sw/sdi/textsh.sdi
+++ b/sw/sdi/textsh.sdi
@@ -28,8 +28,8 @@ interface Text : BaseText
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 Cachable ;
 ]
- // hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
- // nicht unterstuetzt werden
+ // Here should the slots be integrated, which are not supported
+ // in StarWriter/WEB
 
 import TextSelection;
 
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 479a188..e6b4bc3 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -43,7 +43,7 @@ interface TextEditView : BaseTextEditView
 uuid = 09782660-111A-101D-9757-6E74207A7520
 ]
 {
- // Slots, die nicht in der WebDocShell gebraucht werden
+ // Slots, wich are not needed in the WebDocShell
 FN_INSERT_OBJ_CTRL
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index 68bfe71..f3d62b9 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -21,7 +21,7 @@ interface WebDocument : BaseTextDocument
 uuid = B47F0DE4-1E1F-11d1-89CA-008029E4B0B1
 ]
 {
-// hier nur Slots, die der vollstaendige Writer nicht braucht
+// here only Slots, which the full Writer doesn't need
 SID_SOURCEVIEW
 [
 ExecMethod = Execute ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/sdi

2013-02-09 Thread Matthias Freund 
 sw/sdi/wtextsh.sdi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 77f2073df576ebec5303bc29a242597f75ab0e61
Author: Matthias Freund matti...@yahoo.de
Date:   Sun Feb 10 01:14:30 2013 +0100

Comment translation german - english

And again a litte change...

Change-Id: Ia2fe42dc34983755a8ed23d188f41f73be71e5c8
Reviewed-on: https://gerrit.libreoffice.org/2073
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi
index 818f3fd..94af14e 100644
--- a/sw/sdi/wtextsh.sdi
+++ b/sw/sdi/wtextsh.sdi
@@ -28,8 +28,8 @@ interface WebText : BaseText
 DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
 Cachable ;
 ]
-// hier sollen die Slots eingefuegt werden, die n u r vom StarWriter/WEB
-// unterstuetzt werden
+// Here should the slots are be inserted, but O N L Y those that are 
supported
+// by StarWriter/WEB
 import TextSelection;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits