mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS jl61 (1.47.16); FILE MERGED

Browse Source 
2007/06/14 12:24:04 ab 1.47.16.2: #i76438# Live mode without decoration with parent dialog
2007/05/11 06:41:46 ab 1.47.16.1: #i77021# Support for decoration property
This commit is contained in:
Kurt Zenker
2007-06-20 09:39:15 +00:00
parent 2a36f2e687
commit 3daf70800a
1 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
basctl/source/dlged/dlged.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: dlged.cxx,v $ * $RCSfile: dlged.cxx,v $
* *
* $Revision: 1.47 $ * $Revision: 1.48 $
* *
* last change: $Author: obo $ $Date: 2007-03-15 16:00:06 $ * last change: $Author: kz $ $Date: 2007-06-20 10:39:15 $
* *
* 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.
@@ -164,6 +164,10 @@ using ::rtl::OUString;
static ::rtl::OUString aResourceResolverPropName = static ::rtl::OUString aResourceResolverPropName =
::rtl::OUString::createFromAscii( "ResourceResolver" ); ::rtl::OUString::createFromAscii( "ResourceResolver" );
static ::rtl::OUString aDecorationPropName =
::rtl::OUString::createFromAscii( "Decoration" );
static ::rtl::OUString aTitlePropName =
::rtl::OUString::createFromAscii( "Title" );
//============================================================================ //============================================================================
@@ -212,17 +216,35 @@ void DlgEditor::ShowDialog()
uno::Reference< beans::XPropertySet > xSrcDlgModPropSet( m_xUnoControlDialogModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xSrcDlgModPropSet( m_xUnoControlDialogModel, uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xNewDlgModPropSet( xDlgMod, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xNewDlgModPropSet( xDlgMod, uno::UNO_QUERY );
if( xSrcDlgModPropSet.is() && xNewDlgModPropSet.is() ) if( xNewDlgModPropSet.is() )
{ {
if( xSrcDlgModPropSet.is() )
{
try
{
Any aResourceResolver = xSrcDlgModPropSet->getPropertyValue( aResourceResolverPropName );
xNewDlgModPropSet->setPropertyValue( aResourceResolverPropName, aResourceResolver );
}
catch( UnknownPropertyException& )
{
DBG_ERROR( "DlgEditor::ShowDialog(): No ResourceResolver property" );
}
}
// Disable decoration
bool bDecoration = true;
try try
{ {
Any aResourceResolver = xSrcDlgModPropSet->getPropertyValue( aResourceResolverPropName ); Any aDecorationAny = xSrcDlgModPropSet->getPropertyValue( aDecorationPropName );
xNewDlgModPropSet->setPropertyValue( aResourceResolverPropName, aResourceResolver ); aDecorationAny >>= bDecoration;
if( !bDecoration )
{
xNewDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
xNewDlgModPropSet->setPropertyValue( aTitlePropName, makeAny( ::rtl::OUString() ) );
}
} }
catch( UnknownPropertyException& ) catch( UnknownPropertyException& )
{ {}
DBG_ERROR( "DlgEditor::ShowDialog(): No ResourceResolver property" );
}
} }
// set the model // set the model
@@ -534,6 +556,21 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
pDlgEdModel->SetChanged( FALSE ); pDlgEdModel->SetChanged( FALSE );
} }
void DlgEditor::ResetDialog( void )
{
DlgEdForm* pOldDlgEdForm = pDlgEdForm;
DlgEdPage* pPage = (DlgEdPage*)pDlgEdModel->GetPage(0);
SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
BOOL bWasMarked = pDlgEdView->IsObjMarked( pOldDlgEdForm );
pDlgEdView->UnmarkAll();
pPage->Clear();
pPage->SetDlgEdForm( NULL );
SetDialog( m_xUnoControlDialogModel );
if( bWasMarked )
pDlgEdView->MarkObj( pDlgEdForm, pPgView, FALSE );
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSupplier() Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSupplier()