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

INTEGRATION: CWS aw038 (1.152.12); FILE MERGED

2006/12/01 17:43:08 aw 1.152.12.1: #i68101# SdrObject core support for Title, Description added, support for Name reworked. UNO API support for Title Description added as xShape property. Rudimentary created new NameTitleDesc dialog
üst 5f53a165
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: unoshape.cxx,v $ * $RCSfile: unoshape.cxx,v $
* *
* $Revision: 1.153 $ * $Revision: 1.154 $
* *
* last change: $Author: kz $ $Date: 2006-12-12 16:42:49 $ * last change: $Author: ihi $ $Date: 2006-12-19 17:47:54 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -1977,6 +1977,29 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const ...@@ -1977,6 +1977,29 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
} }
break; break;
} }
// #i68101#
case OWN_ATTR_MISC_OBJ_TITLE:
{
OUString aTitle;
if( rVal >>= aTitle )
{
mpObj->SetTitle( aTitle );
return;
}
break;
}
case OWN_ATTR_MISC_OBJ_DESCRIPTION:
{
OUString aDescription;
if( rVal >>= aDescription )
{
mpObj->SetDescription( aDescription );
return;
}
break;
}
case SDRATTR_OBJPRINTABLE: case SDRATTR_OBJPRINTABLE:
{ {
sal_Bool bPrintable = sal_Bool(); sal_Bool bPrintable = sal_Bool();
...@@ -2662,6 +2685,21 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) ...@@ -2662,6 +2685,21 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
aAny <<= aName; aAny <<= aName;
break; break;
} }
// #i68101#
case OWN_ATTR_MISC_OBJ_TITLE:
{
OUString aTitle( mpObj->GetTitle() );
aAny <<= aTitle;
break;
}
case OWN_ATTR_MISC_OBJ_DESCRIPTION:
{
OUString aDescription( mpObj->GetDescription() );
aAny <<= aDescription;
break;
}
case SDRATTR_OBJPRINTABLE: case SDRATTR_OBJPRINTABLE:
aAny = uno::makeAny( (sal_Bool) mpObj->IsPrintable() ); aAny = uno::makeAny( (sal_Bool) mpObj->IsPrintable() );
break; break;
......
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