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

[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 sw/uiconfig

[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

[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

[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 sw/source sw/uiconfig

[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 @@