Kaydet (Commit) f4a7fc16 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS mib07 (1.10.108); FILE MERGED

2008/03/26 10:57:36 mib 1.10.108.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/02 14:19:20 mib 1.10.108.1: #i79222#: Applied patch that adds missing const
üst 41a42088
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: backhdl.cxx,v $ * $RCSfile: backhdl.cxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -71,7 +71,7 @@ XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl() ...@@ -71,7 +71,7 @@ XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl()
// Nothing to do // Nothing to do
} }
sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
{ {
sal_Bool bRet = sal_True; sal_Bool bRet = sal_True;
style::GraphicLocation ePos = style::GraphicLocation_NONE, eTmp; style::GraphicLocation ePos = style::GraphicLocation_NONE, eTmp;
...@@ -231,7 +231,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const ...@@ -231,7 +231,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const
return bRet; return bRet;
} }
void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert ) void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePos, style::GraphicLocation eVert ) const
{ {
switch( ePos ) switch( ePos )
{ {
...@@ -266,7 +266,7 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePo ...@@ -266,7 +266,7 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePo
} }
} }
void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori ) void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePos, style::GraphicLocation eHori ) const
{ {
DBG_ASSERT( style::GraphicLocation_LEFT_MIDDLE==eHori || style::GraphicLocation_MIDDLE_MIDDLE==eHori || style::GraphicLocation_RIGHT_MIDDLE==eHori, DBG_ASSERT( style::GraphicLocation_LEFT_MIDDLE==eHori || style::GraphicLocation_MIDDLE_MIDDLE==eHori || style::GraphicLocation_RIGHT_MIDDLE==eHori,
"lcl_frmitems_MergeXMLHoriPos: vertical pos must be middle" ); "lcl_frmitems_MergeXMLHoriPos: vertical pos must be middle" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment