diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-27 14:10:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-27 14:11:12 +0200 |
| commit | 6c974272423ca19c94d8d5e182fec46836309d60 (patch) | |
| tree | fb03b9bcc40885a1febbb42c289eef7347b46c06 /rsc | |
| parent | ff5ce47439a32d3fe3b6f5461a8e10441d54a8c9 (diff) | |
Revert "Remove more RSC_DOCKWINDOW related stuff"
This reverts commit 538a217263230765961f6cabbc8d8e168b3eaac0.
Depends on the previous reverted commit
Change-Id: Ie3cdef43e746712beab31af2abaaede4e53d5506
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.y | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 0cec6cb720c0..eb02f71f26f3 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -105,6 +105,7 @@ void RscTypCont::Init() aNmTb.Put( "POS", POSITION, (sal_IntPtr)0 ); aNmTb.Put( "SIZE", DIMENSION, (sal_IntPtr)0 ); aNmTb.Put( "ZoomInOutputSize", INZOOMOUTPUTSIZE,(sal_IntPtr)0 ); + aNmTb.Put( "FloatingPos", FLOATINGPOS, (sal_IntPtr)0 ); } { aShort.SetRange( -32768, 32767 ); diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index bf966214c1d2..43272f2fc8c8 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -307,6 +307,7 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) %token POSITION %token DIMENSION %token INZOOMOUTPUTSIZE +%token FLOATINGPOS %token DEFINE %token INCLUDE %token MACROTARGET @@ -755,6 +756,18 @@ var_definition SetNumber( S.Top(), "_ZOOMINWIDTH", $4 ); SetNumber( S.Top(), "_ZOOMINHEIGHT", $6 ); } + | FLOATINGPOS '=' CONSTNAME '(' long_expression ',' long_expression + ')' ';' + { + SetConst( S.Top(), "_FLOATINGPOSMAPMODE", $3.hashid, $3.nValue ); + SetNumber( S.Top(), "_FLOATINGPOSX", $5 ); + SetNumber( S.Top(), "_FLOATINGPOSY", $7 ); + } + | FLOATINGPOS '=' '(' long_expression ',' long_expression ')' ';' + { + SetNumber( S.Top(), "_FLOATINGPOSX", $4 ); + SetNumber( S.Top(), "_FLOATINGPOSY", $6 ); + } ; var_header_class |