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

reportdesign: sal_Bool->bool

Browse Source 
Change-Id: Ib3e7a51a8b01165d4706857f7b347d622c2e624a
This commit is contained in:
Noel Grandin 2014-05-08 11:42:32 +02:00
parent f0268c9c1b
commit 2d54aa1d22
24 changed files with 208 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reportdesign/inc/ReportDefinition.hxx
View File

@ -117,6 +117,19 @@ namespace reportdesign
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
l.notify();
}
/// write a single XML stream into the package /// write a single XML stream into the package
bool WriteThroughComponent( bool WriteThroughComponent(
/// the component we export /// the component we export

2
reportdesign/source/core/api/FormatCondition.cxx
View File

@ -43,7 +43,7 @@ uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::
OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext)
:FormatConditionBase(m_aMutex) :FormatConditionBase(m_aMutex)
,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_bEnabled(sal_True) ,m_bEnabled(true)
{ {
} }

4
reportdesign/source/core/api/Function.cxx
View File

@ -41,8 +41,8 @@ OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
:FunctionBase(m_aMutex) :FunctionBase(m_aMutex)
,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_xContext(_xContext) ,m_xContext(_xContext)
,m_bPreEvaluated(sal_False) ,m_bPreEvaluated(false)
,m_bDeepTraversing(sal_False) ,m_bDeepTraversing(false)
{ {
m_sInitialFormula.IsPresent = sal_False; m_sInitialFormula.IsPresent = sal_False;
} }

6
reportdesign/source/core/api/ImageControl.cxx
View File

@ -118,7 +118,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_nScaleMode(awt::ImageScaleMode::NONE)
,m_bPreserveIRI(sal_True) ,m_bPreserveIRI(true)
{ {
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager());
} }
@ -130,7 +130,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_nScaleMode(awt::ImageScaleMode::NONE)
,m_bPreserveIRI(sal_True) ,m_bPreserveIRI(true)
{ {
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_xFactory = _xFactory; m_aProps.aComponent.m_xFactory = _xFactory;
@ -244,7 +244,7 @@ void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw
void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
{ {
sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);
setControlBackgroundTransparent(bTransparent); setControlBackgroundTransparent(bTransparent);
if ( !bTransparent ) if ( !bTransparent )
set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor); set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor);

48
reportdesign/source/core/api/ReportDefinition.cxx
View File

@ -585,10 +585,10 @@ struct OReportDefinitionImpl
::sal_Int16 m_nPageHeaderOption; ::sal_Int16 m_nPageHeaderOption;
::sal_Int16 m_nPageFooterOption; ::sal_Int16 m_nPageFooterOption;
::sal_Int32 m_nCommandType; ::sal_Int32 m_nCommandType;
sal_Bool m_bControllersLocked; bool m_bControllersLocked;
sal_Bool m_bModified; bool m_bModified;
sal_Bool m_bEscapeProcessing; bool m_bEscapeProcessing;
sal_Bool m_bSetModifiedEnabled; bool m_bSetModifiedEnabled;
OReportDefinitionImpl(::osl::Mutex& _aMutex) OReportDefinitionImpl(::osl::Mutex& _aMutex)
:m_aStorageChangeListeners(_aMutex) :m_aStorageChangeListeners(_aMutex)
@ -604,10 +604,10 @@ struct OReportDefinitionImpl
,m_nPageHeaderOption(0) ,m_nPageHeaderOption(0)
,m_nPageFooterOption(0) ,m_nPageFooterOption(0)
,m_nCommandType(sdb::CommandType::TABLE) ,m_nCommandType(sdb::CommandType::TABLE)
,m_bControllersLocked(sal_False) ,m_bControllersLocked(false)
,m_bModified(sal_False) ,m_bModified(false)
,m_bEscapeProcessing(sal_True) ,m_bEscapeProcessing(true)
,m_bSetModifiedEnabled( sal_True ) ,m_bSetModifiedEnabled( true )
{} {}
OReportDefinitionImpl(::osl::Mutex& _aMutex,const OReportDefinitionImpl& _aCopy) OReportDefinitionImpl(::osl::Mutex& _aMutex,const OReportDefinitionImpl& _aCopy)
@ -1330,14 +1330,14 @@ void SAL_CALL OReportDefinition::lockControllers( ) throw (uno::RuntimeExceptio
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
m_pImpl->m_bControllersLocked = sal_True; m_pImpl->m_bControllersLocked = true;
} }
void SAL_CALL OReportDefinition::unlockControllers( ) throw (uno::RuntimeException, std::exception) void SAL_CALL OReportDefinition::unlockControllers( ) throw (uno::RuntimeException, std::exception)
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
m_pImpl->m_bControllersLocked = sal_False; m_pImpl->m_bControllersLocked = false;
} }
sal_Bool SAL_CALL OReportDefinition::hasControllersLocked( ) throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL OReportDefinition::hasControllersLocked( ) throw (uno::RuntimeException, std::exception)
@ -1439,7 +1439,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
uno::Sequence < beans::PropertyValue > aProps; uno::Sequence < beans::PropertyValue > aProps;
// export sub streams for package, else full stream into a file // export sub streams for package, else full stream into a file
sal_Bool bWarn = sal_False, bErr = sal_False; bool bWarn = false, bErr = false;
OUString sWarnFile, sErrFile; OUString sWarnFile, sErrFile;
uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY);
@ -1502,7 +1502,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
{ {
if( !bWarn ) if( !bWarn )
{ {
bWarn = sal_True; bWarn = true;
sWarnFile = "settings.xml"; sWarnFile = "settings.xml";
} }
} }
@ -1518,7 +1518,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
{ {
if( !bWarn ) if( !bWarn )
{ {
bWarn = sal_True; bWarn = true;
sWarnFile = "meta.xml"; sWarnFile = "meta.xml";
} }
} }
@ -1534,7 +1534,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
{ {
if( !bWarn ) if( !bWarn )
{ {
bWarn = sal_True; bWarn = true;
sWarnFile = "styles.xml"; sWarnFile = "styles.xml";
} }
} }
@ -1548,7 +1548,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
"com.sun.star.comp.report.ExportFilter", "com.sun.star.comp.report.ExportFilter",
aDelegatorArguments, aProps, _xStorageToSaveTo ) ) aDelegatorArguments, aProps, _xStorageToSaveTo ) )
{ {
bErr = sal_True; bErr = true;
sErrFile = "content.xml"; sErrFile = "content.xml";
} }
} }
@ -1573,7 +1573,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if ( !bErr ) if ( !bErr )
{ {
sal_Bool bPersist = sal_False; bool bPersist = false;
if ( _xStorageToSaveTo == m_pImpl->m_xStorage ) if ( _xStorageToSaveTo == m_pImpl->m_xStorage )
bPersist = m_pImpl->m_pObjectContainer->StoreChildren(true,false); bPersist = m_pImpl->m_pObjectContainer->StoreChildren(true,false);
else else
@ -1679,12 +1679,12 @@ bool OReportDefinition::WriteThroughComponent(
// encrypt all streams // encrypt all streams
xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption",
uno::makeAny( (sal_Bool)sal_True ) ); uno::makeAny( true ) );
// set buffer and create outputstream // set buffer and create outputstream
// write the stuff // write the stuff
sal_Bool bRet = WriteThroughComponent( bool bRet = WriteThroughComponent(
xOutputStream, xComponent, xOutputStream, xComponent,
pServiceName, rArguments, rMediaDesc ); pServiceName, rArguments, rMediaDesc );
// finally, commit stream. // finally, commit stream.
@ -1804,7 +1804,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
size_t nFirstOpenMode = 0; size_t nFirstOpenMode = 0;
if ( aArguments.has( "ReadOnly" ) ) if ( aArguments.has( "ReadOnly" ) )
{ {
sal_Bool bReadOnly = sal_False; bool bReadOnly = false;
aArguments.get_ensureType( "ReadOnly", bReadOnly ); aArguments.get_ensureType( "ReadOnly", bReadOnly );
nFirstOpenMode = bReadOnly ? 1 : 0; nFirstOpenMode = bReadOnly ? 1 : 0;
} }
@ -1894,8 +1894,8 @@ sal_Bool SAL_CALL OReportDefinition::disableSetModified( ) throw (uno::RuntimeE
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed ); ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
const sal_Bool bWasEnabled = m_pImpl->m_bSetModifiedEnabled; const bool bWasEnabled = m_pImpl->m_bSetModifiedEnabled;
m_pImpl->m_bSetModifiedEnabled = sal_False; m_pImpl->m_bSetModifiedEnabled = false;
return bWasEnabled; return bWasEnabled;
} }
@ -1904,8 +1904,8 @@ sal_Bool SAL_CALL OReportDefinition::enableSetModified( ) throw (uno::RuntimeEx
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed ); ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
const sal_Bool bWasEnabled = m_pImpl->m_bSetModifiedEnabled; const bool bWasEnabled = m_pImpl->m_bSetModifiedEnabled;
m_pImpl->m_bSetModifiedEnabled = sal_True; m_pImpl->m_bSetModifiedEnabled = true;
return bWasEnabled; return bWasEnabled;
} }
@ -1935,7 +1935,7 @@ void SAL_CALL OReportDefinition::setModified( sal_Bool _bModified ) throw (beans
if ( m_pImpl->m_pReportModel->IsReadOnly() && _bModified ) if ( m_pImpl->m_pReportModel->IsReadOnly() && _bModified )
throw beans::PropertyVetoException(); throw beans::PropertyVetoException();
if ( m_pImpl->m_bModified != _bModified ) if ( (m_pImpl->m_bModified ? 1 : 0) != _bModified )
{ {
m_pImpl->m_bModified = _bModified; m_pImpl->m_bModified = _bModified;
if ( ( m_pImpl->m_pReportModel->IsChanged() ? 1 : 0 ) != _bModified ) if ( ( m_pImpl->m_pReportModel->IsChanged() ? 1 : 0 ) != _bModified )

10
reportdesign/source/core/api/Section.cxx
View File

@ -117,12 +117,12 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
,m_nBackgroundColor(COL_TRANSPARENT) ,m_nBackgroundColor(COL_TRANSPARENT)
,m_nForceNewPage(report::ForceNewPage::NONE) ,m_nForceNewPage(report::ForceNewPage::NONE)
,m_nNewRowOrCol(report::ForceNewPage::NONE) ,m_nNewRowOrCol(report::ForceNewPage::NONE)
,m_bKeepTogether(sal_False) ,m_bKeepTogether(false)
,m_bCanGrow(false) ,m_bCanGrow(false)
,m_bCanShrink(false) ,m_bCanShrink(false)
,m_bRepeatSection(sal_False) ,m_bRepeatSection(false)
,m_bVisible(sal_True) ,m_bVisible(true)
,m_bBacktransparent(sal_True) ,m_bBacktransparent(true)
,m_bInRemoveNotify(false) ,m_bInRemoveNotify(false)
,m_bInInsertNotify(false) ,m_bInInsertNotify(false)
{ {
@ -261,7 +261,7 @@ void SAL_CALL OSection::setHeight( ::sal_uInt32 _height ) throw (uno::RuntimeExc
void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, std::exception) void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, std::exception)
{ {
sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);
setBackTransparent(bTransparent); setBackTransparent(bTransparent);
if ( !bTransparent ) if ( !bTransparent )
set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor); set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor);

4
reportdesign/source/core/api/Shape.cxx
View File

@ -57,7 +57,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nZOrder(0) ,m_nZOrder(0)
,m_bOpaque(sal_False) ,m_bOpaque(false)
{ {
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager());
} }
@ -70,7 +70,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nZOrder(0) ,m_nZOrder(0)
,m_bOpaque(sal_False) ,m_bOpaque(false)
,m_sServiceName(_sServiceName) ,m_sServiceName(_sServiceName)
{ {
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager());

15
reportdesign/source/core/inc/FixedText.hxx
View File

@ -65,6 +65,21 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != _Value )
{
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
}
l.notify();
}
void checkIndex(sal_Int32 _nIndex); void checkIndex(sal_Int32 _nIndex);
protected: protected:
virtual ~OFixedText(); virtual ~OFixedText();

14
reportdesign/source/core/inc/FormatCondition.hxx
View File

@ -43,7 +43,7 @@ namespace reportdesign
{ {
OFormatProperties m_aFormatProperties; OFormatProperties m_aFormatProperties;
OUString m_sFormula; OUString m_sFormula;
sal_Bool m_bEnabled; bool m_bEnabled;
private: private:
OFormatCondition(const OFormatCondition&); OFormatCondition(const OFormatCondition&);
OFormatCondition& operator=(const OFormatCondition&); OFormatCondition& operator=(const OFormatCondition&);
@ -60,6 +60,18 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
l.notify();
}
protected: protected:
virtual ~OFormatCondition(); virtual ~OFormatCondition();
public: public:

15
reportdesign/source/core/inc/FormattedField.hxx
View File

@ -68,6 +68,21 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != _Value )
{
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
}
l.notify();
}
void checkIndex(sal_Int32 _nIndex); void checkIndex(sal_Int32 _nIndex);
protected: protected:
virtual ~OFormattedField(); virtual ~OFormattedField();

