diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 15:25:13 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 15:25:13 +0200 |
| commit | cb393fa55af966c4f9e0f86fa1dc6f459b49b77d (patch) | |
| tree | 2c617c0c151f1532855af3cabe56fce4e1689d5f | |
| parent | 92fb379ed7d2cc90a499f497be9551e74c22ced8 (diff) | |
| parent | 7a916a1ab8922e3b844996bc429c7f546542aa39 (diff) | |
CWS-TOOLING: integrate CWS ka102
Notes
split repo tag: writer_ooo/DEV300_m105
| -rw-r--r-- | sw/source/core/undo/docundo.cxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/shells/grfsh.cxx | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 2e91da080c7c..79eb610a84e6 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -47,6 +47,7 @@ #include <undo.hrc> #include <editsh.hxx> #include <unobaseclass.hxx> +#include <limits> #include <limits> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 4b94089ded3d..ba6704981b70 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -519,6 +519,9 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) rSh.GetCurAttr( aCoreSet ); sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ); sal_Bool bIsGrfCntnt = CNT_GRF == GetShell().GetCntType(); +// const GraphicObject* pGrfObj = ( bIsGrfCntnt ? rSh.GetGraphicObj() : NULL ); +// sal_Bool bIsRenderGraphicGrfCntnt = ( pGrfObj && pGrfObj->IsRenderGraphic() ); + // --> OD 2006-11-03 #i59688# // sal_Bool bSwappedOut = rSh.IsGrfSwapOut( sal_True ); // sal_Bool bBitmapType = !bSwappedOut && GRAPHIC_BITMAP == rSh.GetGraphicType(); @@ -613,11 +616,11 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) if( !bParentCntProt ) { // --> OD 2005-02-09 #119353# - robust - const GraphicObject* pGrfObj = rSh.GetGraphicObj(); - if ( pGrfObj ) + const GraphicObject* pGrafObj = rSh.GetGraphicObj(); + if ( pGrafObj ) { - if( pGrfObj->IsAnimated() || - GRAPHIC_GDIMETAFILE == pGrfObj->GetType() ) + if( pGrafObj->IsAnimated() || + GRAPHIC_GDIMETAFILE == pGrafObj->GetType() ) bDisable = sal_True; else rSet.Put( SfxUInt16Item( nWhich, ((SwTransparencyGrf&) @@ -701,7 +704,3 @@ SwGrfShell::SwGrfShell(SwView &_rView) : SetName(String::CreateFromAscii("Graphic")); SetHelpId(SW_GRFSHELL); } - - - - |