diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 20:54:56 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 20:54:56 +0100 |
| commit | dbbd1aae55766ffd0fb5fe14f712ece7ab691014 (patch) | |
| tree | 1d5dcaa38da97d4585caf63045b8396aab4577e6 /extensions | |
| parent | 143e8326931e0751caf3428eec0d8542229dd063 (diff) | |
| parent | acb0bbd76e63c13e2601f71bee219a89debc8457 (diff) | |
gridsort: pulled and merged DEV300m98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | extensions/source/update/check/updatecheck.cxx | 0 | ||||
| -rw-r--r-- | extensions/source/update/check/updatehdl.cxx | 14 |
3 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 7ad5d944ce43..97c954c95fa6 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1418,7 +1418,7 @@ namespace pcr if ( aDescriptor.PrimaryButtonId.getLength() ) aDescriptor.HasPrimaryButton = sal_True; - if ( aDescriptor.SecondaryButtonId ) + if ( aDescriptor.SecondaryButtonId.getLength() ) aDescriptor.HasSecondaryButton = sal_True; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 8419569bd949..8419569bd949 100755..100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 581c6d81c6fa..ab6260bd804b 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -49,7 +49,7 @@ #include "com/sun/star/awt/XControl.hpp" #include "com/sun/star/awt/XControlContainer.hpp" #include "com/sun/star/awt/XMessageBox.hpp" -#include "com/sun/star/awt/XThrobber.hpp" +#include "com/sun/star/awt/XAnimation.hpp" #include "com/sun/star/awt/XTopWindow.hpp" #include "com/sun/star/awt/XVclWindowPeer.hpp" #include "com/sun/star/awt/XVclContainer.hpp" @@ -759,14 +759,14 @@ void UpdateHandler::loadStrings() void UpdateHandler::startThrobber( bool bStart ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); - uno::Reference< awt::XThrobber > xThrobber( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY ); + uno::Reference< awt::XAnimation > xThrobber( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY ); if ( xThrobber.is() ) { if ( bStart ) - xThrobber->start(); + xThrobber->startAnimation(); else - xThrobber->stop(); + xThrobber->stopAnimation(); } uno::Reference< awt::XWindow > xWindow( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY ); @@ -1084,8 +1084,8 @@ bool UpdateHandler::showOverwriteWarning() const #define EDIT_WIDTH ( DIALOG_WIDTH - 2 * DIALOG_BORDER ) #define BOX1_BTN_X ( DIALOG_BORDER + EDIT_WIDTH - BUTTON_WIDTH - INNER_BORDER ) #define BOX1_BTN_Y ( DIALOG_BORDER + LABEL_HEIGHT + INNER_BORDER) -#define THROBBER_WIDTH 14 -#define THROBBER_HEIGHT 14 +#define THROBBER_WIDTH 16 +#define THROBBER_HEIGHT 16 #define THROBBER_X_POS ( DIALOG_BORDER + 8 ) #define THROBBER_Y_POS ( DIALOG_BORDER + 23 ) #define BUTTON_BAR_HEIGHT 24 @@ -1372,7 +1372,7 @@ void UpdateHandler::createDialog() { // @see awt/UnoControlThrobberModel.idl uno::Sequence< beans::NamedValue > aProps; - insertControlModel( xControlModel, UNISTRING("com.sun.star.awt.UnoThrobberControlModel"), CTRL_THROBBER, + insertControlModel( xControlModel, UNISTRING("com.sun.star.awt.SpinningProgressControlModel"), CTRL_THROBBER, awt::Rectangle( THROBBER_X_POS, THROBBER_Y_POS, THROBBER_WIDTH, THROBBER_HEIGHT), aProps ); } |