buildbot failure in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Failure Build revision 1542167 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/552 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Failure Build revision 1542166 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/793 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Failure Build revision None on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/835 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
Hi! , The openoffice-fbsd-nightly builder has just completed a run STATUS: Failure Build revision 1542167 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-fbsd2_64bit Build results at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/91 Build reason was: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Failure Build revision None on branch openoffice/branches/ia2 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/301 Build reason was: The Nightly scheduler named 'aoo-win7-ia2' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1541941 - /openoffice/branches/rejuvenate01/main/nss/makefile.mk
Author: jsc Date: Thu Nov 14 15:50:18 2013 New Revision: 1541941 URL: http://svn.apache.org/r1541941 Log: #123685# remove obsolete endif Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/nss/makefile.mk?rev=1541941&r1=1541940&r2=1541941&view=diff == --- openoffice/branches/rejuvenate01/main/nss/makefile.mk (original) +++ openoffice/branches/rejuvenate01/main/nss/makefile.mk Thu Nov 14 15:50:18 2013 @@ -74,8 +74,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_ PATCH_FILES+=nss_linux.patch .ENDIF -.ENDIF # "$(GUI)"=="UNX" - .IF "$(GUI)"=="WNT"
svn commit: r1541908 - in /openoffice/trunk/main/solenv/bin: make_installer.pl modules/installer/control.pm modules/installer/globals.pm modules/installer/languages.pm modules/installer/parameter.pm m
Author: af
Date: Thu Nov 14 14:03:43 2013
New Revision: 1541908
URL: http://svn.apache.org/r1541908
Log:
123686: Removed support for building multiple languages in one run.
Modified:
openoffice/trunk/main/solenv/bin/make_installer.pl
openoffice/trunk/main/solenv/bin/modules/installer/control.pm
openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
openoffice/trunk/main/solenv/bin/modules/installer/languages.pm
openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm
openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm
Modified: openoffice/trunk/main/solenv/bin/make_installer.pl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/make_installer.pl?rev=1541908&r1=1541907&r2=1541908&view=diff
==
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Thu Nov 14 14:03:43 2013
@@ -612,10 +612,11 @@ if ( $installer::globals::debug ) { inst
if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1b:
The language dependent part\n"); }
-
-for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
+# Run the following code block exactly once.
+# This strange version of a do{}while(false) loop exists only to allow
(legacy) next statements.
+for (;1;last)
{
- my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
+ my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproduct,
$allvariableshashref);
if ( $installer::globals::globallogging ) {
installer::files::save_file($loggingdir . "languages.log" ,$languagesarrayref);
}
$installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
@@ -2259,8 +2260,7 @@ for ( my $n = 0; $n <= $#installer::glob
# saving file_info file for later analysis
my $speciallogfilename = "fileinfo_" . $installer::globals::product .
"\.log";
installer::files::save_array_of_hashes($loggingdir .
$speciallogfilename, $filesinproductlanguageresolvedarrayref);
-
-} # end of iteration for one language group
+}
# saving debug info at end
if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::globals::exitlog); }
Modified: openoffice/trunk/main/solenv/bin/modules/installer/control.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/control.pm?rev=1541908&r1=1541907&r2=1541908&view=diff
==
--- openoffice/trunk/main/solenv/bin/modules/installer/control.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/control.pm Thu Nov 14
14:03:43 2013
@@ -497,7 +497,7 @@ sub check_updatepack
# try to write into $shipdrive
- my $directory =
$installer::globals::product . "_" . $installer::globals::compiler . "_" .
$installer::globals::buildid . "_" . $installer::globals::languageproducts[0] .
"_test_$$";
+ my $directory =
$installer::globals::product . "_" . $installer::globals::compiler . "_" .
$installer::globals::buildid . "_" . $installer::globals::languageproduct .
"_test_$$";
$directory =~ s/\,/\_/g;# for
the list of languages
$directory =~ s/\-/\_/g;# for
en-US, pt-BR, ...
$directory = $shipdrive .
$installer::globals::separator . $directory;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1541908&r1=1541907&r2=1541908&view=diff
==
--- openoffice/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/globals.pm Thu Nov 14
14:03:43 2013
@@ -113,7 +113,7 @@ BEGIN
$required_dotnet_version = "2.0.0.0";
$productextension = "";
- @languageproducts = ();
+ $languageproduct = undef;
$build = "";
$minor = "";
$lastminor = "";
Modified: openoffice/trunk/main/solenv/bin/modules/installer/languages.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/languages.pm?rev=1541908&r1=1541907&r2=1541908&view=diff
==
--- openoffice/trunk/main/solenv/bin/modules/installer/languages.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/languages.pm Thu Nov 14
14:03:43 2013
@@ -30,31 +30,46 @@ use installer:
svn commit: r1541889 - /openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
Author: hdu
Date: Thu Nov 14 12:31:27 2013
New Revision: 1541889
URL: http://svn.apache.org/r1541889
Log:
#i123685# fix xmlsec initializer list for C++11 compliance
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx?rev=1541889&r1=1541888&r2=1541889&view=diff
==
---
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
Thu Nov 14 12:31:27 2013
@@ -38,11 +38,11 @@ uno::Reference< xml::crypto::XCipherCont
xResult->m_pSlot = PK11_GetBestSlot( nNSSCipherID, NULL );
if ( xResult->m_pSlot )
{
-SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ),
aKey.getLength() };
+SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ),
static_cast(aKey.getLength()) };
xResult->m_pSymKey = PK11_ImportSymKey( xResult->m_pSlot,
nNSSCipherID, PK11_OriginDerive, bEncryption ? CKA_ENCRYPT : CKA_DECRYPT,
&aKeyItem, NULL );
if ( xResult->m_pSymKey )
{
-SECItem aIVItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray()
) ), aInitializationVector.getLength() };
+SECItem aIVItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray()
) ), static_cast(aInitializationVector.getLength()) };
xResult->m_pSecParam = PK11_ParamFromIV( nNSSCipherID, &aIVItem );
if ( xResult->m_pSecParam )
{
svn commit: r1541875 - /openoffice/branches/rejuvenate01/main/nss/makefile.mk
Author: hdu Date: Thu Nov 14 10:58:52 2013 New Revision: 1541875 URL: http://svn.apache.org/r1541875 Log: #i123685# fix build of nss for 64bit-AOO on OSX Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/nss/makefile.mk?rev=1541875&r1=1541874&r2=1541875&view=diff == --- openoffice/branches/rejuvenate01/main/nss/makefile.mk (original) +++ openoffice/branches/rejuvenate01/main/nss/makefile.mk Thu Nov 14 10:58:52 2013 @@ -45,7 +45,7 @@ TARFILE_ROOTDIR=nss-3.14.4 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" -MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk +MACOS_SDK_DIR=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk .EXPORT : MACOS_SDK_DIR PATCH_FILES+=nss_macosx.patch .ENDIF # "$(OS)"=="MACOSX" @@ -56,31 +56,13 @@ BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF -.IF "$(GUI)"=="UNX" -.IF "$(OS)$(COM)"=="LINUXGCC" -.IF "$(BUILD64)"=="1" -# force 64-bit buildmode -USE_64:=1 -.EXPORT : USE_64 -.ENDIF # "$(CPU)"=="X" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" - -.IF "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(CPU)"=="X" +#.IF "$(BUILD64)"=="1" # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 +#.ENDIF# "$(BUILD64)"=="1" .ENDIF # "$(CPU)"=="X" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" - -.IF "$(OS)"=="MACOSX" -.IF "$(EXTRA_CFLAGS)"!="" -CPP:=gcc -E $(EXTRA_CFLAGS) -CXX:=g++ $(EXTRA_CFLAGS) -CC:=gcc $(EXTRA_CFLAGS) -.EXPORT : CPP -.ENDIF # "$(EXTRA_CFLAGS)"!="" -.ENDIF # "$(OS)"=="MACOSX" OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
svn commit: r1541869 - /openoffice/branches/Remove_MOZ/
Author: hdu Date: Thu Nov 14 10:24:44 2013 New Revision: 1541869 URL: http://svn.apache.org/r1541869 Log: removing closed branch Remove_MOZ Removed: openoffice/branches/Remove_MOZ/
buildbot success in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Success Build revision 1541809 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/551 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1541806 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/792 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1541847 [18/18] - in /openoffice/trunk: ./ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/
Modified: openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==
--- openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx Thu Nov 14 08:18:05 2013
@@ -154,6 +154,10 @@ namespace com { namespace sun { namespac
#define VCLEVENT_ITEM_COLLAPSED 1175
// <--
#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
+// #define VCLEVENT_EDIT_CARETCHANGED // IA2 CWS. MT:
VCL only has selection API - difference for selection_changed vs. caret_changed
is handled in accessibility wrapper since OOo 3.2
+//-IAccessibility2 Implementation 2009
// VclMenuEvent
#define VCLEVENT_MENU_ACTIVATE 1200
@@ -172,24 +176,39 @@ namespace com { namespace sun { namespac
#define VCLEVENT_MENU_ITEMCHECKED 1213
#define VCLEVENT_MENU_ITEMUNCHECKED1214
#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED1215
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
+#define VCLEVENT_TOOLBOX_ITEMUPDATED 1217
+//-IAccessibility2 Implementation 2009
#define VCLEVENT_MENU_SHOW 1250
#define VCLEVENT_MENU_HIDE 1251
#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
-
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_LISTBOX_TREEEXPAND 1218
+#define VCLEVENT_LISTBOX_TREECOLLAPSE 1219
+#define VCLEVENT_LISTBOX_TREEFOCUS 1220
+#define VCLEVENT_LISTBOX_TREESELECT1221
+#define VCLEVENT_EDIT_CARETCHANGED 1222
+#define VCLEVENT_COMBOBOX_UPDATEVALUE 1223
+
+#define VCLEVENT_LISTBOX_FOCUS 1224
+#define VCLEVENT_LISTBOX_CLEAR 1225
+//-IAccessibility2 Implementation 2009
// DockingWindow
-#define VCLEVENT_WINDOW_STARTDOCKING1217// pData = DockingData
-#define VCLEVENT_WINDOW_DOCKING 1218
-#define VCLEVENT_WINDOW_ENDDOCKING 1219// pData =
EndDockingData
-#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1220// pData = sal_Bool
-#define VCLEVENT_WINDOW_TOGGLEFLOATING 1221
-#define VCLEVENT_WINDOW_ENDPOPUPMODE1222// pData =
EndPopupModeData
-
-#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1223// pData = itempos
-#define VCLEVENT_TABLECELL_NAMECHANGED 1224// pData =
struct(Entry, Column, oldText)
-#define VCLEVENT_TABLEROW_SELECT 1225
-
+#define VCLEVENT_WINDOW_STARTDOCKING1227// pData = DockingData
+#define VCLEVENT_WINDOW_DOCKING 1228
+#define VCLEVENT_WINDOW_ENDDOCKING 1229// pData =
EndDockingData
+#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1230// pData = sal_Bool
+#define VCLEVENT_WINDOW_TOGGLEFLOATING 1231
+#define VCLEVENT_WINDOW_ENDPOPUPMODE1232// pData =
EndPopupModeData
+
+#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233// pData = itempos
+#define VCLEVENT_TABLECELL_NAMECHANGED 1234// pData =
struct(Entry, Column, oldText)
+#define VCLEVENT_TABLEROW_SELECT 1235
+// IAccessible2 implementation 2009
+#define VCLEVENT_LISTBOX_STATEUPDATE 1236
class VCL_DLLPUBLIC VclSimpleEvent
{
private:
Modified: openoffice/trunk/main/vcl/inc/vcl/window.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/window.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==
--- openoffice/trunk/main/vcl/inc/vcl/window.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/window.hxx Thu Nov 14 08:18:05 2013
@@ -629,6 +629,11 @@ public:
virtual voidDataChanged( const DataChangedEvent& rDCEvt );
virtual longPreNotify( NotifyEvent& rNEvt );
virtual longNotify( NotifyEvent& rNEvt );
+//IAccessibility2 Implementation 2009-
+virtual voidNotifyVCLEvent( sal_uLong nEvent ,void* pData = NULL);
+virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > > GetAccFlowToSequence();
+ virtual void SwitchView() {}
+//-IAccessibility2 Implementation 2009
virtual Window* GetPreferredKeyInputWindow();
/*virtual*/ voidAddEventListener( const Link& rEventListener );
Modified: openoffice/trunk/main/vcl/source/app/svapp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svapp.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==
--- openoffice/trunk/main/vcl/source/app/svapp.cxx (ori
svn commit: r1541847 [3/18] - in /openoffice/trunk: ./ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/a
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==
---
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
(original)
+++
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
Thu Nov 14 08:18:05 2013
@@ -208,7 +208,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibl
{
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(
_nPos );
// returns only toolbox buttons, not windows
- if ( aIter != m_aAccessibleChildren.end() &&
!aIter->second.is())
+ if ( aIter != m_aAccessibleChildren.end() &&
aIter->second.is())
pItem = static_cast< VCLXAccessibleToolBoxItem* >(
aIter->second.get() );
}
@@ -284,11 +284,14 @@ void VCLXAccessibleToolBox::ReleaseFocus
}
}
//
-
-void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 )
+void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
{
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pToolBox )
{
+ sal_uInt16 nFocusId = pToolBox->GetItemId( (sal_uInt16)_nPos );
+ VCLXAccessibleToolBoxItem* pFocusItem = NULL;
+
for ( ToolBoxItemsMap::iterator aIter =
m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
@@ -297,7 +300,12 @@ void VCLXAccessibleToolBox::UpdateChecke
VCLXAccessibleToolBoxItem* pItem =
static_cast< VCLXAccessibleToolBoxItem* >(
aIter->second.get() );
pItem->SetChecked( pToolBox->IsItemChecked( nItemId ) );
+if ( nItemId == nFocusId )
+pFocusItem = pItem;
}
+ //Solution:If the position is not a child item,the focus should
not be called
+ if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND )
+ pFocusItem->SetFocus( sal_True );
}
}
//
-
@@ -535,23 +543,41 @@ void VCLXAccessibleToolBox::ProcessWindo
// to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
Reference< XAccessibleContext > xTemp = this;
+ ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
switch ( rVclWindowEvent.GetId() )
{
case VCLEVENT_TOOLBOX_CLICK:
+ case VCLEVENT_TOOLBOX_SELECT:
{
if ( rVclWindowEvent.GetData() )
{
UpdateChecked_Impl(
(sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
UpdateIndeterminate_Impl(
(sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
}
+ else if( pToolBox->GetItemPos(pToolBox->GetCurItemId())
!= TOOLBOX_ITEM_NOTFOUND )
+ {
+ UpdateChecked_Impl(
pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+ UpdateIndeterminate_Impl(
pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+ }
break;
}
case VCLEVENT_TOOLBOX_DOUBLECLICK:
case VCLEVENT_TOOLBOX_ACTIVATE:
case VCLEVENT_TOOLBOX_DEACTIVATE:
- case VCLEVENT_TOOLBOX_SELECT:
+ //case VCLEVENT_TOOLBOX_SELECT:
break;
-
+ // IA2 CWS. MT: Still using VCLEVENT_TOOLBOX_CLICK, see comment
in vcl/source/window/toolbox2.cxx
+ /*
+ case VCLEVENT_TOOLBOX_ITEMUPDATED:
+ {
+ if ( rVclWindowEvent.GetData() )
+ {
+ UpdateChecked_Impl( TOOLBOX_ITEM_NOTFOUND );
+ UpdateIndeterminate_Impl(
(sal_Int32)rVclWindowEvent.GetData() );
+ }
+ break;
+ }
+ */
case VCLEVENT_TOOLBOX_HIGHLIGHT:
UpdateFocus_Impl();
break;
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==
---
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
(original)
+++
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
Thu Nov 14 08:18:05 2013
@@ -97
