added imagecontrol, progressbar, hor. + vert. fixedline

8 files changed, 126 insertions, 18 deletions

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index de9e3d8c35ce..69f6ca83b01d 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -28,7 +28,11 @@ SlotIdFile( "basidesh.hrc" )
         SVX_SNAP_VSCROLLBAR,
         SVX_SNAP_PREVIEW,
         SVX_SNAP_SELECT,
-        SVX_SNAP_NOTHING
+        SVX_SNAP_NOTHING,
+        SVX_SNAP_IMAGECONTROL,
+        SVX_SNAP_PROGRESSBAR,
+        SVX_SNAP_HFIXEDLINE,
+        SVX_SNAP_VFIXEDLINE
     }
     item SvxChooseControlEnum   SvxChooseControlItem;
 */
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 3a2957cf1cb9..f53a32d34cf1 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside3.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: tbe $ $Date: 2001-04-10 15:13:43 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:43:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -456,6 +456,10 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
                         case OBJ_DLG_VSCROLLBAR:    nObj = SVX_SNAP_VSCROLLBAR; break;
                         case OBJ_DLG_PREVIEW:       nObj = SVX_SNAP_PREVIEW; break;
                         case OBJ_DLG_URLBUTTON:     nObj = SVX_SNAP_URLBUTTON; break;
+                        case OBJ_DLG_IMAGECONTROL:  nObj = SVX_SNAP_IMAGECONTROL; break;
+                        case OBJ_DLG_PROGRESSBAR:   nObj = SVX_SNAP_PROGRESSBAR; break;
+                        case OBJ_DLG_HFIXEDLINE:    nObj = SVX_SNAP_HFIXEDLINE; break;
+                        case OBJ_DLG_VFIXEDLINE:    nObj = SVX_SNAP_VFIXEDLINE; break;
                         default:                    nObj = 0;
                     }
 #ifdef DBG_UTIL
@@ -589,6 +593,30 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
                     GetEditor()->SetMode( VCDLGED_SELECT );
                 }
                 break;
+                case SVX_SNAP_IMAGECONTROL:
+                {
+                    GetEditor()->SetMode( VCDLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_IMAGECONTROL );
+                }
+                break;
+                case SVX_SNAP_PROGRESSBAR:
+                {
+                    GetEditor()->SetMode( VCDLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_PROGRESSBAR );
+                }
+                break;
+                case SVX_SNAP_HFIXEDLINE:
+                {
+                    GetEditor()->SetMode( VCDLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_HFIXEDLINE );
+                }
+                break;
+                case SVX_SNAP_VFIXEDLINE:
+                {
+                    GetEditor()->SetMode( VCDLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_VFIXEDLINE );
+                }
+                break;
             }
             BasicIDE::GetBindings().Invalidate( SID_DOC_MODIFIED );
             #ifdef DEBUG
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 3463d8f2dabe..f486014c1e00 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basidesh.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: rt $ $Date: 2001-05-10 07:06:45 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:46:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1779,6 +1779,10 @@ ImageList RID_DEFAULTIMAGELIST_SC
         SID_INSERT_URLBUTTON ;
         SID_SHOW_HIDDEN ;
         SID_SHOW_FORMS ;
+        SID_INSERT_IMAGECONTROL ;
+        SID_INSERT_PROGRESSBAR ;
+        SID_INSERT_HFIXEDLINE ;
+        SID_INSERT_VFIXEDLINE ;
     };
 };
 ImageList RID_DEFAULTIMAGELIST_LC
@@ -1822,6 +1826,10 @@ ImageList RID_DEFAULTIMAGELIST_LC
         SID_INSERT_URLBUTTON ;
         SID_SHOW_HIDDEN ;
         SID_SHOW_FORMS ;
+        SID_INSERT_IMAGECONTROL ;
+        SID_INSERT_PROGRESSBAR ;
+        SID_INSERT_HFIXEDLINE ;
+        SID_INSERT_VFIXEDLINE ;
     };
 };
 ToolBox RID_BASICIDE_OBJECTBAR
diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx
index b12d2d9e5e67..03ab57ca3540 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idetemp.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mh $ $Date: 2000-09-29 11:02:37 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:44:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,11 @@ enum SvxChooseControlEnum
     SVX_SNAP_PREVIEW,
     SVX_SNAP_SELECT,
     SVX_SNAP_URLBUTTON,
-    SVX_SNAP_NOTHING
+    SVX_SNAP_NOTHING,
+    SVX_SNAP_IMAGECONTROL,
+    SVX_SNAP_PROGRESSBAR,
+    SVX_SNAP_HFIXEDLINE,
+    SVX_SNAP_VFIXEDLINE
 };
 
 #define SvxChooseControlItem SfxAllEnumItem
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 48607ea2ec3b..fddf76b4d163 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxctl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mh $ $Date: 2000-09-29 11:02:37 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:44:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -186,6 +186,10 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
                 case SVX_SNAP_VSCROLLBAR:   nTemp = SID_INSERT_VSCROLLBAR; break;
                 case SVX_SNAP_PREVIEW:      nTemp = SID_INSERT_PREVIEW; break;
                 case SVX_SNAP_URLBUTTON:    nTemp = SID_INSERT_URLBUTTON; break;
+                case SVX_SNAP_IMAGECONTROL: nTemp = SID_INSERT_IMAGECONTROL; break;
+                case SVX_SNAP_PROGRESSBAR:  nTemp = SID_INSERT_PROGRESSBAR; break;
+                case SVX_SNAP_HFIXEDLINE:   nTemp = SID_INSERT_HFIXEDLINE; break;
+                case SVX_SNAP_VFIXEDLINE:   nTemp = SID_INSERT_VFIXEDLINE; break;
             }
             if( nTemp )
             {
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
index a58c29f6ae13..15706e6c4dea 100644
--- a/basctl/source/basicide/tbxctl.src
+++ b/basctl/source/basicide/tbxctl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxctl.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hjs $ $Date: 2001-05-12 07:40:26 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:48:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -330,6 +330,22 @@ ToolBox RID_TOOLBOX
             Text[ catalan ] = "Botón URL";
             Text[ finnish ] = "URL-painike";
         };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_IMAGECONTROL ;
+            Identifier = SID_INSERT_IMAGECONTROL ;
+            RadioCheck = TRUE ;
+            Text = "ImageControl" ;
+            Text [ english_us ] = "Image Control" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_HFIXEDLINE ;
+            Identifier = SID_INSERT_HFIXEDLINE ;
+            RadioCheck = TRUE ;
+            Text = "HFixedLine" ;
+            Text [ english_us ] = "Horiz. Fixed Line" ;
+        };
         ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
         ToolBoxItem
         {
@@ -594,6 +610,22 @@ ToolBox RID_TOOLBOX
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Selección";
         };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_PROGRESSBAR ;
+            Identifier = SID_INSERT_PROGRESSBAR ;
+            RadioCheck = TRUE ;
+            Text = "ProgressBar" ;
+            Text [ english_us ] = "Progress Bar" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_VFIXEDLINE ;
+            Identifier = SID_INSERT_VFIXEDLINE ;
+            RadioCheck = TRUE ;
+            Text = "VFixedLine" ;
+            Text [ english_us ] = "Vert. Fixed Line" ;
+        };
         ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
         ToolBoxItem
         {
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 29fb87dc2775..3a76b8c6e251 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedfac.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: tbe $ $Date: 2001-05-04 11:09:09 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:48:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,7 +131,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 
     if( (pObjFactory->nInventor == VCSbxInventor) &&
         (pObjFactory->nIdentifier >= OBJ_DLG_CHECKBOX) &&
-        (pObjFactory->nIdentifier <= OBJ_DLG_URLBUTTON)    )
+        (pObjFactory->nIdentifier <= OBJ_DLG_VFIXEDLINE)    )
     {
         switch( pObjFactory->nIdentifier )
         {
@@ -204,6 +204,34 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
             case OBJ_DLG_URLBUTTON:
                  pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel"), xDialogSFact);
                  break;
+            case OBJ_DLG_IMAGECONTROL:
+                 pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlImageControlModel"), xDialogSFact);
+                 break;
+            case OBJ_DLG_PROGRESSBAR:
+                 pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel"), xDialogSFact);
+                 break;
+            case OBJ_DLG_HFIXEDLINE:
+                 pObjFactory->pNewObj = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel"), xDialogSFact);
+                 break;
+            case OBJ_DLG_VFIXEDLINE:
+            {
+                 DlgEdObj* pNew = new DlgEdObj(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel"), xDialogSFact);
+                 pObjFactory->pNewObj = pNew;
+                 // set vertical orientation
+                 try
+                 {
+                    uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
+                    if (xPSet.is())
+                    {
+                        uno::Any aValue;
+                        aValue <<= (sal_Int32) 1;
+                        xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Orientation" ) ), aValue );
+                    }
+                 }
+                 catch(...)
+                 {
+                 }
+            }    break;
         }
 
         DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObjFactory->pNewObj);
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 625bfdf289b6..81482746e6fc 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: tbe $ $Date: 2001-05-04 15:20:18 $
+ *  last change: $Author: tbe $ $Date: 2001-05-14 08:48:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -898,7 +898,7 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const
     {
         return OBJ_DLG_URLBUTTON;  // ???change this!
     }
-    else
+    else        // missing: imagecontrol, progressbar, fixedline (2x)
     {
         return 0;
     }