16
reportdesign/source/core/inc/Function.hxx
View File

@ -45,8 +45,8 @@ namespace reportdesign
::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent;
OUString m_sName; OUString m_sName;
OUString m_sFormula; OUString m_sFormula;
sal_Bool m_bPreEvaluated; bool m_bPreEvaluated;
sal_Bool m_bDeepTraversing; bool m_bDeepTraversing;
private: private:
OFunction(const OFunction&); OFunction(const OFunction&);
OFunction& operator=(const OFunction&); OFunction& operator=(const OFunction&);
@ -63,6 +63,18 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
l.notify();
}
protected: protected:
virtual ~OFunction(); virtual ~OFunction();
public: public:

15
reportdesign/source/core/inc/Group.hxx
View File

@ -69,6 +69,21 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != _Value )
{
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
}
l.notify();
}
void setSection( const OUString& _sProperty void setSection( const OUString& _sProperty
,const bool& _bOn ,const bool& _bOn
,const OUString& _sName ,const OUString& _sName

14
reportdesign/source/core/inc/ImageControl.hxx
View File

@ -45,7 +45,7 @@ namespace reportdesign
OReportControlModel m_aProps; OReportControlModel m_aProps;
OUString m_aImageURL; OUString m_aImageURL;
sal_Int16 m_nScaleMode; sal_Int16 m_nScaleMode;
sal_Bool m_bPreserveIRI; bool m_bPreserveIRI;
private: private:
OImageControl(const OImageControl&); OImageControl(const OImageControl&);
OImageControl& operator=(const OImageControl&); OImageControl& operator=(const OImageControl&);
@ -62,6 +62,18 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
l.notify();
}
void checkIndex(sal_Int32 _nIndex); void checkIndex(sal_Int32 _nIndex);
protected: protected:
virtual ~OImageControl(); virtual ~OImageControl();

2
reportdesign/source/core/inc/ReportComponent.hxx
View File

@ -56,7 +56,7 @@ namespace reportdesign
::sal_Int32 m_nPosY; ::sal_Int32 m_nPosY;
::sal_Int32 m_nBorderColor; ::sal_Int32 m_nBorderColor;
::sal_Int16 m_nBorder; ::sal_Int16 m_nBorder;
sal_Bool m_bPrintRepeatedValues; bool m_bPrintRepeatedValues;
OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext
) )

