Author: alg
Date: Wed Jan 8 16:21:53 2014
New Revision: 1556567
URL: http://svn.apache.org/r1556567
Log:
corrected relationship when area bitmap fill (textured) between
tile/autofit/position and offset, allow position when non-tile and non-autofit
Modified:
openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
Modified:
openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx?rev=1556567&r1=1556566&r2=1556567&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
(original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
Wed Jan 8 16:21:53 2014
@@ -2338,10 +2338,14 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
// allow positioning
aCtlPosition.Enable();
aCtlPosition.Invalidate();
+
+ // allow offsets
aFtXOffset.Enable();
aMtrFldXOffset.Enable();
aFtYOffset.Enable();
aMtrFldYOffset.Enable();
+
+ // allow 'Position" title
aFlPosition.Enable();
// allow size definitions
@@ -2365,16 +2369,20 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
aMtrFldOffset.Disable();
aFlOffset.Disable();
+ // no need for offsets, only position is supported in non-tiled
+ aFtXOffset.Disable();
+ aMtrFldXOffset.Disable();
+ aFtYOffset.Disable();
+ aMtrFldYOffset.Disable();
+
if( aTsbStretch.GetState() != STATE_NOCHECK )
{
// non-tiled, stretched
// no need for positioning
aCtlPosition.Disable();
aCtlPosition.Invalidate();
- aFtXOffset.Disable();
- aMtrFldXOffset.Disable();
- aFtYOffset.Disable();
- aMtrFldYOffset.Disable();
+
+ // no need for 'Position" title, all deactivated
aFlPosition.Disable();
// no need for size definitions
@@ -2392,10 +2400,8 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
// allow positioning
aCtlPosition.Enable();
aCtlPosition.Invalidate();
- aFtXOffset.Enable();
- aMtrFldXOffset.Enable();
- aFtYOffset.Enable();
- aMtrFldYOffset.Enable();
+
+ // allow 'Position" title, positioning is active
aFlPosition.Enable();
// allow size definitions
