mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS dba34a

Browse Source
This commit is contained in:
Vladimir Glazunov 2010-11-08 16:01:31 +01:00
commit ca85fc4a6e
7 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
animations/source/animcore/targetpropertiescreator.cxx
View File

@ -42,7 +42,6 @@
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <comphelper/optionalvalue.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/sequence.hxx>

2
sd/source/filter/ppt/propread.cxx
View File

@ -99,7 +99,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
if (nSize > STRING_MAXLEN)
nSize = STRING_MAXLEN;
return nSize;
return xub_StrLen( nSize );
}
BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )

2
sd/source/ui/animations/CustomAnimationList.cxx Normal file → Executable file
View File

@ -477,7 +477,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
, mpController( pController )
, mpLastParentEntry(0)
{
SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) );
SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT );
EnableContextMenuHandling();
SetSelectionMode( MULTIPLE_SELECTION );

4
sd/source/ui/dlg/dlgassim.cxx
View File

@ -49,10 +49,10 @@ SdPageListControl::SdPageListControl(
: SvTreeListBox(pParent, rResId)
{
// Tree-ListBox mit Linien versehen
SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | WB_HASLINESATROOT |
WB_HSCROLL | // #31562#
WB_HASBUTTONSATROOT ) );
WB_HASBUTTONSATROOT );
SetNodeDefaultImages ();
m_pCheckButton = new SvLBoxButtonData(this);

9
sd/source/ui/dlg/sdtreelb.cxx
View File

@ -258,10 +258,11 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
{
// Tree-ListBox mit Linien versehen
SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | // WB_HASLINESATROOT |
WB_HSCROLL | // #31562#
WB_HASBUTTONSATROOT ) );
SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | // WB_HASLINESATROOT |
WB_HSCROLL | // #31562#
WB_HASBUTTONSATROOT |
WB_QUICK_SEARCH /* i31275 */ );
SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ),
Bitmap( SdResId( BMP_COLLAPSE ) ) );

1
sd/source/ui/inc/sdtreelb.hxx
View File

@ -218,6 +218,7 @@ public:
static BOOL IsInDrag();
using SvLBox::ExecuteDrop;
using SvTreeListBox::SelectEntry;
private:
/** This flag controls whether all shapes are shown as children of pages
and group shapes or only the named shapes.

24
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
View File

@ -512,13 +512,18 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi
SetName( String( RTL_CONSTASCII_USTRINGPARAM( "ToolPanelViewShell" ) ) );
// Some recent changes to the toolpanel make it necessary to create the
// accessibility object now. Creating it on demand would lead to a
// pointer cycle in the tree of accessibility objects and would lead
// e.g. the accerciser AT tool into an infinite loop.
// It would be nice to get rid of this workaround in the future.
// enforce the creation of the Accessible object here.
// In some not-always-to-reproduce situations, creating the accessible on demand only leads to some
// cycliy parenthood references between the involved objects, which make some AT tools (accerciser, in particular)
// loop (which is /not/ a bug in the tool, of course).
// However, since those situations were not reproducible anymore, we deliberately leave the Accessible creation
// (which originally was intended as a workaround) herein. Better to be safe ...
// Note that this is not a performance problem: The implementation of the ToolPanelDeck's Accessible
// is separated from the implementation of its AccessibleContext (which even is in a separate library) - we only
// create the former here, the latter is still created on demand, when somebody requests it.
// #i113671# / 2010-09-17 / frank.schoenheit@oracle.com
if (mpContentWindow.get())
mpContentWindow->SetAccessible(mpImpl->CreateAccessible(*mpContentWindow));
mpContentWindow->GetAccessible( TRUE );
// For accessibility we have to shortly hide the content window. This
// triggers the construction of a new accessibility object for the new
@ -629,12 +634,7 @@ DockingWindow* ToolPanelViewShell::GetDockingWindow()
Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* i_pWindow )
{
ENSURE_OR_RETURN( i_pWindow, "ToolPanelViewShell::CreateAccessibleDocumentView: illegal window!", NULL );
// As said above, we have to create the accessibility object
// (unconditionally) in the constructor, not here on demand, or
// otherwise we would create a cycle in the tree of accessible objects
// which could lead to infinite loops in AT tools.
// return mpImpl->CreateAccessible( *i_pWindow );
return Reference<XAccessible>();
return mpImpl->CreateAccessible( *i_pWindow );
}
// ---------------------------------------------------------------------------------------------------------------------