16
reportdesign/source/core/inc/ReportControlModel.hxx
View File

@ -67,13 +67,13 @@ namespace reportdesign
::sal_Int16 nCharCaseMap; ::sal_Int16 nCharCaseMap;
::sal_Int16 nCharKerning; ::sal_Int16 nCharKerning;
::sal_Int8 nCharEscapementHeight; ::sal_Int8 nCharEscapementHeight;
sal_Bool m_bBackgroundTransparent; bool m_bBackgroundTransparent;
sal_Bool bCharFlash; bool bCharFlash;
sal_Bool bCharAutoKerning; bool bCharAutoKerning;
sal_Bool bCharCombineIsOn; bool bCharCombineIsOn;
sal_Bool bCharHidden; bool bCharHidden;
sal_Bool bCharShadowed; bool bCharShadowed;
sal_Bool bCharContoured; bool bCharContoured;
OFormatProperties(); OFormatProperties();
}; };
class OReportControlModel class OReportControlModel
@ -91,7 +91,7 @@ namespace reportdesign
osl::Mutex& m_rMutex; osl::Mutex& m_rMutex;
OUString aDataField; OUString aDataField;
OUString aConditionalPrintExpression; OUString aConditionalPrintExpression;
sal_Bool bPrintWhenGroupChange; bool bPrintWhenGroupChange;
OReportControlModel(osl::Mutex& _rMutex OReportControlModel(osl::Mutex& _rMutex
,::com::sun::star::container::XContainer* _pOwner ,::com::sun::star::container::XContainer* _pOwner

2
reportdesign/source/core/inc/ReportHelperImpl.hxx
View File

@ -158,7 +158,7 @@ void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUS
\ \
void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\ void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
{ \ { \
sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);\ bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);\
setControlBackgroundTransparent(bTransparent);\ setControlBackgroundTransparent(bTransparent);\
if ( !bTransparent )\ if ( !bTransparent )\
set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,varName.nBackgroundColor);\ set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,varName.nBackgroundColor);\

