strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "remove unused RSC_DOCKWINDOW flags"

Browse source 
This reverts commit c8754b38ce.

This causes toolkit.AccessibleDropDownListBox to fail with:
 LOG> ImplementationName Unknown, does not implement XServiceInfo
 Exception while getting Environment Couldn't create a test object
This commit is contained in:
Michael Stahl 2016-05-27 14:08:53 +02:00
parent 5e91e48a15
commit ff5ce47439
5 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/tools/rc.h
View file

@ -137,6 +137,12 @@ namespace o3tl {
#define RSC_TOOLBOX_ITEMIMAGELIST 0x40
#define RSC_TOOLBOX_ITEMLIST 0x80
// For "DockingWindow" resources:
#define RSC_DOCKINGWINDOW_XYMAPMODE 0x01
#define RSC_DOCKINGWINDOW_X 0x02
#define RSC_DOCKINGWINDOW_Y 0x04
#define RSC_DOCKINGWINDOW_FLOATING 0x08
// For "ImageButtons":
enum class RscImageButtonFlags {
Image = 0x01,

3
rsc/inc/rscdb.hxx
View file

@ -205,7 +205,8 @@ class RscTypCont
RscTop * InitClassNumericField( RscTop * pSuper );
RscTop * InitClassMetricField( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
RscTop * InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap,
RscTop * pClassImage,
RscEnum * pTriState );

17
rsc/source/parser/rscicpx.cxx
View file

@ -897,7 +897,8 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
return pClassMetricField;
}
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper )
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
Atom nId;
RscTop * pClassDockWindow;
@ -908,6 +909,20 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper )
pClassDockWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassDockWindow );
// initialize variables
nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME );
pClassDockWindow->SetVariable( nId, pMapUnit, nullptr, 0,
RSC_DOCKINGWINDOW_XYMAPMODE );
nId = aNmTb.Put( "_FloatingPosX", VARNAME );
pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
RSC_DOCKINGWINDOW_X );
nId = aNmTb.Put( "_FloatingPosY", VARNAME );
pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
RSC_DOCKINGWINDOW_Y );
nId = aNmTb.Put( "FloatingMode", VARNAME );
pClassDockWindow->SetVariable( nId, &aBool, nullptr, 0,
RSC_DOCKINGWINDOW_FLOATING );
INS_WINBIT(pClassDockWindow,Moveable)
INS_WINBIT(pClassDockWindow,Sizeable)
INS_WINBIT(pClassDockWindow,EnableResizing)

2
rsc/source/parser/rscinit.cxx
View file

@ -409,7 +409,7 @@ void RscTypCont::Init()
}
}
{
RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow );
RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap,

33
vcl/source/window/dockwin.cxx
View file

@ -380,7 +380,38 @@ void DockingWindow::ImplLoadRes( const ResId& rResId )
{
Window::ImplLoadRes( rResId );
ReadLongRes();
const sal_uInt32 nMask = ReadLongRes();
if ( (RSC_DOCKINGWINDOW_XYMAPMODE | RSC_DOCKINGWINDOW_X |
RSC_DOCKINGWINDOW_Y) & nMask )
{
// use Sizes of the Resource
Point aPos;
MapUnit ePosMap = MAP_PIXEL;
if ( RSC_DOCKINGWINDOW_XYMAPMODE & nMask )
ePosMap = (MapUnit)ReadLongRes();
if ( RSC_DOCKINGWINDOW_X & nMask )
{
aPos.X() = ReadShortRes();
aPos.X() = ImplLogicUnitToPixelX( aPos.X(), ePosMap );
}
if ( RSC_DOCKINGWINDOW_Y & nMask )
{
aPos.Y() = ReadShortRes();
aPos.Y() = ImplLogicUnitToPixelY( aPos.Y(), ePosMap );
}
SetFloatingPos( aPos );
}
if ( nMask & RSC_DOCKINGWINDOW_FLOATING )
{
if ( ReadShortRes() != 0 )
SetFloatingMode( true );
}
}
DockingWindow::DockingWindow( WindowType nType ) :