[Libreoffice-commits] .: 2 commits - basctl/Package_xml.mk basctl/sdi basctl/source basctl/uiconfig default_images/cmd framework/source officecfg/registry ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen packimages/pack sc/source svx/inc svx/sdi
Noel Power
noelp at kemper.freedesktop.org
Mon Dec 5 01:58:53 PST 2011
basctl/Package_xml.mk | 1
basctl/sdi/baside.sdi | 42 ++
basctl/source/basicide/baside3.cxx | 52 ++
basctl/source/basicide/basides1.cxx | 10
basctl/source/basicide/idetemp.hxx | 2
basctl/source/dlged/dlged.cxx | 2
basctl/source/dlged/dlgedfac.cxx | 67 +++
basctl/source/dlged/dlgedobj.cxx | 31 +
basctl/source/inc/dlgeddef.hxx | 8
basctl/source/inc/dlgedfac.hxx | 4
basctl/source/inc/dlgedobj.hxx | 2
basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml | 16
default_images/cmd/lc_insertformcheck.png |binary
default_images/cmd/lc_insertformcombo.png |binary
default_images/cmd/lc_insertformhscroll.png |binary
default_images/cmd/lc_insertformlist.png |binary
default_images/cmd/lc_insertformradio.png |binary
default_images/cmd/lc_insertformspin.png |binary
default_images/cmd/lc_insertformvscroll.png |binary
default_images/cmd/sc_insertformcheck.png |binary
default_images/cmd/sc_insertformcombo.png |binary
default_images/cmd/sc_insertformhscroll.png |binary
default_images/cmd/sc_insertformlist.png |binary
default_images/cmd/sc_insertformradio.png |binary
default_images/cmd/sc_insertformspin.png |binary
default_images/cmd/sc_insertformvscroll.png |binary
framework/source/uielement/toolbarmanager.cxx | 2
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu | 57 ++-
officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 23 +
ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformlist.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformradio.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformspin.png |binary
ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformlist.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformradio.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformspin.png |binary
ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/human/cmd/lc_insertformcheck.png |binary
ooo_custom_images/human/cmd/lc_insertformcombo.png |binary
ooo_custom_images/human/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/human/cmd/lc_insertformlist.png |binary
ooo_custom_images/human/cmd/lc_insertformradio.png |binary
ooo_custom_images/human/cmd/lc_insertformspin.png |binary
ooo_custom_images/human/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/human/cmd/sc_insertformcheck.png |binary
ooo_custom_images/human/cmd/sc_insertformcombo.png |binary
ooo_custom_images/human/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/human/cmd/sc_insertformlist.png |binary
ooo_custom_images/human/cmd/sc_insertformradio.png |binary
ooo_custom_images/human/cmd/sc_insertformspin.png |binary
ooo_custom_images/human/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/industrial/cmd/lc_insertformcheck.png |binary
ooo_custom_images/industrial/cmd/lc_insertformcombo.png |binary
ooo_custom_images/industrial/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/industrial/cmd/lc_insertformlist.png |binary
ooo_custom_images/industrial/cmd/lc_insertformradio.png |binary
ooo_custom_images/industrial/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/industrial/cmd/sc_insertformcheck.png |binary
ooo_custom_images/industrial/cmd/sc_insertformcombo.png |binary
ooo_custom_images/industrial/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/industrial/cmd/sc_insertformlist.png |binary
ooo_custom_images/industrial/cmd/sc_insertformradio.png |binary
ooo_custom_images/industrial/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformcheck.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformcombo.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformlist.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformradio.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformspin.png |binary
ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png |binary
packimages/pack/image-sort.lst | 1
sc/source/ui/app/inputwin.cxx | 5
svx/inc/svx/svxids.hrc | 9
svx/sdi/svx.sdi | 190 ++++++++++
101 files changed, 507 insertions(+), 17 deletions(-)
New commits:
commit 9cff030fa15f89fa1009fbb3827ab11c43c20b04
Author: Noel Power <noel.power at novell.com>
Date: Mon Dec 5 09:56:17 2011 +0000
add some form control support for basic dialogs
diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk
index c420e53..f5dbf10 100644
--- a/basctl/Package_xml.mk
+++ b/basctl/Package_xml.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolb
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml))
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml))
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml))
+$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml,uiconfig/basicide/toolbar/formcontrolsbar.xml))
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml))
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml))
$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml))
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 11a97fe..de61601 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -470,6 +470,48 @@ shell BasicIDEShell
[
StateMethod = GetState;
]
+
+ SID_INSERT_RADIO
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_CHECK
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_LIST
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_COMBO
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_VSCROLL
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_HSCROLL
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
+
+ SID_INSERT_SPIN
+ [
+ ExecMethod = ExecuteDialog;
+ StateMethod = GetState;
+ ]
}
interface BasicIDEDocument
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index b5c287d..2f7ccfb 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -272,6 +272,18 @@ void DialogWindow::DoScroll( ScrollBar* pCurScrollBar )
void DialogWindow::GetState( SfxItemSet& rSet )
{
SfxWhichIter aIter(rSet);
+ bool bIsCalc = false;
+ if ( GetDocument().isDocument() )
+ {
+ Reference< frame::XModel > xModel= GetDocument().getDocument();
+ if ( xModel.is() )
+ {
+ Reference< lang::XServiceInfo > xServiceInfo ( xModel, UNO_QUERY );
+ if ( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) )
+ bIsCalc = true;
+ }
+ }
+
for ( sal_uInt16 nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich() )
{
switch ( nWh )
@@ -390,6 +402,18 @@ void DialogWindow::GetState( SfxItemSet& rSet )
rSet.DisableItem( nWh );
}
break;
+ case SID_INSERT_RADIO:
+ case SID_INSERT_CHECK:
+ case SID_INSERT_LIST:
+ case SID_INSERT_COMBO:
+ case SID_INSERT_VSCROLL:
+ case SID_INSERT_HSCROLL:
+ case SID_INSERT_SPIN:
+ {
+ if ( !bIsCalc || IsReadOnly() )
+ rSet.DisableItem( nWh );
+ }
+ break;
}
}
}
@@ -430,6 +454,34 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
pBindings->Invalidate( SID_DOC_MODIFIED );
}
break;
+ case SID_INSERT_RADIO:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMRADIO );
+ break;
+ case SID_INSERT_CHECK:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMCHECK );
+ break;
+ case SID_INSERT_LIST:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMLIST );
+ break;
+ case SID_INSERT_COMBO:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMCOMBO );
+ break;
+ case SID_INSERT_SPIN:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMSPIN );
+ break;
+ case SID_INSERT_VSCROLL:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMVSCROLL );
+ break;
+ case SID_INSERT_HSCROLL:
+ GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetInsertObj( OBJ_DLG_FORMHSCROLL );
+ break;
case SID_CHOOSE_CONTROLS:
{
const SfxItemSet* pArgs = rReq.GetArgs();
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 62cb0c6..ab9fd01 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -917,6 +917,13 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
break;
case SID_CHOOSE_CONTROLS:
case SID_DIALOG_TESTMODE:
+ case SID_INSERT_RADIO:
+ case SID_INSERT_CHECK:
+ case SID_INSERT_LIST:
+ case SID_INSERT_COMBO:
+ case SID_INSERT_VSCROLL:
+ case SID_INSERT_HSCROLL:
+ case SID_INSERT_SPIN:
{
if( !pCurWin || !pCurWin->IsA( TYPE( DialogWindow ) ) )
rSet.DisableItem( nWh );
@@ -1201,6 +1208,7 @@ void BasicIDEShell::ManageToolbars()
static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" ));
static ::rtl::OUString aDialogBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/dialogbar" ));
static ::rtl::OUString aInsertControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcontrolsbar" ));
+ static ::rtl::OUString aFormControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/formcontrolsbar" ));
(void)aInsertControlsBarResName;
if( !pCurWin )
@@ -1222,11 +1230,13 @@ void BasicIDEShell::ManageToolbars()
xLayoutManager->requestElement( aDialogBarResName );
xLayoutManager->requestElement( aInsertControlsBarResName );
+ xLayoutManager->requestElement( aFormControlsBarResName );
}
else
{
xLayoutManager->destroyElement( aDialogBarResName );
xLayoutManager->destroyElement( aInsertControlsBarResName );
+ xLayoutManager->destroyElement( aFormControlsBarResName );
xLayoutManager->requestElement( aMacroBarResName );
}
diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx
index 7700d94..cb2d869 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -57,7 +57,7 @@ enum SvxChooseControlEnum
SVX_SNAP_FORMATTEDFIELD,
SVX_SNAP_PATTERNFIELD,
SVX_SNAP_FILECONTROL,
- SVX_SNAP_TREECONTROL
+ SVX_SNAP_TREECONTROL,
};
#define SvxChooseControlItem SfxAllEnumItem
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 6d3c5bf..2769145 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -218,7 +218,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
pDlgEdPage = new DlgEdPage( *pDlgEdModel );
pDlgEdModel->InsertPage( pDlgEdPage );
- pObjFac = new DlgEdFactory();
+ pObjFac = new DlgEdFactory(xModel);
pFunc = new DlgEdFuncSelect( this );
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 92c0da4..ecbb9bd 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -39,7 +39,7 @@
using namespace ::com::sun::star;
-DlgEdFactory::DlgEdFactory()
+DlgEdFactory::DlgEdFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ) : mxModel( xModel )
{
SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
}
@@ -70,25 +70,52 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
if( (pObjFactory->nInventor == DlgInventor) &&
(pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
- (pObjFactory->nIdentifier <= OBJ_DLG_SPINBUTTON) )
+ (pObjFactory->nIdentifier <= OBJ_DLG_FORMHSCROLL) )
{
switch( pObjFactory->nIdentifier )
{
case OBJ_DLG_PUSHBUTTON:
pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" )) , xDialogSFact );
break;
+ case OBJ_DLG_FORMRADIO:
case OBJ_DLG_RADIOBUTTON:
- pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" )) , xDialogSFact );
+ if ( pObjFactory->nIdentifier == OBJ_DLG_RADIOBUTTON )
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" )) , xDialogSFact );
+ else
+ {
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pObjFactory->pNewObj )->MakeDataAware( mxModel );
+ }
break;
+ case OBJ_DLG_FORMCHECK:
case OBJ_DLG_CHECKBOX:
- pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" )) , xDialogSFact );
+ if ( pObjFactory->nIdentifier == OBJ_DLG_CHECKBOX )
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" )) , xDialogSFact );
+ else
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pObjFactory->pNewObj )->MakeDataAware( mxModel );
break;
+ case OBJ_DLG_FORMLIST:
case OBJ_DLG_LISTBOX:
- pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" )) , xDialogSFact );
+ if ( pObjFactory->nIdentifier == OBJ_DLG_LISTBOX )
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" )) , xDialogSFact );
+ else
+ {
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pObjFactory->pNewObj )->MakeDataAware( mxModel );
+ }
break;
+ case OBJ_DLG_FORMCOMBO:
case OBJ_DLG_COMBOBOX:
{
- DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" )) , xDialogSFact );
+ DlgEdObj* pNew = NULL;
+ if ( pObjFactory->nIdentifier == OBJ_DLG_COMBOBOX )
+ pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" )) , xDialogSFact );
+ else
+ {
+ pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pNew )->MakeDataAware( mxModel );
+ }
pObjFactory->pNewObj = pNew;
try
{
@@ -118,12 +145,27 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
case OBJ_DLG_PROGRESSBAR:
pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" )) , xDialogSFact );
break;
+ case OBJ_DLG_FORMHSCROLL:
case OBJ_DLG_HSCROLLBAR:
- pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
+ if ( pObjFactory->nIdentifier == OBJ_DLG_HSCROLLBAR )
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
+ else
+ {
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pObjFactory->pNewObj )->MakeDataAware( mxModel );
+ }
break;
+ case OBJ_DLG_FORMVSCROLL:
case OBJ_DLG_VSCROLLBAR:
{
- DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
+ DlgEdObj* pNew = NULL;
+ if ( pObjFactory->nIdentifier == OBJ_DLG_VSCROLLBAR )
+ pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
+ else
+ {
+ pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" )) , xDialogSFact );
+ static_cast< DlgEdObj* >( pNew )->MakeDataAware( mxModel );
+ }
pObjFactory->pNewObj = pNew;
// set vertical orientation
try
@@ -183,8 +225,15 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
case OBJ_DLG_FILECONTROL:
pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFileControlModel" )) , xDialogSFact );
break;
+ case OBJ_DLG_FORMSPIN:
case OBJ_DLG_SPINBUTTON:
- pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlSpinButtonModel") , xDialogSFact );
+ if ( pObjFactory->nIdentifier == OBJ_DLG_SPINBUTTON )
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlSpinButtonModel") , xDialogSFact );
+ else
+ {
+ pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.form.component.SpinButton") , xDialogSFact );
+ static_cast< DlgEdObj* >( pObjFactory->pNewObj )->MakeDataAware( mxModel );
+ }
break;
case OBJ_DLG_TREECONTROL:
DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.tree.TreeControlModel" )) , xDialogSFact );
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 2e2d8df..aa79ef1 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -38,6 +38,9 @@
#include "dlgresid.hrc"
+#include <com/sun/star/form/binding/XBindableValue.hpp>
+#include <com/sun/star/form/binding/XValueBinding.hpp>
+#include <com/sun/star/form/binding/XListEntrySink.hpp>
#include <com/sun/star/awt/XUnoControlContainer.hpp>
#include <com/sun/star/awt/XVclContainerPeer.hpp>
#include <com/sun/star/container/XContainer.hpp>
@@ -1856,7 +1859,33 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const
return aDeviceInfo;
}
-
+bool DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
+{
+ bool bRes = false;
+ // Need to flesh this out, currently we will only support data-aware controls for calc
+ // and only handle a subset of functionality e.g. linked-cell and cell range data source. Of course later
+ // we need to disambiguate for writer ( and others ? ) and also support the generic form (db) bindings
+ // we need some more work in xmlscript to be able to handle that
+ Reference< lang::XMultiServiceFactory > xFac( xModel, UNO_QUERY );
+ Reference< form::binding::XBindableValue > xBindable( GetUnoControlModel(), UNO_QUERY );
+ Reference< form::binding::XListEntrySink > xListEntrySink( GetUnoControlModel(), UNO_QUERY );
+ if ( xFac.is() )
+ {
+ if ( xBindable.is() )
+ {
+ Reference< form::binding::XValueBinding > xBinding( xFac->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.CellValueBinding" ) ) ), UNO_QUERY );
+ xBindable->setValueBinding( xBinding );
+ }
+ if ( xListEntrySink.is() )
+ {
+ Reference< form::binding::XListEntrySource > xSource( xFac->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.CellRangeListSource" ) ) ), UNO_QUERY );
+ xListEntrySink->setListEntrySource( xSource );
+ }
+ if ( xListEntrySink.is() || xBindable.is() )
+ bRes = true;
+ }
+ return bRes;
+}
//----------------------------------------------------------------------------
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index a7be1fa..f3104a1 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -63,6 +63,14 @@ const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+
#define OBJ_DLG_TREECONTROL ((sal_uInt16)24)
#define OBJ_DLG_SPINBUTTON ((sal_uInt16)25)
+#define OBJ_DLG_FORMRADIO ((sal_uInt16)26)
+#define OBJ_DLG_FORMCHECK ((sal_uInt16)27)
+#define OBJ_DLG_FORMLIST ((sal_uInt16)28)
+#define OBJ_DLG_FORMCOMBO ((sal_uInt16)29)
+#define OBJ_DLG_FORMSPIN ((sal_uInt16)30)
+#define OBJ_DLG_FORMVSCROLL ((sal_uInt16)31)
+#define OBJ_DLG_FORMHSCROLL ((sal_uInt16)32)
+
// control properties
#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )
#define DLGED_PROP_DROPDOWN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dropdown" ) )
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index 9908b3f..dffbefe 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -31,6 +31,7 @@
#define _BASCTL_DLGEDFAC_HXX
#include <svx/svdobj.hxx>
+#include <com/sun/star/frame/XModel.hpp>
//============================================================================
// DlgEdFactory
@@ -38,8 +39,9 @@
class DlgEdFactory
{
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
public:
- DlgEdFactory();
+ DlgEdFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
~DlgEdFactory();
DECL_LINK( MakeObject, SdrObjFactory * );
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index d68c940..ebe1186 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -29,6 +29,7 @@
#ifndef _BASCTL_DLGEDOBJ_HXX
#define _BASCTL_DLGEDOBJ_HXX
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <comphelper/processfactory.hxx>
@@ -131,6 +132,7 @@ public:
virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
virtual void SetLayer(SdrLayerID nLayer);
+ bool MakeDataAware( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
};
diff --git a/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
new file mode 100644
index 0000000..a4afa1d
--- /dev/null
+++ b/basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormRadio" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormCheck" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormList" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormCombo" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormVScroll" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormHScroll" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormSpin" toolbar:helpid="helpid:10146" toolbar:style="radio" />
+ <toolbar:toolbarbreak/>
+</toolbar:toolbar>
diff --git a/default_images/cmd/lc_insertformcheck.png b/default_images/cmd/lc_insertformcheck.png
new file mode 100644
index 0000000..976b300
Binary files /dev/null and b/default_images/cmd/lc_insertformcheck.png differ
diff --git a/default_images/cmd/lc_insertformcombo.png b/default_images/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..848dbb2
Binary files /dev/null and b/default_images/cmd/lc_insertformcombo.png differ
diff --git a/default_images/cmd/lc_insertformhscroll.png b/default_images/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..590935d
Binary files /dev/null and b/default_images/cmd/lc_insertformhscroll.png differ
diff --git a/default_images/cmd/lc_insertformlist.png b/default_images/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..622b21d
Binary files /dev/null and b/default_images/cmd/lc_insertformlist.png differ
diff --git a/default_images/cmd/lc_insertformradio.png b/default_images/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..13a406c
Binary files /dev/null and b/default_images/cmd/lc_insertformradio.png differ
diff --git a/default_images/cmd/lc_insertformspin.png b/default_images/cmd/lc_insertformspin.png
new file mode 100644
index 0000000..5da9aa1
Binary files /dev/null and b/default_images/cmd/lc_insertformspin.png differ
diff --git a/default_images/cmd/lc_insertformvscroll.png b/default_images/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..5a070c5
Binary files /dev/null and b/default_images/cmd/lc_insertformvscroll.png differ
diff --git a/default_images/cmd/sc_insertformcheck.png b/default_images/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..3c33435
Binary files /dev/null and b/default_images/cmd/sc_insertformcheck.png differ
diff --git a/default_images/cmd/sc_insertformcombo.png b/default_images/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..5585f2e
Binary files /dev/null and b/default_images/cmd/sc_insertformcombo.png differ
diff --git a/default_images/cmd/sc_insertformhscroll.png b/default_images/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..7a09c0e
Binary files /dev/null and b/default_images/cmd/sc_insertformhscroll.png differ
diff --git a/default_images/cmd/sc_insertformlist.png b/default_images/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..29f39f3
Binary files /dev/null and b/default_images/cmd/sc_insertformlist.png differ
diff --git a/default_images/cmd/sc_insertformradio.png b/default_images/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..ce8682a
Binary files /dev/null and b/default_images/cmd/sc_insertformradio.png differ
diff --git a/default_images/cmd/sc_insertformspin.png b/default_images/cmd/sc_insertformspin.png
new file mode 100644
index 0000000..dbf04e4
Binary files /dev/null and b/default_images/cmd/sc_insertformspin.png differ
diff --git a/default_images/cmd/sc_insertformvscroll.png b/default_images/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..6a09f2f
Binary files /dev/null and b/default_images/cmd/sc_insertformvscroll.png differ
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 01adbe5..3c2896e 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -456,7 +456,9 @@ void ToolBarManager::UpdateImageOrientation()
m_pToolBar->SetItemImageAngle( nId, m_lImageRotation );
}
if ( pIter->second.bMirrored )
+ {
m_pToolBar->SetItemImageMirrorMode( nId, m_bImageMirrored );
+ }
}
}
}
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index 47c7b35..3dc6929 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -13,7 +13,62 @@
<value xml:lang="en-US">Line Numbers</value>
</prop>
</node>
-
+ <node oor:name=".uno:InsertFormRadio" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Option Button</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormCheck" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Check Box</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormList" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">List Box</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormCombo" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Combo Box</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormVScroll" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Vertical Scroll Bar</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormHScroll" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Horizonal Scroll Bar</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertFormSpin" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Spin Button</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
</node>
<node oor:name="Popups">
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index 4debaed..8092b1a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -107,6 +107,29 @@
<value>true</value>
</prop>
</node>
+
+ <node oor:name="private:resource/toolbar/formcontrolsbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">FormControls</value>
+
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+
<node oor:name="private:resource/toolbar/insertcontrolsbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Toolbox</value>
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png b/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png
new file mode 100644
index 0000000..3181e29
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png b/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..43170c6
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png b/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..705191c
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png b/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..dbc038b
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformlist.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png b/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..1648805
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformradio.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png b/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png
new file mode 100644
index 0000000..363ebb1
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformspin.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png b/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..ffba6ae
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png b/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..47f1e58
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png b/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..08e5c10
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png b/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..ee33722
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png b/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..31d3858
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformlist.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png b/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..f4b7641
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformradio.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png b/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png
new file mode 100644
index 0000000..0c66e0d
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformspin.png differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png b/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..79b3148
Binary files /dev/null and b/ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformcheck.png b/ooo_custom_images/human/cmd/lc_insertformcheck.png
new file mode 100644
index 0000000..71565b0
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformcheck.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformcombo.png b/ooo_custom_images/human/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..dcfdf62
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformcombo.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformhscroll.png b/ooo_custom_images/human/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..f375bfb
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformhscroll.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformlist.png b/ooo_custom_images/human/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..387f02c
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformlist.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformradio.png b/ooo_custom_images/human/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..f38c02c
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformradio.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformspin.png b/ooo_custom_images/human/cmd/lc_insertformspin.png
new file mode 100644
index 0000000..ea50eef
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformspin.png differ
diff --git a/ooo_custom_images/human/cmd/lc_insertformvscroll.png b/ooo_custom_images/human/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..f48faf5
Binary files /dev/null and b/ooo_custom_images/human/cmd/lc_insertformvscroll.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformcheck.png b/ooo_custom_images/human/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..f9a2409
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformcheck.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformcombo.png b/ooo_custom_images/human/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..16d0ae9
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformcombo.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformhscroll.png b/ooo_custom_images/human/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..971215d
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformhscroll.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformlist.png b/ooo_custom_images/human/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..1ab2bf3
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformlist.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformradio.png b/ooo_custom_images/human/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..bca7d6a
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformradio.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformspin.png b/ooo_custom_images/human/cmd/sc_insertformspin.png
new file mode 100644
index 0000000..83aa3a0
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformspin.png differ
diff --git a/ooo_custom_images/human/cmd/sc_insertformvscroll.png b/ooo_custom_images/human/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..ab1b0a4
Binary files /dev/null and b/ooo_custom_images/human/cmd/sc_insertformvscroll.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformcheck.png b/ooo_custom_images/industrial/cmd/lc_insertformcheck.png
new file mode 100644
index 0000000..55cfeb3
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformcheck.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformcombo.png b/ooo_custom_images/industrial/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..dcfdf62
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformcombo.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png b/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..f375bfb
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformhscroll.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformlist.png b/ooo_custom_images/industrial/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..387f02c
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformlist.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformradio.png b/ooo_custom_images/industrial/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..f38c02c
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformradio.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png b/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..f48faf5
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/lc_insertformvscroll.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformcheck.png b/ooo_custom_images/industrial/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..f9a2409
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformcheck.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformcombo.png b/ooo_custom_images/industrial/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..16d0ae9
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformcombo.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png b/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..971215d
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformhscroll.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformlist.png b/ooo_custom_images/industrial/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..1ab2bf3
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformlist.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformradio.png b/ooo_custom_images/industrial/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..bca7d6a
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformradio.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png b/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..ab1b0a4
Binary files /dev/null and b/ooo_custom_images/industrial/cmd/sc_insertformvscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png b/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png
new file mode 100644
index 0000000..394e634
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformcheck.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png b/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png
new file mode 100644
index 0000000..0976f6c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformcombo.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png
new file mode 100644
index 0000000..3b54b14
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformlist.png b/ooo_custom_images/oxygen/cmd/lc_insertformlist.png
new file mode 100644
index 0000000..34c3652
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformlist.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformradio.png b/ooo_custom_images/oxygen/cmd/lc_insertformradio.png
new file mode 100644
index 0000000..7835892
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformradio.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformspin.png b/ooo_custom_images/oxygen/cmd/lc_insertformspin.png
new file mode 100644
index 0000000..a2cf50f
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformspin.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png
new file mode 100644
index 0000000..44d1685
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png b/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png
new file mode 100644
index 0000000..1a4ae4c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformcheck.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png b/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png
new file mode 100644
index 0000000..9c6ad0c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformcombo.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png
new file mode 100644
index 0000000..8571c6b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformhscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformlist.png b/ooo_custom_images/oxygen/cmd/lch_insertformlist.png
new file mode 100644
index 0000000..a4eb77c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformlist.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformradio.png b/ooo_custom_images/oxygen/cmd/lch_insertformradio.png
new file mode 100644
index 0000000..7f93720
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformradio.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformspin.png b/ooo_custom_images/oxygen/cmd/lch_insertformspin.png
new file mode 100644
index 0000000..9550139
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformspin.png differ
diff --git a/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png
new file mode 100644
index 0000000..e542676
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/lch_insertformvscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png b/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png
new file mode 100644
index 0000000..2ddd236
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformcheck.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png b/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png
new file mode 100644
index 0000000..04d90c3
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformcombo.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png
new file mode 100644
index 0000000..7d2a274
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformhscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformlist.png b/ooo_custom_images/oxygen/cmd/sc_insertformlist.png
new file mode 100644
index 0000000..bd28be1
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformlist.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformradio.png b/ooo_custom_images/oxygen/cmd/sc_insertformradio.png
new file mode 100644
index 0000000..d4cdb18
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformradio.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformspin.png b/ooo_custom_images/oxygen/cmd/sc_insertformspin.png
new file mode 100644
index 0000000..86958da
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformspin.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png
new file mode 100644
index 0000000..9c17ae4
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sc_insertformvscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png b/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png
new file mode 100644
index 0000000..e862823
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformcheck.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png b/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png
new file mode 100644
index 0000000..43df64b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformcombo.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png b/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png
new file mode 100644
index 0000000..58b9b3c
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformhscroll.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformlist.png b/ooo_custom_images/oxygen/cmd/sch_insertformlist.png
new file mode 100644
index 0000000..3f7a15b
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformlist.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformradio.png b/ooo_custom_images/oxygen/cmd/sch_insertformradio.png
new file mode 100644
index 0000000..6d1756e
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformradio.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformspin.png b/ooo_custom_images/oxygen/cmd/sch_insertformspin.png
new file mode 100644
index 0000000..07b61d7
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformspin.png differ
diff --git a/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png b/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png
new file mode 100644
index 0000000..603b31e
Binary files /dev/null and b/ooo_custom_images/oxygen/cmd/sch_insertformvscroll.png differ
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 5339b55..6a84af7 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -73,6 +73,7 @@ uiconfig/modules/sdraw/menubar/menubar.xml
#
uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml
uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml
+uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml
uiconfig/modules/BasicIDE/toolbar/macrobar.xml
uiconfig/modules/BasicIDE/toolbar/standardbar.xml
uiconfig/modules/dbapp/toolbar/formobjectbar.xml
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 5dad09b..033ffca 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1260,9 +1260,16 @@
#define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103)
#define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104)
#define SID_TRANSLITERATE_ROTATE_CASE (SID_SVX_START+1105)
+#define SID_INSERT_RADIO (SID_SVX_START+1106)
+#define SID_INSERT_CHECK (SID_SVX_START+1107)
+#define SID_INSERT_LIST (SID_SVX_START+1108)
+#define SID_INSERT_COMBO (SID_SVX_START+1109)
+#define SID_INSERT_SPIN (SID_SVX_START+1110)
+#define SID_INSERT_VSCROLL (SID_SVX_START+1111)
+#define SID_INSERT_HSCROLL (SID_SVX_START+1112)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_TRANSLITERATE_ROTATE_CASE + 1)
+#define SID_SVX_FIRSTFREE (SID_INSERT_HSCROLL + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 1775fa2..5bfb674 100755
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8612,6 +8612,196 @@ SfxBoolItem InsertPushbutton SID_INSERT_PUSHBUTTON
]
//--------------------------------------------------------------------------
+
+SfxBoolItem InsertFormRadio SID_INSERT_RADIO
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
+SfxBoolItem InsertFormCheck SID_INSERT_CHECK
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
+SfxBoolItem InsertFormList SID_INSERT_LIST
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
+SfxBoolItem InsertFormCombo SID_INSERT_COMBO
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+//--------------------------------------------------------------------------
+SfxBoolItem InsertFormSpin SID_INSERT_SPIN
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
+SfxBoolItem InsertFormVScroll SID_INSERT_VSCROLL
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem InsertFormHScroll SID_INSERT_HSCROLL
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_CONTROLS;
+]
+
+//--------------------------------------------------------------------------
SfxBoolItem Radiobutton SID_INSERT_RADIOBUTTON
[
commit c2f62c8cb30975e3cd46c4800e738f3f010ecb3e
Author: Noel Power <noel.power at novell.com>
Date: Mon Dec 5 09:48:31 2011 +0000
enable gsoc multi line inputbar feature
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5689307..8b32bc9 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -150,8 +150,9 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
#define IMAGE(id) pImgMgr->SeekImage(id)
bool lcl_isExperimentalMode()
{
- SvtMiscOptions aMiscOptions;
- return aMiscOptions.IsExperimentalMode();
+ // make inputbar feature on by default, leave the switch for the
+ // moment in case we need to back it out easily
+ return true;
}
//==================================================================
More information about the Libreoffice-commits
mailing list