27
reportdesign/source/core/inc/Section.hxx
View File

@ -66,12 +66,12 @@ namespace reportdesign
::sal_Int32 m_nBackgroundColor; ::sal_Int32 m_nBackgroundColor;
::sal_Int16 m_nForceNewPage; ::sal_Int16 m_nForceNewPage;
::sal_Int16 m_nNewRowOrCol; ::sal_Int16 m_nNewRowOrCol;
sal_Bool m_bKeepTogether; bool m_bKeepTogether;
bool m_bCanGrow; bool m_bCanGrow;
bool m_bCanShrink; bool m_bCanShrink;
sal_Bool m_bRepeatSection; bool m_bRepeatSection;
sal_Bool m_bVisible; bool m_bVisible;
sal_Bool m_bBacktransparent; bool m_bBacktransparent;
bool m_bInRemoveNotify; bool m_bInRemoveNotify;
bool m_bInInsertNotify; bool m_bInInsertNotify;
@ -94,6 +94,21 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != _Value )
{
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
}
l.notify();
}
/** checks if this section is eiter the page header or footer and if so it throws an UnknownPropertyException /** checks if this section is eiter the page header or footer and if so it throws an UnknownPropertyException
* *

16
reportdesign/source/core/inc/Shape.hxx
View File

@ -47,8 +47,8 @@ namespace reportdesign
::std::auto_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper; ::std::auto_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper;
OReportControlModel m_aProps; OReportControlModel m_aProps;
com::sun::star::drawing::HomogenMatrix3 m_Transformation; com::sun::star::drawing::HomogenMatrix3 m_Transformation;
sal_Int32 m_nZOrder; sal_Int32 m_nZOrder;
sal_Bool m_bOpaque; bool m_bOpaque;
OUString m_sServiceName; OUString m_sServiceName;
OUString m_CustomShapeEngine; OUString m_CustomShapeEngine;
@ -72,6 +72,18 @@ namespace reportdesign
} }
l.notify(); l.notify();
} }
void set( const OUString& _sProperty
,bool _Value
,bool& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
_member = _Value;
}
l.notify();
}
void checkIndex(sal_Int32 _nIndex); void checkIndex(sal_Int32 _nIndex);
cppu::IPropertyArrayHelper& getInfoHelper(); cppu::IPropertyArrayHelper& getInfoHelper();
protected: protected:

6
reportdesign/source/inc/GroupProperties.hxx
View File

@ -29,9 +29,9 @@ namespace rptshared
OUString m_sExpression; OUString m_sExpression;
sal_Int16 m_nGroupOn; sal_Int16 m_nGroupOn;
sal_Int16 m_nKeepTogether; sal_Int16 m_nKeepTogether;
sal_Bool m_eSortAscending; bool m_eSortAscending;
sal_Bool m_bStartNewColumn; bool m_bStartNewColumn;
sal_Bool m_bResetPageNumber; bool m_bResetPageNumber;
GroupProperties() GroupProperties()
:m_nGroupInterval(1) :m_nGroupInterval(1)

10
reportdesign/source/ui/dlg/Navigator.cxx
View File

@ -262,7 +262,7 @@ NavigatorTree::~NavigatorTree()
void NavigatorTree::Command( const CommandEvent& rEvt ) void NavigatorTree::Command( const CommandEvent& rEvt )
{ {
sal_Bool bHandled = sal_False; bool bHandled = false;
switch( rEvt.GetCommand() ) switch( rEvt.GetCommand() )
{ {
case COMMAND_CONTEXTMENU: case COMMAND_CONTEXTMENU:
@ -294,7 +294,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
uno::Reference< report::XFunctionsSupplier> xSupplier(pData->getContent(),uno::UNO_QUERY); uno::Reference< report::XFunctionsSupplier> xSupplier(pData->getContent(),uno::UNO_QUERY);
uno::Reference< report::XFunctions> xFunctions(pData->getContent(),uno::UNO_QUERY); uno::Reference< report::XFunctions> xFunctions(pData->getContent(),uno::UNO_QUERY);
uno::Reference< report::XGroup> xGroup(pData->getContent(),uno::UNO_QUERY); uno::Reference< report::XGroup> xGroup(pData->getContent(),uno::UNO_QUERY);
sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() ||
uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is());
PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) ); PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) );
@ -306,7 +306,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
sal_uInt16 nId = aContextMenu.GetItemId(i); sal_uInt16 nId = aContextMenu.GetItemId(i);
aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId)); aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId));
sal_Bool bEnabled = m_rController.isCommandEnabled(nId); bool bEnabled = m_rController.isCommandEnabled(nId);
if ( nId == SID_RPT_NEW_FUNCTION ) if ( nId == SID_RPT_NEW_FUNCTION )
aContextMenu.EnableItem(nId,m_rController.isEditable() && (xSupplier.is() || xFunctions.is()) ); aContextMenu.EnableItem(nId,m_rController.isEditable() && (xSupplier.is() || xFunctions.is()) );
// special condition, check for function and group // special condition, check for function and group
@ -336,7 +336,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
m_rController.executeUnChecked(nId,aArgs); m_rController.executeUnChecked(nId,aArgs);
} }
bHandled = sal_True; bHandled = true;
} break; } break;
} }
@ -647,7 +647,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY); uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY);
if ( xReport.is() ) if ( xReport.is() )
{ {
sal_Bool bEnabled = sal_False; bool bEnabled = false;
_rEvent.NewValue >>= bEnabled; _rEvent.NewValue >>= bEnabled;
if ( bEnabled ) if ( bEnabled )
{ {

30
reportdesign/source/ui/report/ReportController.cxx
View File

@ -985,7 +985,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() ); ::osl::MutexGuard aGuard( getMutex() );
sal_Bool bForceBroadcast = sal_False; bool bForceBroadcast = false;
switch(_nId) switch(_nId)
{ {
case SID_RPT_TEXTDOCUMENT: case SID_RPT_TEXTDOCUMENT:
@ -1420,7 +1420,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
if (aArgs.getLength() == 1 ) if (aArgs.getLength() == 1 )
aArgs[0].Value >>= xSection; aArgs[0].Value >>= xSection;
openPageDialog(xSection); openPageDialog(xSection);
bForceBroadcast = sal_True; bForceBroadcast = true;
} }
break; break;
case SID_SORTINGANDGROUPING: case SID_SORTINGANDGROUPING:
@ -1438,7 +1438,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
xSection->setBackColor( aColor ); xSection->setBackColor( aColor );
} }
} }
bForceBroadcast = sal_True; bForceBroadcast = true;
} }
break; break;
case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_WEIGHT:
@ -1466,7 +1466,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
const SequenceAsHashMap aMap(aArgs); const SequenceAsHashMap aMap(aArgs);
const util::Color aColor = aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color()); const util::Color aColor = aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color());
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::makeAny(aColor),aArgs); impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::makeAny(aColor),aArgs);
bForceBroadcast = sal_True; bForceBroadcast = true;
} }
break; break;
case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONT:
@ -2191,7 +2191,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven
::osl::MutexGuard aGuard( getMutex() ); ::osl::MutexGuard aGuard( getMutex() );
try try
{ {
sal_Bool bShow = sal_False; bool bShow = false;
evt.NewValue >>= bShow; evt.NewValue >>= bShow;
if ( evt.Source == m_xReportDefinition ) if ( evt.Source == m_xReportDefinition )
{ {
@ -2484,7 +2484,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_PAGE,true,&pItem)) if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_PAGE,true,&pItem))
{ {
const SvxPageItem* pPageItem = static_cast<const SvxPageItem*>(pItem); const SvxPageItem* pPageItem = static_cast<const SvxPageItem*>(pItem);
xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::makeAny(static_cast<sal_Bool>(pPageItem->IsLandscape()))); xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::makeAny(pPageItem->IsLandscape()));
xProp->setPropertyValue(PROPERTY_NUMBERINGTYPE,uno::makeAny(static_cast<sal_Int16>(pPageItem->GetNumType()))); xProp->setPropertyValue(PROPERTY_NUMBERINGTYPE,uno::makeAny(static_cast<sal_Int16>(pPageItem->GetNumType())));
uno::Any aValue; uno::Any aValue;
pPageItem->QueryValue(aValue,MID_PAGE_LAYOUT); pPageItem->QueryValue(aValue,MID_PAGE_LAYOUT);
@ -3018,7 +3018,7 @@ void OReportController::insertGraphic()
if ( ERRCODE_NONE == aDialog.Execute() ) if ( ERRCODE_NONE == aDialog.Execute() )
{ {
sal_Bool bLink = sal_True; bool bLink = true;
xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink; xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink;
uno::Sequence<beans::PropertyValue> aArgs(2); uno::Sequence<beans::PropertyValue> aArgs(2);
aArgs[0].Name = PROPERTY_IMAGEURL; aArgs[0].Name = PROPERTY_IMAGEURL;
@ -3042,7 +3042,7 @@ void OReportController::insertGraphic()
sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
{ {
::osl::MutexGuard aGuard( getMutex() ); ::osl::MutexGuard aGuard( getMutex() );
sal_Bool bRet = sal_True; bool bRet = true;
if ( getDesignView() ) if ( getDesignView() )
{ {
getDesignView()->unmarkAllObjects(NULL); getDesignView()->unmarkAllObjects(NULL);
@ -3250,13 +3250,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>()); uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>());
OUString sFunction; OUString sFunction;
sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False);
if ( bDate ) if ( bDate )
{ {
sFunction = "TODAY()"; sFunction = "TODAY()";
createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
} }
sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False);
if ( bTime ) if ( bTime )
{ {
sFunction = "TIMEVALUE(NOW())"; sFunction = "TIMEVALUE(NOW())";
@ -3279,7 +3279,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
} }
SequenceAsHashMap aMap(_aArgs); SequenceAsHashMap aMap(_aArgs);
sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() ); OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() );
sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()"); sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()");
@ -3290,7 +3290,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()"); sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()");
} }
sal_Bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True);
createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction); createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction);
} }
@ -3343,7 +3343,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
// LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down
sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault("DNDAction", sal_Int8(0)); sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault("DNDAction", sal_Int8(0));
pSectionWindow[1] = pSectionWindow[0]; pSectionWindow[1] = pSectionWindow[0];
sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY;
if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK )
{ {
// Add the Label one Section up // Add the Label one Section up
@ -3902,7 +3902,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader
if ( m_xReportDefinition.is() ) if ( m_xReportDefinition.is() )
{ {
const SequenceAsHashMap aMap(_aArgs); const SequenceAsHashMap aMap(_aArgs);
const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False); const bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False);
uno::Reference< report::XGroup> xGroup = aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< report::XGroup>()); uno::Reference< report::XGroup> xGroup = aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< report::XGroup>());
if ( xGroup.is() ) if ( xGroup.is() )
{ {
@ -3996,7 +3996,7 @@ void OReportController::checkChartEnabled()
::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot aConfiguration(
::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigName ) ); ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigName ) );
sal_Bool bChartEnabled = sal_False; bool bChartEnabled = false;
if ( aConfiguration.hasByHierarchicalName(sPropertyName) ) if ( aConfiguration.hasByHierarchicalName(sPropertyName) )
aConfiguration.getNodeValue( sPropertyName ) >>= bChartEnabled; aConfiguration.getNodeValue( sPropertyName ) >>= bChartEnabled;
m_bChartEnabled = bChartEnabled; m_bChartEnabled = bChartEnabled;

4
reportdesign/source/ui/report/ReportControllerObserver.cxx
View File

@ -55,7 +55,7 @@ public:
::std::vector< uno::Reference< container::XChild> > m_aSections; ::std::vector< uno::Reference< container::XChild> > m_aSections;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
oslInterlockedCount m_nLocks; oslInterlockedCount m_nLocks;
sal_Bool m_bReadOnly; bool m_bReadOnly;
OXReportControllerObserverImpl(const OReportController& _rController); OXReportControllerObserverImpl(const OReportController& _rController);
~OXReportControllerObserverImpl(); ~OXReportControllerObserverImpl();
@ -66,7 +66,7 @@ public:
OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController) OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController)
:m_rReportController(_rController) :m_rReportController(_rController)
,m_nLocks(0) ,m_nLocks(0)
,m_bReadOnly(sal_False) ,m_bReadOnly(false)
{ {
} }

4
reportdesign/source/ui/report/ReportSection.cxx
View File

@ -622,7 +622,7 @@ void OReportSection::createDefault(const OUString& _sType)
void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
{ {
sal_Bool bAttributesAppliedFromGallery = sal_False; bool bAttributesAppliedFromGallery = false;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{ {
@ -666,7 +666,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
double a = nAngle * F_PI18000; double a = nAngle * F_PI18000;
_pObj->NbcRotate( _pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) ); _pObj->NbcRotate( _pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) );
} }
bAttributesAppliedFromGallery = sal_True; bAttributesAppliedFromGallery = true;
} }
} }
break; break;

2
reportdesign/source/ui/report/SectionWindow.cxx
View File

@ -288,7 +288,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
{ {
if ( _pMarker ) if ( _pMarker )
{ {
sal_Bool bShow = !_pMarker->isCollapsed(); bool bShow = !_pMarker->isCollapsed();
m_aReportSection.Show(bShow); m_aReportSection.Show(bShow);
m_aEndMarker.Show(bShow); m_aEndMarker.Show(bShow);
m_aSplitter.Show(bShow); m_aSplitter.Show(bShow);